@@ -10188,12 +10188,12 @@ void ASTReader::visitTopLevelModuleMaps(
10188
10188
}
10189
10189
10190
10190
void ASTReader::finishPendingActions() {
10191
- while (!PendingIdentifierInfos.empty() ||
10192
- !PendingDeducedFunctionTypes.empty() ||
10193
- !PendingDeducedVarTypes.empty() || !PendingDeclChains .empty() ||
10194
- !PendingMacroIDs .empty() || !PendingDeclContextInfos .empty() ||
10195
- !PendingUpdateRecords.empty() ||
10196
- !PendingObjCExtensionIvarRedeclarations.empty()) {
10191
+ while (
10192
+ !PendingIdentifierInfos.empty() || !PendingDeducedFunctionTypes.empty() ||
10193
+ !PendingDeducedVarTypes.empty() || !PendingIncompleteDeclChains .empty() ||
10194
+ !PendingDeclChains .empty() || !PendingMacroIDs .empty() ||
10195
+ !PendingDeclContextInfos.empty() || !PendingUpdateRecords.empty() ||
10196
+ !PendingObjCExtensionIvarRedeclarations.empty()) {
10197
10197
// If any identifiers with corresponding top-level declarations have
10198
10198
// been loaded, load those declarations now.
10199
10199
using TopLevelDeclsMap =
@@ -10241,6 +10241,13 @@ void ASTReader::finishPendingActions() {
10241
10241
}
10242
10242
PendingDeducedVarTypes.clear();
10243
10243
10244
+ // For each decl chain that we wanted to complete while deserializing, mark
10245
+ // it as "still needs to be completed".
10246
+ for (unsigned I = 0; I != PendingIncompleteDeclChains.size(); ++I) {
10247
+ markIncompleteDeclChain(PendingIncompleteDeclChains[I]);
10248
+ }
10249
+ PendingIncompleteDeclChains.clear();
10250
+
10244
10251
// Load pending declaration chains.
10245
10252
for (unsigned I = 0; I != PendingDeclChains.size(); ++I)
10246
10253
loadPendingDeclChain(PendingDeclChains[I].first,
@@ -10478,12 +10485,6 @@ void ASTReader::finishPendingActions() {
10478
10485
for (auto *ND : PendingMergedDefinitionsToDeduplicate)
10479
10486
getContext().deduplicateMergedDefinitonsFor(ND);
10480
10487
PendingMergedDefinitionsToDeduplicate.clear();
10481
-
10482
- // For each decl chain that we wanted to complete while deserializing, mark
10483
- // it as "still needs to be completed".
10484
- for (Decl *D : PendingIncompleteDeclChains)
10485
- markIncompleteDeclChain(D);
10486
- PendingIncompleteDeclChains.clear();
10487
10488
}
10488
10489
10489
10490
void ASTReader::diagnoseOdrViolations() {
0 commit comments