Have -Wredundant-move ignore reference types.

Don't give a warning when the type being moved is a reference type.  Also
uncomment two lines in the test case.

llvm-svn: 237607
This commit is contained in:
Richard Trieu 2015-05-18 19:54:08 +00:00
parent c9f1124120
commit 1d4911bc99
2 changed files with 29 additions and 2 deletions

View File

@ -5831,6 +5831,9 @@ static void CheckMoveOnConstruction(Sema &S, const Expr *InitExpr,
if (!VD || !VD->hasLocalStorage()) if (!VD || !VD->hasLocalStorage())
return; return;
if (!VD->getType()->isRecordType())
return;
if (DiagID == 0) { if (DiagID == 0) {
DiagID = S.Context.hasSameUnqualifiedType(DestType, VD->getType()) DiagID = S.Context.hasSameUnqualifiedType(DestType, VD->getType())
? diag::warn_pessimizing_move_on_return ? diag::warn_pessimizing_move_on_return

View File

@ -17,8 +17,8 @@ struct B : public A {};
A test1(B b1) { A test1(B b1) {
B b2; B b2;
//return b1; return b1;
//return b2; return b2;
return std::move(b1); return std::move(b1);
// expected-warning@-1{{redundant move}} // expected-warning@-1{{redundant move}}
// expected-note@-2{{remove std::move call}} // expected-note@-2{{remove std::move call}}
@ -66,3 +66,27 @@ C test2(A a1, B b1) {
// CHECK: fix-it:"{{.*}}":{[[@LINE-3]]:10-[[@LINE-3]]:20}:"" // CHECK: fix-it:"{{.*}}":{[[@LINE-3]]:10-[[@LINE-3]]:20}:""
// CHECK: fix-it:"{{.*}}":{[[@LINE-4]]:22-[[@LINE-4]]:23}:"" // CHECK: fix-it:"{{.*}}":{[[@LINE-4]]:22-[[@LINE-4]]:23}:""
} }
// Copy of tests above with types changed to reference types.
A test3(B& b1) {
B& b2 = b1;
return b1;
return b2;
return std::move(b1);
return std::move(b2);
}
C test4(A& a1, B& b1) {
A& a2 = a1;
B& b2 = b1;
return a1;
return a2;
return b1;
return b2;
return std::move(a1);
return std::move(a2);
return std::move(b1);
return std::move(b2);
}