From 091f698d29ff1262fcd2c39eafec70e3ba2711a5 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sat, 21 Jun 2008 21:44:18 +0000 Subject: "this patch adds code generation hooks for Objective-C constant strings. It also modifies Sema so that Objective-C constant strings are treated as untyped objects if the interface for the constant string class can not be found. This is consistent with Apple GCC. I thought it was consistent with GNU GCC, since this was causing failures when trying to compile GNUstep with (GNU) GCC, but it appears that this is not the case when attempting to produce a simple test case to demonstrate it. Possibly there is a way of making the error go away, but I haven't found out what it is yet." Patch by David Chisnall! llvm-svn: 52599 --- clang/lib/Sema/SemaExprObjC.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'clang/lib/Sema/SemaExprObjC.cpp') diff --git a/clang/lib/Sema/SemaExprObjC.cpp b/clang/lib/Sema/SemaExprObjC.cpp index 920457e00c6..1aed69ec2c5 100644 --- a/clang/lib/Sema/SemaExprObjC.cpp +++ b/clang/lib/Sema/SemaExprObjC.cpp @@ -54,13 +54,17 @@ Sema::ExprResult Sema::ParseObjCStringLiteral(SourceLocation *AtLocs, IdentifierInfo *NSIdent = &Context.Idents.get("NSConstantString"); Decl *IFace = LookupDecl(NSIdent, Decl::IDNS_Ordinary, TUScope); ObjCInterfaceDecl *strIFace = dyn_cast_or_null(IFace); - if (!strIFace) - return Diag(S->getLocStart(), diag::err_undef_interface, - NSIdent->getName()); - Context.setObjCConstantStringInterface(strIFace); + if (strIFace) + Context.setObjCConstantStringInterface(strIFace); } QualType t = Context.getObjCConstantStringInterface(); - t = Context.getPointerType(t); + // If there is no NSConstantString interface defined then treat constant + // strings as untyped objects and let the runtime figure it out later. + if (t == QualType()) { + t = Context.getObjCIdType(); + } else { + t = Context.getPointerType(t); + } return new ObjCStringLiteral(S, t, AtLoc); } @@ -298,9 +302,9 @@ Sema::ExprResult Sema::ActOnInstanceMessage( else { ObjCInterfaceType *OCIReceiver =dyn_cast(receiverType); if (OCIReceiver == 0) { - Diag(lbrac, diag::error_bad_receiver_type, - RExpr->getType().getAsString()); - return true; + Diag(lbrac, diag::error_bad_receiver_type, + RExpr->getType().getAsString()); + return true; } ClassDecl = OCIReceiver->getDecl(); // FIXME: consider using InstanceMethodPool, since it will be faster -- cgit v1.2.3