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

Don't crash *or* insert a bogus autorelease when emitting a 

this-adjustment thunk in ARC++.

llvm-svn: 161014
This commit is contained in:
John McCall 2012-07-31 00:33:55 +00:00
parent 9d192e1a90
commit ff755cda9c
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1405,7 +1405,8 @@ static llvm::Value *tryEmitFusedAutoreleaseOfResult(CodeGenFunction &CGF,
static llvm::Value *tryRemoveRetainOfSelf(CodeGenFunction &CGF,
llvm::Value *result) {
// This is only applicable to a method with an immutable 'self'.
const ObjCMethodDecl *method = dyn_cast<ObjCMethodDecl>(CGF.CurCodeDecl);
const ObjCMethodDecl *method =
dyn_cast_or_null<ObjCMethodDecl>(CGF.CurCodeDecl);
if (!method) return 0;
const VarDecl *self = method->getSelfDecl();
if (!self->getType().isConstQualified()) return 0;

3
clang/lib/CodeGen/CGVTables.cpp
View File

@ -387,6 +387,9 @@ void CodeGenFunction::GenerateThunk(llvm::Function *Fn,
if (!ResultType->isVoidType() && Slot.isNull())
CGM.getCXXABI().EmitReturnFromThunk(*this, RV, ResultType);
// Disable the final ARC autorelease.
AutoreleaseResult = false;
FinishFunction();
// Set the right linkage.

16
clang/test/CodeGenObjCXX/arc.mm
View File

@ -252,3 +252,19 @@ template <class T> class Test38 {
};
// CHECK: define weak_odr void @_ZN6Test38IiE4testEi(
template class Test38<int>;
// rdar://problem/11964832
class Test39_base1 {
virtual void foo();
};
class Test39_base2 {
virtual id bar();
};
class Test39 : Test39_base1, Test39_base2 { // base2 is at non-zero offset
virtual id bar();
};
id Test39::bar() { return 0; }
// Note lack of autorelease.
// CHECK: define i8* @_ZThn8_N6Test393barEv(
// CHECK: call i8* @_ZN6Test393barEv(
// CHECK-NEXT: ret i8*