aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Lex/PPMacroExpansion.cpp2
-rw-r--r--lib/Serialization/ASTReader.cpp2
-rw-r--r--lib/Serialization/ASTWriter.cpp2
3 files changed, 1 insertions, 5 deletions
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp
index 013178c555..8db74f28d4 100644
--- a/lib/Lex/PPMacroExpansion.cpp
+++ b/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/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 6e3eee9533..f23c0992af 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/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/lib/Serialization/ASTWriter.cpp b/lib/Serialization/ASTWriter.cpp
index 98e841cb2b..9f4789227f 100644
--- a/lib/Serialization/ASTWriter.cpp
+++ b/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());