[PCH/Modules] Re-apply r172620 and r172629, now with 100% less infinite loops!
Makes sure that a deserialized macro is only added to the preprocessor macro definitions only once.
Unfortunately I couldn't get a reduced test case.
rdar://13016031
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172843 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 1bafc2a..17669b4 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -525,13 +525,9 @@
// If this identifier is a macro, deserialize the macro
// definition.
if (hadMacroDefinition) {
- SmallVector<MacroID, 4> MacroIDs;
- while (uint32_t LocalID = ReadUnalignedLE32(d)) {
- MacroIDs.push_back(Reader.getGlobalMacroID(F, LocalID));
- DataLen -= 4;
- }
DataLen -= 4;
- Reader.setIdentifierIsMacro(II, MacroIDs);
+ uint32_t LocalID = ReadUnalignedLE32(d);
+ Reader.addMacroIDForDeserialization(II, Reader.getGlobalMacroID(F,LocalID));
}
Reader.SetIdentifierInfo(ID, II);
@@ -1061,8 +1057,7 @@
}
}
-void ASTReader::ReadMacroRecord(ModuleFile &F, uint64_t Offset,
- MacroInfo *Hint) {
+void ASTReader::ReadMacroRecord(ModuleFile &F, uint64_t Offset) {
llvm::BitstreamCursor &Stream = F.MacroCursor;
// Keep track of where we are in the stream, then jump back there
@@ -1078,19 +1073,18 @@
// adding tokens.
struct AddLoadedMacroInfoRAII {
Preprocessor &PP;
- MacroInfo *Hint;
MacroInfo *MI;
IdentifierInfo *II;
- AddLoadedMacroInfoRAII(Preprocessor &PP, MacroInfo *Hint)
- : PP(PP), Hint(Hint), MI(), II() { }
+ explicit AddLoadedMacroInfoRAII(Preprocessor &PP)
+ : PP(PP), MI(), II() { }
~AddLoadedMacroInfoRAII( ) {
if (MI) {
// Finally, install the macro.
- PP.addLoadedMacroInfo(II, MI, Hint);
+ PP.addLoadedMacroInfo(II, MI);
}
}
- } AddLoadedMacroInfo(PP, Hint);
+ } AddLoadedMacroInfo(PP);
while (true) {
unsigned Code = Stream.ReadCode();
@@ -1146,6 +1140,9 @@
SourceLocation Loc = ReadSourceLocation(F, Record, NextIndex);
MacroInfo *MI = PP.AllocateMacroInfo(Loc);
MI->setDefinitionEndLoc(ReadSourceLocation(F, Record, NextIndex));
+ bool isHeadMI = Record[NextIndex++];
+ MacroInfo *PrevMI = getMacro(getGlobalMacroID(F, Record[NextIndex++]));
+ MI->setPreviousDefinition(PrevMI);
// Record this macro.
MacrosLoaded[GlobalID - NUM_PREDEF_MACRO_IDS] = MI;
@@ -1230,9 +1227,11 @@
}
MI->setHidden(Hidden);
- // Make sure we install the macro once we're done.
- AddLoadedMacroInfo.MI = MI;
- AddLoadedMacroInfo.II = II;
+ if (isHeadMI) {
+ // Make sure we install the macro once we're done.
+ AddLoadedMacroInfo.MI = MI;
+ AddLoadedMacroInfo.II = II;
+ }
// Remember that we saw this macro last so that we add the tokens that
// form its body to it.
@@ -1341,10 +1340,13 @@
return HFI;
}
-void ASTReader::setIdentifierIsMacro(IdentifierInfo *II, ArrayRef<MacroID> IDs){
+void ASTReader::addMacroIDForDeserialization(IdentifierInfo *II, MacroID ID){
II->setHadMacroDefinition(true);
assert(NumCurrentElementsDeserializing > 0 &&"Missing deserialization guard");
- PendingMacroIDs[II].append(IDs.begin(), IDs.end());
+ SmallVector<serialization::MacroID, 2> &MacroIDs = PendingMacroIDs[II];
+ assert(std::find(MacroIDs.begin(), MacroIDs.end(), ID) == MacroIDs.end() &&
+ "Already added the macro ID for deserialization");
+ MacroIDs.push_back(ID);
}
void ASTReader::ReadDefinedMacros() {
@@ -6160,7 +6162,7 @@
return LocalID + I->second;
}
-MacroInfo *ASTReader::getMacro(MacroID ID, MacroInfo *Hint) {
+MacroInfo *ASTReader::getMacro(MacroID ID) {
if (ID == 0)
return 0;
@@ -6176,7 +6178,7 @@
assert(I != GlobalMacroMap.end() && "Corrupted global macro map");
ModuleFile *M = I->second;
unsigned Index = ID - M->BaseMacroID;
- ReadMacroRecord(*M, M->MacroOffsets[Index], Hint);
+ ReadMacroRecord(*M, M->MacroOffsets[Index]);
}
return MacrosLoaded[ID];
@@ -6875,13 +6877,15 @@
PendingDeclChains.clear();
// Load any pending macro definitions.
+ // Note that new macros may be added while deserializing a macro.
for (unsigned I = 0; I != PendingMacroIDs.size(); ++I) {
- // FIXME: std::move here
- SmallVector<MacroID, 2> GlobalIDs = PendingMacroIDs.begin()[I].second;
- MacroInfo *Hint = 0;
- for (unsigned IDIdx = 0, NumIDs = GlobalIDs.size(); IDIdx != NumIDs;
- ++IDIdx) {
- Hint = getMacro(GlobalIDs[IDIdx], Hint);
+ PendingMacroIDsMap::iterator PMIt = PendingMacroIDs.begin() + I;
+ IdentifierInfo *II = PMIt->first;
+ SmallVector<serialization::MacroID, 2> MacroIDs;
+ MacroIDs.swap(PMIt->second);
+ for (SmallVectorImpl<serialization::MacroID>::iterator
+ MIt = MacroIDs.begin(), ME = MacroIDs.end(); MIt != ME; ++MIt) {
+ getMacro(*MIt);
}
}
PendingMacroIDs.clear();
diff --git a/lib/Serialization/ASTWriter.cpp b/lib/Serialization/ASTWriter.cpp
index 37577ce..df6d112 100644
--- a/lib/Serialization/ASTWriter.cpp
+++ b/lib/Serialization/ASTWriter.cpp
@@ -1798,12 +1798,10 @@
// Construct the list of macro definitions that need to be serialized.
SmallVector<std::pair<const IdentifierInfo *, MacroInfo *>, 2>
MacrosToEmit;
- llvm::SmallPtrSet<const IdentifierInfo*, 4> MacroDefinitionsSeen;
for (Preprocessor::macro_iterator I = PP.macro_begin(Chain == 0),
E = PP.macro_end(Chain == 0);
I != E; ++I) {
if (!IsModule || I->second->isPublic()) {
- MacroDefinitionsSeen.insert(I->first);
MacrosToEmit.push_back(std::make_pair(I->first, I->second));
}
}
@@ -1823,9 +1821,9 @@
for (unsigned I = 0, N = MacrosToEmit.size(); I != N; ++I) {
const IdentifierInfo *Name = MacrosToEmit[I].first;
+ MacroInfo *HeadMI = MacrosToEmit[I].second;
- for (MacroInfo *MI = MacrosToEmit[I].second; MI;
- MI = MI->getPreviousDefinition()) {
+ for (MacroInfo *MI = HeadMI; MI; MI = MI->getPreviousDefinition()) {
MacroID ID = getMacroRef(MI);
if (!ID)
continue;
@@ -1856,6 +1854,13 @@
Record.push_back(inferSubmoduleIDFromLocation(MI->getDefinitionLoc()));
AddSourceLocation(MI->getDefinitionLoc(), Record);
AddSourceLocation(MI->getDefinitionEndLoc(), Record);
+ Record.push_back(MI == HeadMI);
+ MacroInfo *PrevMI = MI->getPreviousDefinition();
+ // Serialize only the part of the definition chain that is local.
+ // The chain will be synthesized across modules by the ASTReader.
+ if (Chain && PrevMI && PrevMI->isFromAST())
+ PrevMI = 0;
+ addMacroRef(PrevMI, Record);
AddSourceLocation(MI->getUndefLoc(), Record);
Record.push_back(MI->isUsed());
Record.push_back(MI->isPublic());
@@ -2737,14 +2742,8 @@
if (isInterestingIdentifier(II, Macro)) {
DataLen += 2; // 2 bytes for builtin ID
DataLen += 2; // 2 bytes for flags
- if (hadMacroDefinition(II, Macro)) {
- for (MacroInfo *M = Macro; M; M = M->getPreviousDefinition()) {
- if (Writer.getMacroRef(M) != 0)
- DataLen += 4;
- }
-
+ if (hadMacroDefinition(II, Macro))
DataLen += 4;
- }
for (IdentifierResolver::iterator D = IdResolver.begin(II),
DEnd = IdResolver.end();
@@ -2789,13 +2788,8 @@
clang::io::Emit16(Out, Bits);
if (HadMacroDefinition) {
- // Write all of the macro IDs associated with this identifier.
- for (MacroInfo *M = Macro; M; M = M->getPreviousDefinition()) {
- if (MacroID ID = Writer.getMacroRef(M))
- clang::io::Emit32(Out, ID);
- }
-
- clang::io::Emit32(Out, 0);
+ // Write the macro ID associated with this identifier.
+ clang::io::Emit32(Out, Writer.getMacroRef(Macro));
}
// Emit the declaration IDs in reverse order, because the