maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

In ARC, if we're emitting assembly markers for calls to 

objc_retainAutoreleasedReturnValue, we need to also be killing
them during return peepholing.  Make sure we recognize an
intervening bitcast, but more importantly, assert if we can't
find the asm marker at all.  rdar://problem/12133032

llvm-svn: 163431
This commit is contained in:
John McCall 2012-09-07 23:30:50 +00:00
parent a11a741e2f
commit cfa4e9bdf3
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clang/lib/CodeGen/CGCall.cpp
View File

@ -1363,12 +1363,23 @@ static llvm::Value *tryEmitFusedAutoreleaseOfResult(CodeGenFunction &CGF,
.objc_retainAutoreleasedReturnValue) {
doRetainAutorelease = false;
// Look for an inline asm immediately preceding the call and kill it, too.
llvm::Instruction *prev = call->getPrevNode();
if (llvm::CallInst *asmCall = dyn_cast_or_null<llvm::CallInst>(prev))
if (asmCall->getCalledValue()
== CGF.CGM.getARCEntrypoints().retainAutoreleasedReturnValueMarker)
insnsToKill.push_back(prev);
// If we emitted an assembly marker for this call (and the
// ARCEntrypoints field should have been set if so), go looking
// for that call. If we can't find it, we can't do this
// optimization. But it should always be the immediately previous
// instruction, unless we needed bitcasts around the call.
if (CGF.CGM.getARCEntrypoints().retainAutoreleasedReturnValueMarker) {
llvm::Instruction *prev = call->getPrevNode();
assert(prev);
if (isa<llvm::BitCastInst>(prev)) {
prev = prev->getPrevNode();
assert(prev);
}
assert(isa<llvm::CallInst>(prev));
assert(cast<llvm::CallInst>(prev)->getCalledValue() ==
CGF.CGM.getARCEntrypoints().retainAutoreleasedReturnValueMarker);
insnsToKill.push_back(prev);
}
} else {
return 0;
}

17
clang/test/CodeGenObjC/arc-arm.m
View File

@ -18,3 +18,20 @@ void test1(void) {
// CHECK-NEXT: ret void
id x = test1_helper();
}
// rdar://problem/12133032
@class A;
A *test2(void) {
extern A *test2_helper(void);
// CHECK: [[T0:%.*]] = call arm_aapcscc [[A:%.*]]* @test2_helper()
// CHECK-NEXT: ret [[A]]* [[T0]]
return test2_helper();
}
id test3(void) {
extern A *test3_helper(void);
// CHECK: [[T0:%.*]] = call arm_aapcscc [[A:%.*]]* @test3_helper()
// CHECK-NEXT: [[T1:%.*]] = bitcast [[A]]* [[T0]] to i8*
// CHECK-NEXT: ret i8* [[T1]]
return test3_helper();
}