3 files changed, 15 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/cxx17/decls.h b/clang/test/Modules/Inputs/cxx17/decls.h
new file mode 100644
index 00000000000..473b6d15112
--- /dev/null
+++ b/clang/test/Modules/Inputs/cxx17/decls.h
@@ -0,0 +1,3 @@
+struct MergeExceptionSpec {
+  ~MergeExceptionSpec(); // unevaluated exception spec
+};
diff --git a/clang/test/Modules/Inputs/cxx17/module.modulemap b/clang/test/Modules/Inputs/cxx17/module.modulemap
new file mode 100644
index 00000000000..2339e49e03b
--- /dev/null
+++ b/clang/test/Modules/Inputs/cxx17/module.modulemap
@@ -0,0 +1 @@
+module Decls { header "decls.h" }
diff --git a/clang/test/Modules/cxx17.cpp b/clang/test/Modules/cxx17.cpp
new file mode 100644
index 00000000000..1efb490828d
--- /dev/null
+++ b/clang/test/Modules/cxx17.cpp
@@ -0,0 +1,11 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -x c++ -std=c++1z -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs/cxx17 %s -verify -fno-modules-error-recovery
+
+// expected-no-diagnostics
+struct MergeExceptionSpec {
+  ~MergeExceptionSpec();
+} mergeExceptionSpec; // trigger evaluation of exception spec
+
+#include "decls.h"
+
+MergeExceptionSpec mergeExceptionSpec2;