Allow inferred submodules for any (sub)module that has an umbrella header

llvm-svn: 145945

2 files changed, 5 insertions, 1 deletions

diff --git a/clang/test/Modules/Inputs/DependsOnModule.framework/module.map b/clang/test/Modules/Inputs/DependsOnModule.framework/module.map
index d7712752854..6bf82b46d3d 100644
--- a/clang/test/Modules/Inputs/DependsOnModule.framework/module.map
+++ b/clang/test/Modules/Inputs/DependsOnModule.framework/module.map
@@ -6,5 +6,9 @@ framework module DependsOnModule {
   }
   explicit framework module SubFramework {
     umbrella "SubFramework.h"
+
+    module * {
+      export *
+    }
   }
 }
diff --git a/clang/test/Modules/auto-module-import.c b/clang/test/Modules/auto-module-import.c
index 783b53d068d..4c71f06a841 100644
--- a/clang/test/Modules/auto-module-import.c
+++ b/clang/test/Modules/auto-module-import.c
@@ -24,7 +24,7 @@ void testSubframeworkOther() {
 }
 
 // Test header cross-subframework include pattern.
-#include <DependsOnModule/../Frameworks/SubFramework.framework/Headers/Other.h> // expected-warning{{treating #include as an import of module 'DependsOnModule.SubFramework'}}
+#include <DependsOnModule/../Frameworks/SubFramework.framework/Headers/Other.h> // expected-warning{{treating #include as an import of module 'DependsOnModule.SubFramework.Other'}}
 
 void testSubframeworkOtherAgain() {
   double *sfo1 = sub_framework_other;