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

[Richard Smith]

Author: rsmith
Date: Thu Apr 23 19:41:09 2015
New Revision: 235677

URL: http://llvm.org/viewvc/llvm-project?rev=235677&view=rev
Log:
[modules] Partial revert of r235669: don't create ModuleMacros for imported local macros.

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

Modified:
    cfe/trunk/lib/Lex/PPLexerChange.cpp

Modified: cfe/trunk/lib/Lex/PPLexerChange.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPLexerChange.cpp?rev=235677&r1=235676&r2=235677&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/PPLexerChange.cpp (original)
+++ cfe/trunk/lib/Lex/PPLexerChange.cpp Thu Apr 23 19:41:09 2015
@@ -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();