diff options
author | John McCall <rjmccall@apple.com> | 2011-07-13 18:26:47 +0000 |
---|---|---|
committer | John McCall <rjmccall@apple.com> | 2011-07-13 18:26:47 +0000 |
commit | dffafded6c13a9b308433c85a1156501e65bb6e8 (patch) | |
tree | ba0bd82bc27a515bd87c1238d45917961593faee /clang/lib/CodeGen/CGObjC.cpp | |
parent | 61a9f2af9e69a5e92afda86abd61341460628e6a (diff) | |
download | bcm5719-llvm-dffafded6c13a9b308433c85a1156501e65bb6e8.tar.gz bcm5719-llvm-dffafded6c13a9b308433c85a1156501e65bb6e8.zip |
Don't crash if defining -dealloc in a category.
llvm-svn: 135054
Diffstat (limited to 'clang/lib/CodeGen/CGObjC.cpp')
-rw-r--r-- | clang/lib/CodeGen/CGObjC.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGObjC.cpp b/clang/lib/CodeGen/CGObjC.cpp index f64ff9766f9..426cca00140 100644 --- a/clang/lib/CodeGen/CGObjC.cpp +++ b/clang/lib/CodeGen/CGObjC.cpp @@ -220,11 +220,13 @@ namespace { struct FinishARCDealloc : EHScopeStack::Cleanup { void Emit(CodeGenFunction &CGF, Flags flags) { const ObjCMethodDecl *method = cast<ObjCMethodDecl>(CGF.CurCodeDecl); - const ObjCImplementationDecl *impl - = cast<ObjCImplementationDecl>(method->getDeclContext()); + + const ObjCImplDecl *impl = cast<ObjCImplDecl>(method->getDeclContext()); const ObjCInterfaceDecl *iface = impl->getClassInterface(); if (!iface->getSuperClass()) return; + bool isCategory = isa<ObjCCategoryImplDecl>(impl); + // Call [super dealloc] if we have a superclass. llvm::Value *self = CGF.LoadObjCSelf(); @@ -233,7 +235,7 @@ struct FinishARCDealloc : EHScopeStack::Cleanup { CGF.getContext().VoidTy, method->getSelector(), iface, - /*is category*/ false, + isCategory, self, /*is class msg*/ false, args, |