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.

llvm-svn: 242567

diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index c25d905..4bde2b5 100644 (file)
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/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/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp
index a2f3f96..13c6dcf 100644 (file)
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/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>())