<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Nov 12, 2014 at 2:37 PM, Fariborz Jahanian <span dir="ltr"><<a href="mailto:fjahanian@apple.com" target="_blank">fjahanian@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: fjahanian<br>
Date: Wed Nov 12 16:37:43 2014<br>
New Revision: 221823<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=221823&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=221823&view=rev</a><br>
Log:<br>
[Objective-C++ IRGen] do not generate .cxx_construct<br>
for class that contains trivially-constructible struct ivar.<br>
rdar://18950072<br>
<br>
Modified:<br>
    cfe/trunk/lib/CodeGen/CodeGenModule.cpp<br>
    cfe/trunk/test/CodeGenObjCXX/<a href="http://arc-cxx11-member-init.mm" target="_blank">arc-cxx11-member-init.mm</a><br>
<br>
Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=221823&r1=221822&r2=221823&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=221823&r1=221822&r2=221823&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Wed Nov 12 16:37:43 2014<br>
@@ -3005,6 +3005,19 @@ static bool needsDestructMethod(ObjCImpl<br>
   return false;<br>
 }<br>
<br>
+static bool AllTrivialInitializers(CodeGenModule &CGM,<br>
+                                   ObjCImplementationDecl *D) {<br>
+  CodeGenFunction CGF(CGM);<br>
+  for (ObjCImplementationDecl::init_iterator B = D->init_begin(),<br>
+       E = D->init_end(); B != E; ++B) {<br>
+    CXXCtorInitializer *CtorInitExp = *B;<br>
+    Expr *Init = CtorInitExp->getInit();<br>
+    if (!CGF.isTrivialInitializer(Init))<br>
+      return false;<br>
+  }<br>
+  return true;<br>
+}<br>
+<br>
 /// EmitObjCIvarInitializations - Emit information for ivar initialization<br>
 /// for an implementation.<br>
 void CodeGenModule::EmitObjCIvarInitializations(ObjCImplementationDecl *D) {<br>
@@ -3025,7 +3038,8 @@ void CodeGenModule::EmitObjCIvarInitiali<br>
<br>
   // If the implementation doesn't have any ivar initializers, we don't need<br>
   // a .cxx_construct.<br>
-  if (D->getNumIvarInitializers() == 0)<br>
+  if (D->getNumIvarInitializers() == 0 ||<br>
+      AllTrivialInitializers(*this, D))<br>
     return;<br>
<br>
   IdentifierInfo *II = &getContext().Idents.get(".cxx_construct");<br>
<br>
Modified: cfe/trunk/test/CodeGenObjCXX/<a href="http://arc-cxx11-member-init.mm" target="_blank">arc-cxx11-member-init.mm</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjCXX/arc-cxx11-member-init.mm?rev=221823&r1=221822&r2=221823&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjCXX/arc-cxx11-member-init.mm?rev=221823&r1=221822&r2=221823&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenObjCXX/<a href="http://arc-cxx11-member-init.mm" target="_blank">arc-cxx11-member-init.mm</a> (original)<br>
+++ cfe/trunk/test/CodeGenObjCXX/<a href="http://arc-cxx11-member-init.mm" target="_blank">arc-cxx11-member-init.mm</a> Wed Nov 12 16:37:43 2014<br>
@@ -30,3 +30,16 @@ class XClipboardDataSet<br>
 // CHECK: [[THREE:%.*]] = bitcast i8* [[CALL]] to [[T:%.*]]*<br>
 // CHECK: store [[T]]* [[THREE]], [[T]]** [[mClipData]], align 8<br>
<br>
+// rdar://18950072<br>
+struct Butt { };<br>
+<br>
+__attribute__((objc_root_class))<br>
+@interface Foo {<br>
+  Butt x;<br>
+  Butt y;<br>
+  Butt z;<br>
+}<br>
+@end<br>
+@implementation Foo<br>
+@end<br>
+// CHECK-NOTE: define internal i8* @"\01-[Foo .cxx_construct<br></blockquote><div><br></div><div>Is this supposed to be `CHECK-NOT` ?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>