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

llvm-svn: 145945
diff --git a/clang/test/Modules/Inputs/DependsOnModule.framework/module.map b/clang/test/Modules/Inputs/DependsOnModule.framework/module.map
index d771275..6bf82b4 100644
--- a/clang/test/Modules/Inputs/DependsOnModule.framework/module.map
+++ b/clang/test/Modules/Inputs/DependsOnModule.framework/module.map
@@ -6,5 +6,9 @@
   }
   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 783b53d..4c71f06 100644
--- a/clang/test/Modules/auto-module-import.c
+++ b/clang/test/Modules/auto-module-import.c
@@ -24,7 +24,7 @@
 }
 
 // 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;