commit 6855ba2c95e7dde1402e54c0500300cfefcfafd2
author Fariborz Jahanian <fjahanian@apple.com> Thu May 20 16:46:55 2010 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Thu May 20 16:46:55 2010 +0000
tree a4e7e1fde0e3f64a7f8f23ecdaa879ba9c383972
parent 981563d0baaa7108c3a5dc4c66d783bcc3282ab4

Copy construction of non-trivial properties must not
be turned into a setter call (fixes radar 8008649).

llvm-svn: 104235

clang/lib/CodeGen/CGExprAgg.cpp

diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index da2100d..3bf2f8a 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -761,8 +761,7 @@
     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++.