commit dbbc5236395171104128620dd4aed4084ba92c68
author Richard Smith <richard-llvm@metafoo.co.uk> Thu May 14 02:25:44 2015 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Thu May 14 02:25:44 2015 +0000
tree 984f066593ef31b4c2107a2d78da33931b8cb3d3
parent c9fa0b8e2178f2c23a75157b9e861c2e0f121dc7

[modules] Rearrange preprocessor module visibility handling, no observable change intended.

llvm-svn: 237331

clang/lib/Lex/Preprocessor.cpp

diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp
index 21dccd1..87e6b52 100644
--- a/clang/lib/Lex/Preprocessor.cpp
+++ b/clang/lib/Lex/Preprocessor.cpp
@@ -775,7 +775,7 @@
       });
 
   // Add this module to the imports list of the currently-built submodule.
-  if (!BuildingSubmoduleStack.empty())
+  if (!BuildingSubmoduleStack.empty() && M != BuildingSubmoduleStack.back().M)
     BuildingSubmoduleStack.back().M->Imports.insert(M);
 }