diff options
| -rw-r--r-- | clang/Sema/SemaExpr.cpp | 5 | ||||
| -rw-r--r-- | clang/clang.xcodeproj/project.pbxproj | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clang/Sema/SemaExpr.cpp b/clang/Sema/SemaExpr.cpp index 795f6da6ac1..40205d335c7 100644 --- a/clang/Sema/SemaExpr.cpp +++ b/clang/Sema/SemaExpr.cpp @@ -1906,8 +1906,9 @@ Sema::ExprResult Sema::ParseObjCStringLiteral(ExprTy *string) { ScopedDecl *IFace = LookupScopedDecl(NSIdent, Decl::IDNS_Ordinary, SourceLocation(), TUScope); ObjcInterfaceDecl *strIFace = dyn_cast_or_null<ObjcInterfaceDecl>(IFace); - assert(strIFace && "missing @interface for NSConstantString" - "FIXME: need to predefine without breaking explicit inclusion"); + if (!strIFace) + return Diag(S->getLocStart(), diag::err_undef_interface, + NSIdent->getName()); Context.setObjcConstantStringInterface(strIFace); } QualType t = Context.getObjcConstantStringInterface(); diff --git a/clang/clang.xcodeproj/project.pbxproj b/clang/clang.xcodeproj/project.pbxproj index b086e54ce30..f2f79456e88 100644 --- a/clang/clang.xcodeproj/project.pbxproj +++ b/clang/clang.xcodeproj/project.pbxproj @@ -750,7 +750,6 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "clang" */; - compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* clang */; projectDirPath = ""; |
