aboutsummaryrefslogtreecommitdiff
path: root/lib/CodeGen/CGExprAgg.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2010-05-20 16:46:55 +0000
committerFariborz Jahanian <fjahanian@apple.com>2010-05-20 16:46:55 +0000
commit1d49f2112572c247ff9c209de112fbf5d9ecf765 (patch)
tree194c5fd39c11ded9e094e2de980d210ed51b8ba8 /lib/CodeGen/CGExprAgg.cpp
parent419aa964ae845aa5b1183fabb2f1cff78faaeddd (diff)
Copy construction of non-trivial properties must not
be turned into a setter call (fixes radar 8008649). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@104235 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGExprAgg.cpp')
-rw-r--r--lib/CodeGen/CGExprAgg.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index da2100df94..3bf2f8a520 100644
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -761,8 +761,7 @@ void CodeGenFunction::EmitAggregateCopy(llvm::Value *DestPtr,
if (const RecordType *RT = Ty->getAs<RecordType>()) {
CXXRecordDecl *Record = cast<CXXRecordDecl>(RT->getDecl());
assert((Record->hasTrivialCopyConstructor() ||
- Record->hasTrivialCopyAssignment() ||
- /*FIXME!*/getContext().getLangOptions().ObjC1) &&
+ Record->hasTrivialCopyAssignment()) &&
"Trying to aggregate-copy a type without a trivial copy "
"constructor or assignment operator");
// Ignore empty classes in C++.