2 files changed, 11 insertions, 10 deletions
diff --git a/test/Sema/return.cpp b/test/Sema/return.cpp
deleted file mode 100644
index 754bc986b3..0000000000
--- a/test/Sema/return.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %clang %s -fsyntax-only -Wreturn-type
-
-struct C {
-  C() {
-    return 42; // expected-warning {{constructor 'C' should not return a value}}
-  }
-  ~C() {
-    return 42; // expected-warning {{destructor '~C' should not return a value}}
-  }
-};
diff --git a/test/SemaCXX/return.cpp b/test/SemaCXX/return.cpp
index b457f6ace5..2f98a277f6 100644
--- a/test/SemaCXX/return.cpp
+++ b/test/SemaCXX/return.cpp
@@ -69,3 +69,14 @@ namespace PR10057 {
     return S() = value;
   }
 }
+
+namespace return_has_expr {
+  struct S {
+    S() {
+      return 42; // expected-error {{constructor 'S' should not return a value}}
+    }
+    ~S() {
+      return 42; // expected-error {{destructor '~S' should not return a value}}
+    }
+  };
+}