From 84695487373ddec74cdc998286ae0369e0f13a4b Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Fri, 17 Jul 2015 20:19:56 +0000
Subject: [PATCH] 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
---
 lib/Serialization/ASTReader.cpp | 5 ++---
 lib/Serialization/ASTWriter.cpp | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index c25d905bfa..4bde2b54ee 100644
--- 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 a2f3f96c00..13c6dcffd5 100644
--- 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>())
-- 
2.40.0