diff options
| -rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 5 | ||||
| -rw-r--r-- | clang/test/SemaCXX/warn-pessmizing-move.cpp | 19 | ||||
| -rw-r--r-- | clang/test/SemaCXX/warn-redundant-move.cpp | 7 |
3 files changed, 19 insertions, 12 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index f0f7cb93d33..25d091f1d8c 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -5988,6 +5988,11 @@ static void CheckMoveOnConstruction(Sema &S, const Expr *InitExpr, 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 diff --git a/clang/test/SemaCXX/warn-pessmizing-move.cpp b/clang/test/SemaCXX/warn-pessmizing-move.cpp index 6b49944f287..f5a4b909466 100644 --- a/clang/test/SemaCXX/warn-pessmizing-move.cpp +++ b/clang/test/SemaCXX/warn-pessmizing-move.cpp @@ -23,10 +23,6 @@ A test1(A a1) { return a1; return a2; return std::move(a1); - // expected-warning@-1{{prevents copy elision}} - // expected-note@-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@-1{{prevents copy elision}} // expected-note@-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@-1{{prevents copy elision}} - // expected-note@-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@-1{{prevents copy elision}} // expected-note@-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@-1{{prevents copy elision}} // expected-note@-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@-1{{prevents copy elision}} // CHECK-NOT: fix-it diff --git a/clang/test/SemaCXX/warn-redundant-move.cpp b/clang/test/SemaCXX/warn-redundant-move.cpp index feb9e6f408d..e7996618c09 100644 --- a/clang/test/SemaCXX/warn-redundant-move.cpp +++ b/clang/test/SemaCXX/warn-redundant-move.cpp @@ -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}} |
