commit 1ebefc72e80cc880be376a8704e6936d2746cb35
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Wed Feb 27 01:13:51 2013 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Wed Feb 27 01:13:51 2013 +0000
tree 7bf0c5c8322de0858a223e642ca3695dac81909e
parent 664e860beb2550bef24fb8946192f61648a71d7f

[PCH] When deserializing an IdentifierInfo, call IdentifierInfo::RevertTokenIDToIdentifier() only when it's not already an identifier.

Fixes an assertion hit.
rdar://13288735

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

lib/Serialization/ASTReader.cpp

diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 4c11f38..24073df 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -538,7 +538,7 @@
 
   // Set or check the various bits in the IdentifierInfo structure.
   // Token IDs are read-only.
-  if (HasRevertedTokenIDToIdentifier)
+  if (HasRevertedTokenIDToIdentifier && II->getTokenID() != tok::identifier)
     II->RevertTokenIDToIdentifier();
   II->setObjCOrBuiltinID(ObjCOrBuiltinID);
   assert(II->isExtensionToken() == ExtensionToken &&