Modules: Add -Rmodule-import

Add a remark for importing modules.  Depending on whether this is a
direct import (into the TU being built by this compiler instance) or
transitive import (into an already-imported module), the diagnostic has
two forms:

    importing module 'Foo' from 'path/to/Foo.pcm'
    importing module 'Foo' into 'Bar' from 'path/to/Foo.pcm'

Also drop a redundant FileCheck invocation in Rmodule-build.m that was
using -Reverything, since the notes from -Rmodule-import were confusing
it.

https://reviews.llvm.org/D58891

llvm-svn: 355477

5 files changed, 10 insertions, 0 deletions

diff --git a/clang/test/Modules/Inputs/Rmodule-import/A.h b/clang/test/Modules/Inputs/Rmodule-import/A.h
new file mode 100644
index 00000000000..2b9dab85877
--- /dev/null
+++ b/clang/test/Modules/Inputs/Rmodule-import/A.h
@@ -0,0 +1,2 @@
+// A
+#include "B.h"
diff --git a/clang/test/Modules/Inputs/Rmodule-import/B.h b/clang/test/Modules/Inputs/Rmodule-import/B.h
new file mode 100644
index 00000000000..a2711d4043f
--- /dev/null
+++ b/clang/test/Modules/Inputs/Rmodule-import/B.h
@@ -0,0 +1,2 @@
+// B
+#include "C.h"
diff --git a/clang/test/Modules/Inputs/Rmodule-import/C.h b/clang/test/Modules/Inputs/Rmodule-import/C.h
new file mode 100644
index 00000000000..6f30d4750ea
--- /dev/null
+++ b/clang/test/Modules/Inputs/Rmodule-import/C.h
@@ -0,0 +1 @@
+// C
diff --git a/clang/test/Modules/Inputs/Rmodule-import/D.h b/clang/test/Modules/Inputs/Rmodule-import/D.h
new file mode 100644
index 00000000000..61177ec3a3d
--- /dev/null
+++ b/clang/test/Modules/Inputs/Rmodule-import/D.h
@@ -0,0 +1 @@
+// D
diff --git a/clang/test/Modules/Inputs/Rmodule-import/module.modulemap b/clang/test/Modules/Inputs/Rmodule-import/module.modulemap
new file mode 100644
index 00000000000..cf7cf1f7e56
--- /dev/null
+++ b/clang/test/Modules/Inputs/Rmodule-import/module.modulemap
@@ -0,0 +1,4 @@
+module A { header "A.h" }
+module B { header "B.h" }
+module C { header "C.h" }
+module D { header "D.h" }