summaryrefslogtreecommitdiffstats
path: root/clang/lib/Lex/Pragma.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2015-04-23 20:40:50 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2015-04-23 20:40:50 +0000
commit713369b057bc6401e88abbc65cab1fc0a8f688e0 (patch)
tree1ff1bc32fe2a74cf60a317285bddb4407c2f57ba /clang/lib/Lex/Pragma.cpp
parent07e2d283a39a3b2a25dd642643e74e62686b5720 (diff)
downloadbcm5719-llvm-713369b057bc6401e88abbc65cab1fc0a8f688e0.tar.gz
bcm5719-llvm-713369b057bc6401e88abbc65cab1fc0a8f688e0.zip
[modules] Store a ModuleMacro* on an imported macro directive rather than duplicating the info within it.
llvm-svn: 235644
Diffstat (limited to 'clang/lib/Lex/Pragma.cpp')
-rw-r--r--clang/lib/Lex/Pragma.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/clang/lib/Lex/Pragma.cpp b/clang/lib/Lex/Pragma.cpp
index bfac3fda297..5625842145a 100644
--- a/clang/lib/Lex/Pragma.cpp
+++ b/clang/lib/Lex/Pragma.cpp
@@ -600,11 +600,9 @@ void Preprocessor::HandlePragmaPopMacro(Token &PopMacroTok) {
// Get the MacroInfo we want to reinstall.
MacroInfo *MacroToReInstall = iter->second.back();
- if (MacroToReInstall) {
+ if (MacroToReInstall)
// Reinstall the previously pushed macro.
- appendDefMacroDirective(IdentInfo, MacroToReInstall, MessageLoc,
- /*isImported=*/false, /*Overrides*/None);
- }
+ appendDefMacroDirective(IdentInfo, MacroToReInstall, MessageLoc);
// Pop PragmaPushMacroInfo stack.
iter->second.pop_back();
OpenPOWER on IntegriCloud