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

CodeGenFunction::CurFuncDecl can be NULL; fix crash introduced in r175386. 

llvm-svn: 175448
This commit is contained in:
Douglas Gregor 2013-02-18 15:59:24 +00:00
parent 6168bd2323
commit 1c15cd6aaa
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/CodeGen/CGObjCMac.cpp
View File

@ -1445,9 +1445,9 @@ private:
// base of the ivar access is a parameter to an Objective C method.
// However, because the parameters are not available in the current
// interface, we cannot perform this check.
if (dyn_cast<ObjCMethodDecl>(CGF.CurFuncDecl))
if (IV->getContainingInterface()->isSuperClassOf(ID))
return true;
if (CGF.CurFuncDecl && isa<ObjCMethodDecl>(CGF.CurFuncDecl))
if (IV->getContainingInterface()->isSuperClassOf(ID))
return true;
return false;
}

14
clang/test/CodeGenObjC/ivar-invariant.m
View File

@ -1,4 +1,4 @@
// RUN: %clang_cc1 -triple x86_64-apple-darwin -emit-llvm -o - %s | FileCheck %s
// RUN: %clang_cc1 -triple x86_64-apple-darwin -fblocks -emit-llvm -o - %s | FileCheck %s
@interface NSObject
+ (id) new;
@ -54,3 +54,15 @@ void * variant_load_1(int i) {
// CHECK: define internal i8* @"\01-[Container invariant_load_1]"
// CHECK: [[IVAR:%.*]] = load i64* @"OBJC_IVAR_$_Derived.member", !invariant.load
@interface ForBlock
{
@public
id foo;
}
@end
// CHECK: define internal i8* @block_block_invoke
// CHECK: load i64* @"OBJC_IVAR_$_ForBlock.foo"
id (^block)(ForBlock*) = ^(ForBlock* a) {
return a->foo;
};