From 05fdaeaed2c6dfaad1f56942b44dacebc0818d71 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Fri, 29 Feb 2008 20:35:55 +0000 Subject: [PATCH] Fix a crash where PI.TypeInfo has not been filled in case of missing ObjCInterfaceDecl. Happens with Xcode 2.4.1 headers on test Parser/objc-foreach-error-1.m llvm-svn: 47767 --- clang/Sema/SemaDeclObjC.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/clang/Sema/SemaDeclObjC.cpp b/clang/Sema/SemaDeclObjC.cpp index 85797a5373e0..267a9ef78964 100644 --- a/clang/Sema/SemaDeclObjC.cpp +++ b/clang/Sema/SemaDeclObjC.cpp @@ -43,17 +43,18 @@ void Sema::ObjCActOnStartOfMethodDef(Scope *FnBodyScope, DeclTy *D) { PI.IdentLoc = SourceLocation(); // synthesized vars have a null location. PI.InvalidType = false; PI.AttrList = 0; + PI.TypeInfo = Context.getObjCIdType().getAsOpaquePtr(); + if (MDecl->isInstance()) { - ObjCInterfaceDecl *OID = MDecl->getClassInterface(); - // There may be no interface context due to error in declaration of the - // interface (which has been reported). Recover gracefully - if (OID) { + if (ObjCInterfaceDecl *OID = MDecl->getClassInterface()) { + // There may be no interface context due to error in declaration of the + // interface (which has been reported). Recover gracefully QualType selfTy = Context.getObjCInterfaceType(OID); selfTy = Context.getPointerType(selfTy); PI.TypeInfo = selfTy.getAsOpaquePtr(); } - } else - PI.TypeInfo = Context.getObjCIdType().getAsOpaquePtr(); + } + CurMethodDecl->setSelfDecl(ActOnParamDeclarator(PI, FnBodyScope)); PI.Ident = &Context.Idents.get("_cmd");