2 files changed, 22 insertions, 5 deletions
diff --git a/clang/test/Modules/DebugInfoSubmoduleImport.c b/clang/test/Modules/DebugInfoSubmoduleImport.c
new file mode 100644
index 00000000000..d5be3ca1462
--- /dev/null
+++ b/clang/test/Modules/DebugInfoSubmoduleImport.c
@@ -0,0 +1,15 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -fmodules -fmodule-format=obj -g -dwarf-ext-refs \
+// RUN:     -fimplicit-module-maps -x c -fmodules-cache-path=%t -I %S/Inputs \
+// RUN:     %s -emit-llvm -o - | FileCheck %s
+#include "DebugSubmoduleA.h"
+#include "DebugSubmoduleB.h"
+
+// CHECK: !DICompileUnit
+// CHECK-NOT: !DICompileUnit
+// CHECK: !DIModule(scope: ![[PARENT:.*]], name: "DebugSubmoduleA"
+// CHECK: [[PARENT]] = !DIModule(scope: null, name: "DebugSubmodules"
+// CHECK: !DIModule(scope: ![[PARENT]], name: "DebugSubmoduleB"
+// CHECK: !DICompileUnit({{.*}}splitDebugFilename: {{.*}}DebugSubmodules
+// CHECK-SAME:                 dwoId:
+// CHECK-NOT: !DICompileUnit
diff --git a/clang/test/Modules/DebugInfoSubmodules.c b/clang/test/Modules/DebugInfoSubmodules.c
index fdcff07c122..8987a57b129 100644
--- a/clang/test/Modules/DebugInfoSubmodules.c
+++ b/clang/test/Modules/DebugInfoSubmodules.c
@@ -1,16 +1,18 @@
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -fmodules -fmodule-format=obj -g -dwarf-ext-refs \
 // RUN:     -fimplicit-module-maps -x c -fmodules-cache-path=%t -I %S/Inputs \
-// RUN:     %s -mllvm -debug-only=pchcontainer 2>&1 | FileCheck %s
+// RUN:     %s -mllvm -debug-only=pchcontainer -emit-llvm -o %t.ll \
+// RUN:     2>&1 | FileCheck %s
 // REQUIRES: asserts
 #include "DebugSubmoduleA.h"
 
 // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "A",
 // CHECK-SAME:             scope: ![[SUBMODULEA:[0-9]+]]
-// CHECK: ![[SUBMODULEA]] = !DIModule(
-// CHECK-SAME:                        name: "DebugSubmodules.DebugSubmoduleA",
+// CHECK: ![[SUBMODULEA]] = !DIModule(scope: ![[PARENT:[0-9]+]],
+// CHECK-SAME:                        name: "DebugSubmoduleA",
+// CHECK: ![[PARENT]] = !DIModule(scope: null, name: "DebugSubmodules"
 
 // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "B",
 // CHECK-SAME:             scope: ![[SUBMODULEB:[0-9]+]]
-// CHECK: ![[SUBMODULEB]] = !DIModule(
-// CHECK-SAME:                        name: "DebugSubmodules.DebugSubmoduleB",
+// CHECK: ![[SUBMODULEB]] = !DIModule(scope: ![[PARENT]],
+// CHECK-SAME:                        name: "DebugSubmoduleB",