Author: ahatanak Date: Fri Jun 14 15:06:28 2019 New Revision: 363467 URL: http://llvm.org/viewvc/llvm-project?rev=363467&view=rev Log: [CodeGen][ObjC] Annotate retain-agnostic ObjC globals with attribute 'objc_arc_inert'
The attribute enables the ARC optimizer to delete ObjC ARC runtime calls on the annotated globals (see https://reviews.llvm.org/D62433). We currently only annotate global variables for string literals and global blocks with the attribute. rdar://problem/49839633 Differential Revision: https://reviews.llvm.org/D62831 Added: cfe/trunk/test/CodeGenObjC/attr-objc-arc-inert.m Modified: cfe/trunk/lib/CodeGen/CGBlocks.cpp cfe/trunk/lib/CodeGen/CodeGenModule.cpp cfe/trunk/test/CodeGenCXX/static-local-in-local-class.cpp Modified: cfe/trunk/lib/CodeGen/CGBlocks.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBlocks.cpp?rev=363467&r1=363466&r2=363467&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGBlocks.cpp (original) +++ cfe/trunk/lib/CodeGen/CGBlocks.cpp Fri Jun 14 15:06:28 2019 @@ -1434,10 +1434,12 @@ static llvm::Constant *buildGlobalBlock( if (CGM.getContext().getLangOpts().OpenCL) AddrSpace = CGM.getContext().getTargetAddressSpace(LangAS::opencl_global); - llvm::Constant *literal = fields.finishAndCreateGlobal( + llvm::GlobalVariable *literal = fields.finishAndCreateGlobal( "__block_literal_global", blockInfo.BlockAlign, /*constant*/ !IsWindows, llvm::GlobalVariable::InternalLinkage, AddrSpace); + literal->addAttribute("objc_arc_inert"); + // Windows does not allow globals to be initialised to point to globals in // different DLLs. Any such variables must run code to initialise them. if (IsWindows) { Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=363467&r1=363466&r2=363467&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original) +++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Fri Jun 14 15:06:28 2019 @@ -4652,6 +4652,7 @@ CodeGenModule::GetAddrOfConstantCFString GV = Fields.finishAndCreateGlobal("_unnamed_cfstring_", Alignment, /*isConstant=*/false, llvm::GlobalVariable::PrivateLinkage); + GV->addAttribute("objc_arc_inert"); switch (Triple.getObjectFormat()) { case llvm::Triple::UnknownObjectFormat: llvm_unreachable("unknown file format"); Modified: cfe/trunk/test/CodeGenCXX/static-local-in-local-class.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/static-local-in-local-class.cpp?rev=363467&r1=363466&r2=363467&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/static-local-in-local-class.cpp (original) +++ cfe/trunk/test/CodeGenCXX/static-local-in-local-class.cpp Fri Jun 14 15:06:28 2019 @@ -127,7 +127,7 @@ extern "C" int call_block_deduced_return // CHECK: load i32, i32* % // CHECK: ret i32 % -// CHECK-LABEL: define internal i32* @_ZZZL20block_deduced_returnvEUb_EN1SclEv(%struct.S.6* %this) #0 align 2 { +// CHECK-LABEL: define internal i32* @_ZZZL20block_deduced_returnvEUb_EN1SclEv(%struct.S.6* %this) #1 align 2 { // CHECK: ret i32* @_ZZZL20block_deduced_returnvEUb_E1n inline auto static_local_label(void *p) { Added: cfe/trunk/test/CodeGenObjC/attr-objc-arc-inert.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/attr-objc-arc-inert.m?rev=363467&view=auto ============================================================================== --- cfe/trunk/test/CodeGenObjC/attr-objc-arc-inert.m (added) +++ cfe/trunk/test/CodeGenObjC/attr-objc-arc-inert.m Fri Jun 14 15:06:28 2019 @@ -0,0 +1,16 @@ +// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fblocks -emit-llvm -o - %s | FileCheck %s + +// CHECK: @{{.*}} = private global %{{.*}} { i32* getelementptr inbounds ([0 x i32], [0 x i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 1992, i8* getelementptr inbounds ([4 x i8], [4 x i8]* @{{.*}}, i32 0, i32 0), i64 3 }, section "__DATA,__cfstring", align 8 #[[ATTRNUM0:[0-9]+]] +// CHECK: @{{.*}} = internal constant { i8**, i32, i32, i8*, %{{.*}}* } { i8** @_NSConcreteGlobalBlock, i32 1342177280, i32 0, i8* bitcast (i32 (i8*)* @{{.*}} to i8*), %{{.*}}* bitcast ({ i64, i64, i8*, i8* }* @{{.*}} to %{{.*}}*) }, align 8 #[[ATTRNUM0]] + +@class NSString; + +NSString *testStringLiteral(void) { + return @"abc"; +} + +int testGlobalBlock(int a) { + return ^{ return 123; }(); +} + +// CHECK: attributes #[[ATTRNUM0]] = { "objc_arc_inert" } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits