[Sema] Fix volatile check when testing if a return object can be implicitly moved

In C++11 standard, to become implicitly movable, the expression in return
statement should be a non-volatile automatic object. CWG1579 changed the rule
to require that the expression only needs to be an automatic object. C++14
standard and C++17 standard kept this rule unchanged. C++20 standard changed
the rule back to require the expression be a non-volatile automatic object.
This should be a typo in standards, and VD should be non-volatile.

Differential Revision: https://reviews.llvm.org/D88295
This commit is contained in:
Yang Fan 2020-11-10 15:09:06 -05:00 committed by Arthur O'Dwyer
parent 6cb1c0cae0
commit 703038b35a
2 changed files with 30 additions and 3 deletions

View File

@ -3074,12 +3074,13 @@ bool Sema::isCopyElisionCandidate(QualType ReturnType, const VarDecl *VD,
// variable will no longer be used.
if (VD->hasAttr<BlocksAttr>()) return false;
// ...non-volatile...
if (VD->getType().isVolatileQualified())
return false;
if (CESK & CES_AllowDifferentTypes)
return true;
// ...non-volatile...
if (VD->getType().isVolatileQualified()) return false;
// Variables with higher required alignment than their type's ABI
// alignment cannot use NRVO.
if (!VD->getType()->isDependentType() && VD->hasAttr<AlignedAttr>() &&

View File

@ -0,0 +1,26 @@
// RUN: %clang_cc1 -std=c++20 -emit-llvm -triple x86_64-unknown-linux-gnu -o - %s | FileCheck %s
// RUN: %clang_cc1 -std=c++17 -emit-llvm -triple x86_64-unknown-linux-gnu -o - %s | FileCheck %s
// RUN: %clang_cc1 -std=c++14 -emit-llvm -triple x86_64-unknown-linux-gnu -o - %s | FileCheck %s
// RUN: %clang_cc1 -std=c++11 -emit-llvm -triple x86_64-unknown-linux-gnu -o - %s | FileCheck %s
// - volatile object in return statement don't match the rule for using move
// operation instead of copy operation. Thus should call the copy constructor
// A(const volatile A &).
//
// - volatile object in return statement also don't match the rule for copy
// elision. Thus the copy constructor A(const volatile A &) cannot be elided.
namespace test_volatile {
class A {
public:
A() {}
~A() {}
A(const volatile A &);
A(volatile A &&);
};
A test() {
volatile A a_copy;
// CHECK: call void @_ZN13test_volatile1AC1ERVKS0_
return a_copy;
}
} // namespace test_volatile