[modules] Support combining 'textual' with 'private'.

llvm-svn: 220589

4 files changed, 22 insertions, 1 deletions

diff --git a/clang/test/Modules/Inputs/declare-use/m.h b/clang/test/Modules/Inputs/declare-use/m.h
new file mode 100644
index 00000000000..e9089ab725d
--- /dev/null
+++ b/clang/test/Modules/Inputs/declare-use/m.h
@@ -0,0 +1,8 @@
+#ifdef GIMME_AN_M
+
+#ifndef M_H
+#define M_H
+const int m = 42;
+#endif
+
+#endif
diff --git a/clang/test/Modules/Inputs/declare-use/m2.h b/clang/test/Modules/Inputs/declare-use/m2.h
new file mode 100644
index 00000000000..9e72835c3bc
--- /dev/null
+++ b/clang/test/Modules/Inputs/declare-use/m2.h
@@ -0,0 +1 @@
+#include "m.h"
diff --git a/clang/test/Modules/Inputs/declare-use/module.map b/clang/test/Modules/Inputs/declare-use/module.map
index c6c6c951bd0..ae8615278ac 100644
--- a/clang/test/Modules/Inputs/declare-use/module.map
+++ b/clang/test/Modules/Inputs/declare-use/module.map
@@ -61,5 +61,10 @@ module XL {
   textual header "l.h"
 }
 
+module XM {
+  private textual header "m.h"
+  textual header "m2.h"
+}
+
 module XS {
 }
diff --git a/clang/test/Modules/textual-headers.cpp b/clang/test/Modules/textual-headers.cpp
index d1be8ad0321..cab9991e329 100644
--- a/clang/test/Modules/textual-headers.cpp
+++ b/clang/test/Modules/textual-headers.cpp
@@ -1,6 +1,6 @@
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -fmodule-maps -fmodules-cache-path=%t -fmodules-strict-decluse -fmodule-name=XG -I %S/Inputs/declare-use %s -verify
-// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -fmodules-strict-decluse -fmodule-name=XG -I %S/Inputs/declare-use %s -verify
+// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -fmodules-strict-decluse -fmodule-name=XG -I %S/Inputs/declare-use %s -verify -fno-modules-error-recovery
 
 #define GIMME_A_K
 #include "k.h"
@@ -8,4 +8,11 @@
 #define GIMME_AN_L
 #include "l.h" // expected-error {{module XG does not depend on a module exporting 'l.h'}}
 
+#include "m2.h" // expected-error {{module XG does not depend on a module exporting 'm2.h'}}
+const int use_m = m; // expected-error {{undeclared identifier}}
+
+#define GIMME_AN_M
+#include "m.h" // expected-error {{use of private header from outside its module: 'm.h'}}
+const int use_m_2 = m;
+
 const int g = k + l;