[llvm-branch-commits] [cfe-branch] r243605 - Merging r242600:

[Hans Wennborg]

Author: hans
Date: Wed Jul 29 20:50:41 2015
New Revision: 243605

URL: http://llvm.org/viewvc/llvm-project?rev=243605&view=rev
Log:
Merging r242600:
------------------------------------------------------------------------
r242600 | davide | 2015-07-17 18:15:19 -0700 (Fri, 17 Jul 2015) | 8 lines

[Sema] Emit correct warning when copy-elision is not possible.

If we're returning a function parameter, copy elision isn't possible,
so we now warn for redundant move.

PR:		23819
Differential Revision:	 http://reviews.llvm.org/D11305

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

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

Propchange: cfe/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 20:50:41 2015
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:242244,242285,242293,242297,242313,242382,242422,242499,242574,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,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/lib/Sema/SemaInit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/lib/Sema/SemaInit.cpp?rev=243605&r1=243604&r2=243605&view=diff
==============================================================================
--- cfe/branches/release_37/lib/Sema/SemaInit.cpp (original)
+++ cfe/branches/release_37/lib/Sema/SemaInit.cpp Wed Jul 29 20:50:41 2015
@@ -5986,6 +5986,11 @@ static void CheckMoveOnConstruction(Sema
     if (!VD->getType()->isRecordType())
       return;
 
+    // If we're returning a function parameter, copy elision
+    // is not possible.
+    if (isa<ParmVarDecl>(VD))
+      DiagID = diag::warn_redundant_move_on_return;
+
     if (DiagID == 0) {
       DiagID = S.Context.hasSameUnqualifiedType(DestType, VD->getType())
                    ? diag::warn_pessimizing_move_on_return

Modified: cfe/branches/release_37/test/SemaCXX/warn-pessmizing-move.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/test/SemaCXX/warn-pessmizing-move.cpp?rev=243605&r1=243604&r2=243605&view=diff
==============================================================================
--- cfe/branches/release_37/test/SemaCXX/warn-pessmizing-move.cpp (original)
+++ cfe/branches/release_37/test/SemaCXX/warn-pessmizing-move.cpp Wed Jul 29 20:50:41 2015
@@ -23,10 +23,6 @@ A test1(A a1) {
   return a1;
   return a2;
   return std::move(a1);
-  // expected-warning at -1{{prevents copy elision}}
-  // expected-note at -2{{remove std::move call}}
-  // CHECK: fix-it:"{{.*}}":{[[@LINE-3]]:10-[[@LINE-3]]:20}:""
-  // CHECK: fix-it:"{{.*}}":{[[@LINE-4]]:22-[[@LINE-4]]:23}:""
   return std::move(a2);
   // expected-warning at -1{{prevents copy elision}}
   // expected-note at -2{{remove std::move call}}
@@ -46,10 +42,6 @@ B test2(A a1, B b1) {
   return b1;
   return b2;
   return std::move(b1);
-  // expected-warning at -1{{prevents copy elision}}
-  // expected-note at -2{{remove std::move call}}
-  // CHECK: fix-it:"{{.*}}":{[[@LINE-3]]:10-[[@LINE-3]]:20}:""
-  // CHECK: fix-it:"{{.*}}":{[[@LINE-4]]:22-[[@LINE-4]]:23}:""
   return std::move(b2);
   // expected-warning at -1{{prevents copy elision}}
   // expected-note at -2{{remove std::move call}}
@@ -163,9 +155,10 @@ A test7() {
 #define wrap1(x) x
 #define wrap2(x) x
 
-// Macro test.  Since the std::move call is outside the macro, it is
+// Macro test. Since the std::move call is outside the macro, it is
 // safe to suggest a fix-it.
-A test8(A a) {
+A test8() {
+  A a;
   return std::move(a);
   // expected-warning at -1{{prevents copy elision}}
   // expected-note at -2{{remove std::move call}}
@@ -184,7 +177,8 @@ A test8(A a) {
 }
 
 #define test9            \
-  A test9(A a) {         \
+  A test9() {            \
+    A a;                 \
     return std::move(a); \
   }
 
@@ -196,7 +190,8 @@ test9
 #define return_a return std::move(a)
 
 // Macro test.  The std::call is inside the macro, so no fix-it is suggested.
-A test10(A a) {
+A test10() {
+  A a;
   return_a;
   // expected-warning at -1{{prevents copy elision}}
   // CHECK-NOT: fix-it

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=243605&r1=243604&r2=243605&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:50:41 2015
@@ -90,3 +90,10 @@ C test4(A& a1, B& b1) {
   return std::move(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}}