summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2015-04-24 00:41:09 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2015-04-24 00:41:09 +0000
commit6b77f549cb3fa3f543941289c5ebc2cdc88ab079 (patch)
tree43ca53d2d7c68efb041abdc266eeaff09ab1b499
parent17d2730ee039692d0ae02ff2cfbea691bf8fcf11 (diff)
downloadbcm5719-llvm-6b77f549cb3fa3f543941289c5ebc2cdc88ab079.tar.gz
bcm5719-llvm-6b77f549cb3fa3f543941289c5ebc2cdc88ab079.zip
[modules] Partial revert of r235669: don't create ModuleMacros for imported local macros.
The surrounding infrastructure isn't quite ready for this yet. llvm-svn: 235677
-rw-r--r--clang/lib/Lex/PPLexerChange.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/clang/lib/Lex/PPLexerChange.cpp b/clang/lib/Lex/PPLexerChange.cpp
index 6cffbc39855..b53c40ec5c8 100644
--- a/clang/lib/Lex/PPLexerChange.cpp
+++ b/clang/lib/Lex/PPLexerChange.cpp
@@ -665,12 +665,6 @@ void Preprocessor::LeaveSubmodule() {
// Restore the old macro state.
Macro.second = State;
-
- // If our submodule defined a macro, import it.
- // FIXME: Do this lazily.
- if (MM)
- appendMacroDirective(II,
- AllocateImportedMacroDirective(MM, Info.ImportLoc));
}
BuildingSubmoduleStack.pop_back();
OpenPOWER on IntegriCloud