r237609 - [modules] When a file is listed as a non-textual header in a module map, don't

[Richard Smith]

Author: rsmith
Date: Mon May 18 15:02:41 2015
New Revision: 237609

URL: http://llvm.org/viewvc/llvm-project?rev=237609&view=rev
Log:
[modules] When a file is listed as a non-textual header in a module map, don't
enter it more than once, even if it doesn't have #include guards -- we already
know that it is intended to have the same effect every time it's included, and
it's already had that effect. This particularly helps with local submodule
visibility builds, where the include guard macro may not be visible in the
includer, but will become visible the moment we enter the included file.

Modified:
    cfe/trunk/lib/Lex/PPDirectives.cpp
    cfe/trunk/test/Modules/malformed.cpp

Modified: cfe/trunk/lib/Lex/PPDirectives.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPDirectives.cpp?rev=237609&r1=237608&r2=237609&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/PPDirectives.cpp (original)
+++ cfe/trunk/lib/Lex/PPDirectives.cpp Mon May 18 15:02:41 2015
@@ -1737,13 +1737,12 @@ void Preprocessor::HandleIncludeDirectiv
     std::max(HeaderInfo.getFileDirFlavor(File),
              SourceMgr.getFileCharacteristic(FilenameTok.getLocation()));
 
-  // FIXME: If we have a suggested module, and we've already visited this file,
-  // don't bother entering it again. We know it has no further effect.
-
   // Ask HeaderInfo if we should enter this #include file.  If not, #including
-  // this file will have no effect.
+  // this file will have no effect. We treat any textual inclusion of a modular
+  // header as a #import here.
   if (ShouldEnter &&
-      !HeaderInfo.ShouldEnterIncludeFile(*this, File, isImport)) {
+      !HeaderInfo.ShouldEnterIncludeFile(
+          *this, File, isImport || SuggestedModule.getModule())) {
     ShouldEnter = false;
     if (Callbacks)
       Callbacks->FileSkipped(*File, FilenameTok, FileCharacter);

Modified: cfe/trunk/test/Modules/malformed.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/malformed.cpp?rev=237609&r1=237608&r2=237609&view=diff
==============================================================================
--- cfe/trunk/test/Modules/malformed.cpp (original)
+++ cfe/trunk/test/Modules/malformed.cpp Mon May 18 15:02:41 2015
@@ -23,9 +23,9 @@
 // CHECK-B: {{^}}Inputs/malformed/b1.h:1:{{.*}} note: to match this '{'
 // CHECK-B: {{^}}Inputs/malformed/b1.h:3:{{.*}} error: extraneous closing brace ('}')
 //
-// CHECK-B: While building module 'malformed_b'
-// CHECK-B: {{^}}Inputs/malformed/b2.h:1:{{.*}} error: redefinition of 'g'
-// CHECK-B: {{^}}Inputs/malformed/b2.h:1:{{.*}} note: previous definition is here
+// We don't see another definition of 'g' because we don't re-enter b2.h
+// (even though it has no include guards).
+// CHECK-B-NOT: redefinition of 'g'
 
 void test() { f<int>(); }
 // Test that we use relative paths to name files within an imported module.