@@ -1306,7 +1306,6 @@ void ASTDeclWriter::VisitVarDecl(VarDecl *D) {
1306
1306
VarDeclBits.addBit (D->isConstexpr ());
1307
1307
VarDeclBits.addBit (D->isInitCapture ());
1308
1308
VarDeclBits.addBit (D->isPreviousDeclInSameBlockScope ());
1309
- VarDeclBits.addBit (D->hasInitWithSideEffects ());
1310
1309
1311
1310
VarDeclBits.addBit (D->isEscapingByref ());
1312
1311
HasDeducedType = D->getType ()->getContainedDeducedType ();
@@ -1356,11 +1355,10 @@ void ASTDeclWriter::VisitVarDecl(VarDecl *D) {
1356
1355
!D->hasExtInfo () && D->getFirstDecl () == D->getMostRecentDecl () &&
1357
1356
D->getKind () == Decl::Var && !D->isInline () && !D->isConstexpr () &&
1358
1357
!D->isInitCapture () && !D->isPreviousDeclInSameBlockScope () &&
1359
- !D->hasInitWithSideEffects () && !D->isEscapingByref () &&
1360
- !HasDeducedType && D->getStorageDuration () != SD_Static &&
1361
- !D->getDescribedVarTemplate () && !D->getMemberSpecializationInfo () &&
1362
- !D->isObjCForDecl () && !isa<ImplicitParamDecl>(D) &&
1363
- !D->isEscapingByref ())
1358
+ !D->isEscapingByref () && !HasDeducedType &&
1359
+ D->getStorageDuration () != SD_Static && !D->getDescribedVarTemplate () &&
1360
+ !D->getMemberSpecializationInfo () && !D->isObjCForDecl () &&
1361
+ !isa<ImplicitParamDecl>(D) && !D->isEscapingByref ())
1364
1362
AbbrevToUse = Writer.getDeclVarAbbrev ();
1365
1363
1366
1364
Code = serialization::DECL_VAR;
@@ -2733,12 +2731,12 @@ void ASTWriter::WriteDeclAbbrevs() {
2733
2731
// VarDecl
2734
2732
Abv->Add (BitCodeAbbrevOp (
2735
2733
BitCodeAbbrevOp::Fixed,
2736
- 22 )); // Packed Var Decl bits: Linkage, ModulesCodegen,
2734
+ 21 )); // Packed Var Decl bits: Linkage, ModulesCodegen,
2737
2735
// SClass, TSCSpec, InitStyle,
2738
2736
// isARCPseudoStrong, IsThisDeclarationADemotedDefinition,
2739
2737
// isExceptionVariable, isNRVOVariable, isCXXForRangeDecl,
2740
2738
// isInline, isInlineSpecified, isConstexpr,
2741
- // isInitCapture, isPrevDeclInSameScope, hasInitWithSideEffects,
2739
+ // isInitCapture, isPrevDeclInSameScope,
2742
2740
// EscapingByref, HasDeducedType, ImplicitParamKind, isObjCForDecl
2743
2741
Abv->Add (BitCodeAbbrevOp (0 )); // VarKind (local enum)
2744
2742
// Type Source Info
0 commit comments