[Modules] Find PrivateHeaders when looking into subframeworks

Fix the current parsing of subframeworks in modulemaps to lookup for
headers based on whether they are frameworks.

rdar://problem/30563982

llvm-svn: 298391

10 files changed, 33 insertions, 0 deletions

diff --git a/clang/test/Modules/Inputs/Main.framework/Frameworks/Sub.framework/Headers/B.h b/clang/test/Modules/Inputs/Main.framework/Frameworks/Sub.framework/Headers/B.h
new file mode 100644
index 00000000000..761540b09cb
--- /dev/null
+++ b/clang/test/Modules/Inputs/Main.framework/Frameworks/Sub.framework/Headers/B.h
@@ -0,0 +1 @@
+// B.h
diff --git a/clang/test/Modules/Inputs/Main.framework/Frameworks/Sub.framework/Headers/Sub.h b/clang/test/Modules/Inputs/Main.framework/Frameworks/Sub.framework/Headers/Sub.h
new file mode 100644
index 00000000000..fd86e3cf872
--- /dev/null
+++ b/clang/test/Modules/Inputs/Main.framework/Frameworks/Sub.framework/Headers/Sub.h
@@ -0,0 +1,2 @@
+// Sub.h
+#import "B.h"
diff --git a/clang/test/Modules/Inputs/Main.framework/Frameworks/Sub.framework/PrivateHeaders/BPriv.h b/clang/test/Modules/Inputs/Main.framework/Frameworks/Sub.framework/PrivateHeaders/BPriv.h
new file mode 100644
index 00000000000..4ab49b798c6
--- /dev/null
+++ b/clang/test/Modules/Inputs/Main.framework/Frameworks/Sub.framework/PrivateHeaders/BPriv.h
@@ -0,0 +1 @@
+// BPriv.h
diff --git a/clang/test/Modules/Inputs/Main.framework/Frameworks/Sub.framework/PrivateHeaders/SubPriv.h b/clang/test/Modules/Inputs/Main.framework/Frameworks/Sub.framework/PrivateHeaders/SubPriv.h
new file mode 100644
index 00000000000..f6ac6188d65
--- /dev/null
+++ b/clang/test/Modules/Inputs/Main.framework/Frameworks/Sub.framework/PrivateHeaders/SubPriv.h
@@ -0,0 +1 @@
+#import "BPriv.h"
diff --git a/clang/test/Modules/Inputs/Main.framework/Headers/A.h b/clang/test/Modules/Inputs/Main.framework/Headers/A.h
new file mode 100644
index 00000000000..975f1f0437b
--- /dev/null
+++ b/clang/test/Modules/Inputs/Main.framework/Headers/A.h
@@ -0,0 +1 @@
+// A.h
diff --git a/clang/test/Modules/Inputs/Main.framework/Headers/Main.h b/clang/test/Modules/Inputs/Main.framework/Headers/Main.h
new file mode 100644
index 00000000000..cb8cc00a0c4
--- /dev/null
+++ b/clang/test/Modules/Inputs/Main.framework/Headers/Main.h
@@ -0,0 +1,2 @@
+// Main.h
+#import "A.h"
diff --git a/clang/test/Modules/Inputs/Main.framework/Modules/module.modulemap b/clang/test/Modules/Inputs/Main.framework/Modules/module.modulemap
new file mode 100644
index 00000000000..9fab5d350fe
--- /dev/null
+++ b/clang/test/Modules/Inputs/Main.framework/Modules/module.modulemap
@@ -0,0 +1,12 @@
+framework module Main {
+  umbrella header "Main.h"
+
+  module * { export * }
+  export *
+
+  framework module Sub {
+    umbrella header "Sub.h"
+    module * { export * }
+    export *
+  }
+}
diff --git a/clang/test/Modules/Inputs/Main.framework/Modules/module.private.modulemap b/clang/test/Modules/Inputs/Main.framework/Modules/module.private.modulemap
new file mode 100644
index 00000000000..54e8be79bfa
--- /dev/null
+++ b/clang/test/Modules/Inputs/Main.framework/Modules/module.private.modulemap
@@ -0,0 +1,11 @@
+module Main.Private {
+  umbrella header "MainPriv.h"
+  module * { export * }
+  export *
+}
+
+module Main.Sub.Private {
+  umbrella header "SubPriv.h"
+  module * { export * }
+  export *
+}
diff --git a/clang/test/Modules/Inputs/Main.framework/PrivateHeaders/APriv.h b/clang/test/Modules/Inputs/Main.framework/PrivateHeaders/APriv.h
new file mode 100644
index 00000000000..6ac683c39c5
--- /dev/null
+++ b/clang/test/Modules/Inputs/Main.framework/PrivateHeaders/APriv.h
@@ -0,0 +1 @@
+// APriv.h
diff --git a/clang/test/Modules/Inputs/Main.framework/PrivateHeaders/MainPriv.h b/clang/test/Modules/Inputs/Main.framework/PrivateHeaders/MainPriv.h
new file mode 100644
index 00000000000..68103017ad0
--- /dev/null
+++ b/clang/test/Modules/Inputs/Main.framework/PrivateHeaders/MainPriv.h
@@ -0,0 +1 @@
+#import "APriv.h"