4 files changed, 11 insertions, 51 deletions
diff --git a/test/SemaCXX/cxx1z-init-statement.cpp b/test/SemaCXX/cxx1z-init-statement.cpp
index eea2589ab7c6..d37acd08ce77 100644
--- a/test/SemaCXX/cxx1z-init-statement.cpp
+++ b/test/SemaCXX/cxx1z-init-statement.cpp
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -std=c++1z -Wno-unused-value -verify %s
-// RUN: %clang_cc1 -std=c++17 -Wno-unused-value -verify %s
+// RUN: %clang_cc1 -std=c++1z -verify %s
+// RUN: %clang_cc1 -std=c++17 -verify %s
 
 void testIf() {
   int x = 0;
@@ -12,7 +12,7 @@ void testIf() {
     int x = 0; // expected-error {{redefinition of 'x'}}
 
   if (x; int a = 0) ++a;
-  if (x, +x; int a = 0) // expected-note 2 {{previous definition is here}}
+  if (x, +x; int a = 0) // expected-note 2 {{previous definition is here}} expected-warning {{unused}}
     int a = 0; // expected-error {{redefinition of 'a'}}
   else
     int a = 0; // expected-error {{redefinition of 'a'}}
@@ -48,7 +48,7 @@ void testSwitch() {
       ++a;
   }
 
-  switch (x, +x; int a = 0) { // expected-note {{previous definition is here}}
+  switch (x, +x; int a = 0) { // expected-note {{previous definition is here}} expected-warning {{unused}}
     case 0:
       int a = 0; // expected-error {{redefinition of 'a'}} // expected-note {{previous definition is here}}
     case 1:
diff --git a/test/SemaCXX/for-range-examples.cpp b/test/SemaCXX/for-range-examples.cpp
index 5424b7a8ee79..477789b56c14 100644
--- a/test/SemaCXX/for-range-examples.cpp
+++ b/test/SemaCXX/for-range-examples.cpp
@@ -244,7 +244,7 @@ void foo ()
 { 
   int b = 1, a[b];
   a[0] = 0;
-  [&] { for (int c : a) 0; } (); // expected-warning {{expression result unused}}
+  [&] { for (int c : a) 0; } ();
 }
 
 
diff --git a/test/SemaCXX/warn-float-conversion.cpp b/test/SemaCXX/warn-float-conversion.cpp
index 7dec4844b062..fad1ff147e49 100644
--- a/test/SemaCXX/warn-float-conversion.cpp
+++ b/test/SemaCXX/warn-float-conversion.cpp
@@ -44,17 +44,17 @@ void Convert(float f, double d, long double ld) {
 void CompoundAssignment() {
   int x = 3;
 
-  x += 1.234;  //expected-warning{{conversion}}
-  x -= -0.0;  //expected-warning{{conversion}}
-  x *= 1.1f;  //expected-warning{{conversion}}
-  x /= -2.2f;  //expected-warning{{conversion}}
+  x += 1.234; // expected-warning {{implicit conversion turns floating-point number into integer: 'double' to 'int'}}
+  x -= -0.0;  // expected-warning {{implicit conversion turns floating-point number into integer: 'double' to 'int'}}
+  x *= 1.1f;  // expected-warning {{implicit conversion turns floating-point number into integer: 'float' to 'int'}}
+  x /= -2.2f; // expected-warning {{implicit conversion turns floating-point number into integer: 'float' to 'int'}}
 
-  int y = x += 1.4f;  //expected-warning{{conversion}}
+  int y = x += 1.4f; // expected-warning {{implicit conversion turns floating-point number into integer: 'float' to 'int'}}
 
   float z = 1.1f;
   double w = -2.2;
 
-  y += z + w;  //expected-warning{{conversion}}
+  y += z + w; // expected-warning {{implicit conversion turns floating-point number into integer: 'double' to 'int'}}
 }
 
 # 1 "foo.h" 3
diff --git a/test/SemaCXX/warn-unused-result.cpp b/test/SemaCXX/warn-unused-result.cpp
index f1de4618a741..88f5ab1e85c0 100644
--- a/test/SemaCXX/warn-unused-result.cpp
+++ b/test/SemaCXX/warn-unused-result.cpp
@@ -33,36 +33,6 @@ void test() {
   const S &s4 = g1();
 }
 
-void testSubstmts(int i) {
-  switch (i) {
-  case 0:
-    f(); // expected-warning {{ignoring return value}}
-  default:
-    f(); // expected-warning {{ignoring return value}}
-  }
-
-  if (i)
-    f(); // expected-warning {{ignoring return value}}
-  else
-    f(); // expected-warning {{ignoring return value}}
-
-  while (i)
-    f(); // expected-warning {{ignoring return value}}
-
-  do
-    f(); // expected-warning {{ignoring return value}}
-  while (i);
-
-  for (f(); // expected-warning {{ignoring return value}}
-       ;
-       f() // expected-warning {{ignoring return value}}
-      )
-    f(); // expected-warning {{ignoring return value}}
-
-  f(),  // expected-warning {{ignoring return value}}
-  (void)f();
-}
-
 struct X {
  int foo() __attribute__((warn_unused_result));
 };
@@ -236,13 +206,3 @@ void f() {
   (void)++p;
 }
 } // namespace
-
-namespace PR39837 {
-[[clang::warn_unused_result]] int f(int);
-
-void g() {
-  int a[2];
-  for (int b : a)
-    f(b); // expected-warning {{ignoring return value}}
-}
-} // namespace PR39837