From 1c15cd6aaa5d1aa4d0d9226381be71eb9746787e Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Mon, 18 Feb 2013 15:59:24 +0000 Subject: [PATCH] CodeGenFunction::CurFuncDecl can be NULL; fix crash introduced in r175386. llvm-svn: 175448 --- clang/lib/CodeGen/CGObjCMac.cpp | 6 +++--- clang/test/CodeGenObjC/ivar-invariant.m | 14 +++++++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp index bf02439..b6617a0 100644 --- a/clang/lib/CodeGen/CGObjCMac.cpp +++ b/clang/lib/CodeGen/CGObjCMac.cpp @@ -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(CGF.CurFuncDecl)) - if (IV->getContainingInterface()->isSuperClassOf(ID)) - return true; + if (CGF.CurFuncDecl && isa(CGF.CurFuncDecl)) + if (IV->getContainingInterface()->isSuperClassOf(ID)) + return true; return false; } diff --git a/clang/test/CodeGenObjC/ivar-invariant.m b/clang/test/CodeGenObjC/ivar-invariant.m index 7552e7a..7cafee7 100644 --- a/clang/test/CodeGenObjC/ivar-invariant.m +++ b/clang/test/CodeGenObjC/ivar-invariant.m @@ -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; +}; -- 2.7.4