From 0634737452a837cbd3860b4d1abba753bfd7a378 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Thu, 11 Oct 2012 00:48:48 +0000 Subject: [PATCH] Remove an unused bit from the serialized IdentifierInfo llvm-svn: 165683 --- clang/lib/Lex/PPMacroExpansion.cpp | 2 +- clang/lib/Serialization/ASTReader.cpp | 2 -- clang/lib/Serialization/ASTWriter.cpp | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp index 013178c..8db74f2 100644 --- a/clang/lib/Lex/PPMacroExpansion.cpp +++ b/clang/lib/Lex/PPMacroExpansion.cpp @@ -97,7 +97,7 @@ void Preprocessor::addLoadedMacroInfo(IdentifierInfo *II, MacroInfo *MI) { PrevPrev->isDefined()); // FIXME: Actually use the ambiguity information for something. - + // Wire this macro information into the chain. MI->setPreviousDefinition(Prev->getPreviousDefinition()); Prev->setPreviousDefinition(MI); diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index 6e3eee9..f23c099 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -540,8 +540,6 @@ IdentifierInfo *ASTIdentifierLookupTrait::ReadData(const internal_key_type& k, Bits >>= 1; bool hadMacroDefinition = Bits & 0x01; Bits >>= 1; - bool hasMacroDefinition = Bits & 0x01; - Bits >>= 1; assert(Bits == 0 && "Extra bits in the identifier?"); DataLen -= 8; diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index 98e841c..9f47892 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -2632,8 +2632,6 @@ public: clang::io::Emit16(Out, Bits); Bits = 0; bool HadMacroDefinition = hadMacroDefinition(II, Macro); - bool HasMacroDefinition = HadMacroDefinition && II->hasMacroDefinition(); - Bits = (Bits << 1) | unsigned(HasMacroDefinition); Bits = (Bits << 1) | unsigned(HadMacroDefinition); Bits = (Bits << 1) | unsigned(II->isExtensionToken()); Bits = (Bits << 1) | unsigned(II->isPoisoned()); -- 2.7.4