[llvm-branch-commits] [cfe-branch] r243606 - Merging r242854:

[Hans Wennborg]

Author: hans
Date: Wed Jul 29 20:54:41 2015
New Revision: 243606

URL: http://llvm.org/viewvc/llvm-project?rev=243606&view=rev
Log:
Merging r242854:
------------------------------------------------------------------------
r242854 | rtrieu | 2015-07-21 16:38:30 -0700 (Tue, 21 Jul 2015) | 3 lines

Change a test to follow the formatting of the rest of the tests in the file.
No functional change.

------------------------------------------------------------------------

Modified:
    cfe/branches/release_37/   (props changed)
    cfe/branches/release_37/test/SemaCXX/warn-redundant-move.cpp

Propchange: cfe/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 20:54:41 2015
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:242244,242285,242293,242297,242313,242382,242422,242499,242574,242600,242660,242662,242667,242678,242766,242905,242973,243018,243048,243098,243101,243105,243144,243153,243196,243277,243280,243285,243289,243343,243417
+/cfe/trunk:242244,242285,242293,242297,242313,242382,242422,242499,242574,242600,242660,242662,242667,242678,242766,242854,242905,242973,243018,243048,243098,243101,243105,243144,243153,243196,243277,243280,243285,243289,243343,243417
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_37/test/SemaCXX/warn-redundant-move.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/test/SemaCXX/warn-redundant-move.cpp?rev=243606&r1=243605&r2=243606&view=diff
==============================================================================
--- cfe/branches/release_37/test/SemaCXX/warn-redundant-move.cpp (original)
+++ cfe/branches/release_37/test/SemaCXX/warn-redundant-move.cpp Wed Jul 29 20:54:41 2015
@@ -91,9 +91,14 @@ C test4(A& a1, B& b1) {
   return std::move(b2);
 }
 
-//PR23819
-struct X {};
-X g();
-void h(X&&);
-X f(X x) { return std::move(x); } //expected-warning{{redundant move in return statement}} \
-                                  //expected-note{{remove std::move call here}}
+// PR23819, case 2
+struct D {};
+D test5(D d) {
+  return d;
+
+  return std::move(d);
+  // expected-warning at -1{{redundant move in return statement}}
+  // expected-note at -2{{remove std::move call here}}
+  // CHECK: fix-it:"{{.*}}":{[[@LINE-3]]:10-[[@LINE-3]]:20}:""
+  // CHECK: fix-it:"{{.*}}":{[[@LINE-4]]:21-[[@LINE-4]]:22}:""
+}