[modules] When diagnosing errors in module map files found by 'extern module' declarations, show how we got to that module map file.

llvm-svn: 242105
diff --git a/clang/test/Modules/Inputs/diagnostics-aux.modulemap b/clang/test/Modules/Inputs/diagnostics-aux.modulemap
index d067d04..2c6ecb9 100644
--- a/clang/test/Modules/Inputs/diagnostics-aux.modulemap
+++ b/clang/test/Modules/Inputs/diagnostics-aux.modulemap
@@ -1 +1,3 @@
 module foo {}
+
+extern module external "diagnostics-aux-2.modulemap"
diff --git a/clang/test/Modules/diagnostics.modulemap b/clang/test/Modules/diagnostics.modulemap
index aef094d..3b5b6a5 100644
--- a/clang/test/Modules/diagnostics.modulemap
+++ b/clang/test/Modules/diagnostics.modulemap
@@ -1,5 +1,8 @@
 // RUN: not %clang_cc1 -fmodules -fmodules-cache-path=%t -fmodule-map-file=%S/Inputs/diagnostics-aux.modulemap -fmodule-map-file=%s -fsyntax-only -x c++ /dev/null 2>&1 | FileCheck %s
 
+// CHECK: In file included from {{.*}}diagnostics-aux.modulemap:3:
+// CHECK: diagnostics-aux-2.modulemap:2:3: error: expected
+
 // PR22299: Ensure we can produce diagnostics for duplicate modules from -fmodule-map-file=.
 //
 // CHECK: diagnostics.modulemap:[[@LINE+2]]:8: error: redefinition of module 'foo'