summaryrefslogtreecommitdiffstats
path: root/clang/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
commit6855ba2c95e7dde1402e54c0500300cfefcfafd2 (patch)
treea4e7e1fde0e3f64a7f8f23ecdaa879ba9c383972 /clang/lib/CodeGen/CGExprAgg.cpp
parent981563d0baaa7108c3a5dc4c66d783bcc3282ab4 (diff)
downloadbcm5719-llvm-6855ba2c95e7dde1402e54c0500300cfefcfafd2.tar.gz
bcm5719-llvm-6855ba2c95e7dde1402e54c0500300cfefcfafd2.zip
Copy construction of non-trivial properties must not
be turned into a setter call (fixes radar 8008649). llvm-svn: 104235
Diffstat (limited to 'clang/lib/CodeGen/CGExprAgg.cpp')
-rw-r--r--clang/lib/CodeGen/CGExprAgg.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index da2100df940..3bf2f8a5202 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/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++.
OpenPOWER on IntegriCloud