replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Objective-C++ IRGen] do not generate .cxx_construct 

for class that contains trivially-constructible struct ivar.
rdar://18950072

llvm-svn: 221823
This commit is contained in:
Fariborz Jahanian 2014-11-12 22:37:43 +00:00
parent 16cfa60cbd
commit 800821a3b2
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clang/lib/CodeGen/CodeGenModule.cpp
View File

@ -3005,6 +3005,19 @@ static bool needsDestructMethod(ObjCImplementationDecl *impl) {
return false;
}
static bool AllTrivialInitializers(CodeGenModule &CGM,
ObjCImplementationDecl *D) {
CodeGenFunction CGF(CGM);
for (ObjCImplementationDecl::init_iterator B = D->init_begin(),
E = D->init_end(); B != E; ++B) {
CXXCtorInitializer *CtorInitExp = *B;
Expr *Init = CtorInitExp->getInit();
if (!CGF.isTrivialInitializer(Init))
return false;
}
return true;
}
/// EmitObjCIvarInitializations - Emit information for ivar initialization
/// for an implementation.
void CodeGenModule::EmitObjCIvarInitializations(ObjCImplementationDecl *D) {
@ -3025,7 +3038,8 @@ void CodeGenModule::EmitObjCIvarInitializations(ObjCImplementationDecl *D) {
// If the implementation doesn't have any ivar initializers, we don't need
// a .cxx_construct.
if (D->getNumIvarInitializers() == 0)
if (D->getNumIvarInitializers() == 0 ||
AllTrivialInitializers(*this, D))
return;
IdentifierInfo *II = &getContext().Idents.get(".cxx_construct");

13
clang/test/CodeGenObjCXX/arc-cxx11-member-init.mm
View File

@ -30,3 +30,16 @@ class XClipboardDataSet
// CHECK: [[THREE:%.*]] = bitcast i8* [[CALL]] to [[T:%.*]]*
// CHECK: store [[T]]* [[THREE]], [[T]]** [[mClipData]], align 8
// rdar://18950072
struct Butt { };
__attribute__((objc_root_class))
@interface Foo {
Butt x;
Butt y;
Butt z;
}
@end
@implementation Foo
@end
// CHECK-NOTE: define internal i8* @"\01-[Foo .cxx_construct