From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Fri, 24 Apr 2015 00:41:09 +0000 (+0000)
Subject: [modules] Partial revert of r235669: don't create ModuleMacros for imported local... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9f636ee94cb593977f2c1ea2779c8fd440122e6;p=clang

[modules] Partial revert of r235669: don't create ModuleMacros for imported local macros.

The surrounding infrastructure isn't quite ready for this yet.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@235677 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Lex/PPLexerChange.cpp b/lib/Lex/PPLexerChange.cpp
index 6cffbc3985..b53c40ec5c 100644
--- a/lib/Lex/PPLexerChange.cpp
+++ b/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();