Author: rsmith Date: Fri Jul 17 15:19:56 2015 New Revision: 242567 URL: http://llvm.org/viewvc/llvm-project?rev=242567&view=rev Log: Stop treating extension keywords as 'interesting'; we don't allow the extension flag to change between serialization and deserialization, so it does not require the identifier to be serialized.
Modified: cfe/trunk/lib/Serialization/ASTReader.cpp cfe/trunk/lib/Serialization/ASTWriter.cpp Modified: cfe/trunk/lib/Serialization/ASTReader.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=242567&r1=242566&r2=242567&view=diff ============================================================================== --- cfe/trunk/lib/Serialization/ASTReader.cpp (original) +++ cfe/trunk/lib/Serialization/ASTReader.cpp Fri Jul 17 15:19:56 2015 @@ -736,11 +736,10 @@ ASTIdentifierLookupTraitBase::ReadKey(co /// \brief Whether the given identifier is "interesting". static bool isInterestingIdentifier(IdentifierInfo &II) { - return II.isPoisoned() || - II.isExtensionToken() || + return II.hadMacroDefinition() || + II.isPoisoned() || II.getObjCOrBuiltinID() || II.hasRevertedTokenIDToIdentifier() || - II.hadMacroDefinition() || II.getFETokenInfo<void>(); } Modified: cfe/trunk/lib/Serialization/ASTWriter.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=242567&r1=242566&r2=242567&view=diff ============================================================================== --- cfe/trunk/lib/Serialization/ASTWriter.cpp (original) +++ cfe/trunk/lib/Serialization/ASTWriter.cpp Fri Jul 17 15:19:56 2015 @@ -3110,7 +3110,6 @@ class ASTIdentifierTableTrait { bool isInterestingIdentifier(IdentifierInfo *II, uint64_t MacroOffset) { if (MacroOffset || II->isPoisoned() || - II->isExtensionToken() || II->getObjCOrBuiltinID() || II->hasRevertedTokenIDToIdentifier() || II->getFETokenInfo<void>()) _______________________________________________ cfe-commits mailing list cfe-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits