diff --git a/test/tools/dsymutil/Inputs/module-warnings/1.o b/test/tools/dsymutil/Inputs/module-warnings/1.o
new file mode 100644
index 000000000000..73531e278553
Binary files /dev/null and b/test/tools/dsymutil/Inputs/module-warnings/1.o differ
diff --git a/test/tools/dsymutil/Inputs/module-warnings/Bar.pcm b/test/tools/dsymutil/Inputs/module-warnings/Bar.pcm
new file mode 100644
index 000000000000..fdd8f8c7ffb9
Binary files /dev/null and b/test/tools/dsymutil/Inputs/module-warnings/Bar.pcm differ
diff --git a/test/tools/dsymutil/Inputs/module-warnings/Foo.pcm b/test/tools/dsymutil/Inputs/module-warnings/Foo.pcm
new file mode 100644
index 000000000000..2b1ca6f1ae12
Binary files /dev/null and b/test/tools/dsymutil/Inputs/module-warnings/Foo.pcm differ
diff --git a/test/tools/dsymutil/Inputs/module-warnings/libstatic.a b/test/tools/dsymutil/Inputs/module-warnings/libstatic.a
new file mode 100644
index 000000000000..48f161853ab3
Binary files /dev/null and b/test/tools/dsymutil/Inputs/module-warnings/libstatic.a differ
diff --git a/test/tools/dsymutil/Inputs/modules/libstatic.a b/test/tools/dsymutil/Inputs/modules/libstatic.a
deleted file mode 100644
index 46e79a5dd94b..000000000000
Binary files a/test/tools/dsymutil/Inputs/modules/libstatic.a and /dev/null differ
diff --git a/test/tools/dsymutil/X86/module-warnings.test b/test/tools/dsymutil/X86/module-warnings.test
new file mode 100644
index 000000000000..3240a2650583
--- /dev/null
+++ b/test/tools/dsymutil/X86/module-warnings.test
@@ -0,0 +1,53 @@
+# Compile with:
+#    cat >modules.modulemap <<EOF
+#      module Foo {
+#        header "Foo.h"
+#        export *
+#      }
+#      module Bar {
+#        header "Bar.h"
+#        export *
+#      }
+# EOF
+#    echo 'typedef int bar;' >Bar.h
+#    echo '@import Bar; typedef bar foo;' >Foo.h
+#    echo '@import Foo; foo f() { return 0; }' >module-warnings.m
+#    clang -cc1 -emit-obj -fmodules -fmodule-map-file=modules.modulemap \
+#      -fmodule-format=obj -debug-info-kind=standalone -dwarf-ext-refs \
+#      -fmodules-cache-path=ModuleCache \
+#      -fdisable-module-hash module-warnings.m -o 1.o
+#
+# Test for module-related warnings.
+#
+# RUN: rm -rf %t.dir && mkdir %t.dir && mkdir %t.dir/ModuleCache
+# RUN: cp %p/../Inputs/module-warnings/1.o %t.dir
+# RUN: cp %p/../Inputs/module-warnings/Foo.pcm %t.dir/ModuleCache
+#
+# RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir -y \
+# RUN:   %p/dummy-debug-map.map -o %t 2>&1 | FileCheck %s
+#
+# Module-not-found should be reported only once.
+# The exact error message depends on the OS so we don't check for it.
+# CHECK:     warning: {{.*}}Bar.pcm:
+# CHECK-NOT: warning: {{.*}}Bar.pcm:
+#
+# RUN: cp %p/../Inputs/module-warnings/libstatic.a %t.dir
+# RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 | FileCheck %s
+# CHECK: rebuild the module cache
+# CHECK-NOT: static libraries
+#
+# RUN: rm -rf %t.dir/ModuleCache
+# RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 \
+# RUN:   | FileCheck %s --check-prefix=STATIC
+# STATIC: warning: {{.*}}Bar.pcm:
+# STATIC: note: Linking a static library
+# STATIC: warning: {{.*}}Foo.pcm:
+# STATIC-NOT: note:
+
+---
+triple:          'x86_64-apple-darwin'
+objects:
+  - filename: libstatic.a(1.o)
+    symbols:
+      - { sym: __Z3foov, objAddr: 0x0, binAddr: 0x10000, size: 0x10 }
+...
diff --git a/test/tools/dsymutil/X86/modules-warnings.test b/test/tools/dsymutil/X86/modules-warnings.test
deleted file mode 100644
index 35538d60bb15..000000000000
--- a/test/tools/dsymutil/X86/modules-warnings.test
+++ /dev/null
@@ -1,26 +0,0 @@
-# Test for module-related warnings.
-# This reuses the inputs from the modules.m testcase.
-#
-# RUN: rm -rf %t.dir && mkdir %t.dir
-# RUN: cp %p/../Inputs/modules/1.o %p/../Inputs/modules/Foo.pcm %t.dir
-#
-# RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir -y \
-# RUN:   %p/dummy-debug-map.map -o %t 2>&1 | FileCheck %s
-#
-# Module-not-found should be reported only once.
-# The exact error message depends on the OS so we don't check for it.
-# CHECK:     warning: {{.*}}Bar.pcm:
-# CHECK-NOT: warning: {{.*}}Bar.pcm:
-#
-# RUN: cp %p/../Inputs/modules/libstatic.a %t.dir
-# RUN: llvm-dsymutil -f -oso-prepend-path=%t.dir -y %s -o %t 2>&1 | FileCheck %s
-# CHECK: rebuild the module cache
-# CHECK-NOT: static libraries
-
----
-triple:          'x86_64-apple-darwin'
-objects:
-  - filename: libstatic.a(1.o)
-    symbols:
-      - { sym: __Z3foov, objAddr: 0x0, binAddr: 0x10000, size: 0x10 }
-...
diff --git a/tools/dsymutil/DwarfLinker.cpp b/tools/dsymutil/DwarfLinker.cpp
index 7be8dfc5c04b..f865be29f5bf 100644
--- a/tools/dsymutil/DwarfLinker.cpp
+++ b/tools/dsymutil/DwarfLinker.cpp
@@ -3302,7 +3302,6 @@ void DwarfLinker::loadClangModule(StringRef Filename, StringRef ModulePath,
     bool isClangModule = sys::path::extension(Filename).equals(".pcm");
     bool isArchive = ObjFile.endswith(")");
     if (isClangModule) {
-      sys::path::remove_filename(Path);
       StringRef ModuleCacheDir = sys::path::parent_path(Path);
       if (sys::fs::exists(ModuleCacheDir)) {
         // If the module's parent directory exists, we assume that the module
@@ -3320,8 +3319,11 @@ void DwarfLinker::loadClangModule(StringRef Filename, StringRef ModulePath,
         // was built on a different machine. We don't want to discourage module
         // debugging for convenience libraries within a project though.
         if (!ArchiveHintDisplayed) {
-          errs() << "note: Module debugging should be disabled when shipping "
-                    "static libraries.\n";
+          errs() << "note: Linking a static library that was built with "
+                    "-gmodules, but the module cache was not found.  "
+                    "Redistributable static libraries should never be built "
+                    "with module debugging enabled.  The debug experience will "
+                    "be degraded due to incomplete debug information.\n";
           ArchiveHintDisplayed = true;
         }
       }