diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenFunction.cpp | 3 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/move-assignment.cpp | 26 |
2 files changed, 28 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index 20352f9f685..c9279a27f11 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -702,7 +702,8 @@ void CodeGenFunction::GenerateCode(GlobalDecl GD, llvm::Function *Fn, // clones the body of the function call operator (but is actually static). EmitLambdaStaticInvokeFunction(cast<CXXMethodDecl>(FD)); } else if (FD->isDefaulted() && isa<CXXMethodDecl>(FD) && - cast<CXXMethodDecl>(FD)->isCopyAssignmentOperator()) { + (cast<CXXMethodDecl>(FD)->isCopyAssignmentOperator() || + cast<CXXMethodDecl>(FD)->isMoveAssignmentOperator())) { // Implicit copy-assignment gets the same special treatment as implicit // copy-constructors. emitImplicitAssignmentOperatorBody(Args); diff --git a/clang/test/CodeGenCXX/move-assignment.cpp b/clang/test/CodeGenCXX/move-assignment.cpp new file mode 100644 index 00000000000..3653eab6b7d --- /dev/null +++ b/clang/test/CodeGenCXX/move-assignment.cpp @@ -0,0 +1,26 @@ +// RUN: %clang_cc1 -emit-llvm -std=c++11 -o - %s -triple x86_64-pc-linux-gnu | FileCheck %s + +struct A { + A &operator=(A&&); +}; + +struct B { + A a; + int i; + bool b; + char c; + long l; + float f; +}; + +void test1() { + B b1, b2; + b1 = static_cast<B&&>(b2); +} + +// CHECK-LABEL: define {{.*}} @_ZN1BaSEOS_ +// CHECK: call {{.*}} @_ZN1AaSEOS_ +// CHECK-NOT: store +// CHECK: call {{.*}}memcpy{{.*}}, i64 24 +// CHECK-NOT: store +// CHECK: ret |
