diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2013-02-27 01:13:51 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2013-02-27 01:13:51 +0000 |
| commit | ddee8c9e2be901d90149c1ccc1804b6765fcc794 (patch) | |
| tree | e2dbb9e1a75b4f33ebf6fa7571bd10b565a06750 /clang/lib | |
| parent | 81bbee1ed8d5f9ed3f5789a5807af9400836dfd6 (diff) | |
| download | bcm5719-llvm-ddee8c9e2be901d90149c1ccc1804b6765fcc794.tar.gz bcm5719-llvm-ddee8c9e2be901d90149c1ccc1804b6765fcc794.zip | |
[PCH] When deserializing an IdentifierInfo, call IdentifierInfo::RevertTokenIDToIdentifier() only when it's not already an identifier.
Fixes an assertion hit.
rdar://13288735
llvm-svn: 176148
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Serialization/ASTReader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index 4c11f383950..24073df3ec0 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -538,7 +538,7 @@ IdentifierInfo *ASTIdentifierLookupTrait::ReadData(const internal_key_type& k, // 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 && |
