Fixes a typo which prevented proper code gen. for
copy-in of c++ class objects into blocks.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@105622 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 3473ef0..da7c6a2 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -1764,8 +1764,7 @@
if (!Res.isInvalid()) {
Res = MaybeCreateCXXExprWithTemporaries(move(Res));
Expr *Init = Res.takeAs<Expr>();
- if (isa<CXXConstructExpr>(Init))
- BDRE->setCopyConstructorExpr(Init);
+ BDRE->setCopyConstructorExpr(Init);
}
}
return Owned(BDRE);
diff --git a/test/CodeGenCXX/copy-in-cplus-object.cpp b/test/CodeGenCXX/copy-in-cplus-object.cpp
index 8198798..cac6155 100644
--- a/test/CodeGenCXX/copy-in-cplus-object.cpp
+++ b/test/CodeGenCXX/copy-in-cplus-object.cpp
@@ -1,8 +1,13 @@
// RUN: %clang_cc1 %s -fblocks -triple x86_64-apple-darwin -emit-llvm -o - | FileCheck %s
+struct S {
+ S(const char *);
+ ~S();
+};
+
struct TestObject
{
- TestObject(const TestObject& inObj, int def = 100);
+ TestObject(const TestObject& inObj, int def = 100, const S &Silly = "silly");
TestObject();
TestObject& operator=(const TestObject& inObj);
int version() const;
@@ -14,5 +19,8 @@
int (^V)() = ^{ return one.version(); };
}
-// CHECK: call void @_ZN10TestObjectC1ERKS_i
+// CHECK: call void @_ZN10TestObjectC1Ev
+// CHECK: call void @_ZN1SC1EPKc
+// CHECK: call void @_ZN10TestObjectC1ERKS_iRK1S
+// CHECK: call void @_ZN1SD1Ev