From c192b3dcffd5e672a2b2e1730e2440febb4fb192 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 5 Jul 2015 14:23:59 +0000
Subject: Vendor import of clang trunk r241361:
 https://llvm.org/svn/llvm-project/cfe/trunk@241361

---
 lib/Lex/Preprocessor.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/Lex/Preprocessor.cpp')

diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 7e33f1ccb487e..e2db638a33d02 100644
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -286,6 +286,10 @@ Preprocessor::macro_begin(bool IncludeExternalMacros) const {
     ExternalSource->ReadDefinedMacros();
   }
 
+  // Make sure we cover all macros in visible modules.
+  for (const ModuleMacro &Macro : ModuleMacros)
+    CurSubmoduleState->Macros.insert(std::make_pair(Macro.II, MacroState()));
+
   return CurSubmoduleState->Macros.begin();
 }
 
-- 
cgit v1.2.3