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.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@242567 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index c25d905bfab3141cbecc0bee07377d386b387725..4bde2b54ee252668856a0157b4fd1f40dc50ec99 100644 (file)
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -736,11 +736,10 @@ ASTIdentifierLookupTraitBase::ReadKey(const unsigned char* d, unsigned n) {
 
 /// \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>();
 }
 

diff --git a/lib/Serialization/ASTWriter.cpp b/lib/Serialization/ASTWriter.cpp
index a2f3f96c00ca6c6fde4c09349487aeb8dc1794f3..13c6dcffd52d5c69d324fc19a271c61e873c3162 100644 (file)
--- a/lib/Serialization/ASTWriter.cpp
+++ b/lib/Serialization/ASTWriter.cpp
@@ -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>())