From 698495522d5d0f693a977c3d7d5f9780a0b61eaa Mon Sep 17 00:00:00 2001 From: Steve Naroff Date: Tue, 16 Oct 2007 00:00:18 +0000 Subject: [PATCH] Bad cast...need to use dyn_cast_or_null. Also changed Sema::InitBuiltinVaListType (which had the same bug). llvm-svn: 43023 --- clang/Sema/SemaDecl.cpp | 2 +- clang/Sema/SemaExpr.cpp | 6 +++--- clang/clang.xcodeproj/project.pbxproj | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/clang/Sema/SemaDecl.cpp b/clang/Sema/SemaDecl.cpp index 62f3fabe7d26..232c5ba2e2e9 100644 --- a/clang/Sema/SemaDecl.cpp +++ b/clang/Sema/SemaDecl.cpp @@ -154,7 +154,7 @@ void Sema::InitBuiltinVaListType() IdentifierInfo *VaIdent = &Context.Idents.get("__builtin_va_list"); ScopedDecl *VaDecl = LookupScopedDecl(VaIdent, Decl::IDNS_Ordinary, SourceLocation(), TUScope); - TypedefDecl *VaTypedef = cast(VaDecl); + TypedefDecl *VaTypedef = dyn_cast_or_null(VaDecl); Context.setBuiltinVaListType(Context.getTypedefType(VaTypedef)); } diff --git a/clang/Sema/SemaExpr.cpp b/clang/Sema/SemaExpr.cpp index 29a3b667be8c..8ee0913f9938 100644 --- a/clang/Sema/SemaExpr.cpp +++ b/clang/Sema/SemaExpr.cpp @@ -1896,9 +1896,9 @@ Sema::ExprResult Sema::ParseObjCStringLiteral(ExprTy *string) { IdentifierInfo *NSIdent = &Context.Idents.get("NSConstantString"); ScopedDecl *IFace = LookupScopedDecl(NSIdent, Decl::IDNS_Ordinary, SourceLocation(), TUScope); - ObjcInterfaceDecl *stringInterface = cast(IFace); - assert(stringInterface && "missing '@interface NSConstantString'"); - Context.setObjcConstantStringInterface(stringInterface); + ObjcInterfaceDecl *strIFace = dyn_cast_or_null(IFace); + assert(strIFace && "missing '@interface NSConstantString'"); + Context.setObjcConstantStringInterface(strIFace); } QualType t = Context.getObjcConstantStringInterface(); t = Context.getPointerType(t); diff --git a/clang/clang.xcodeproj/project.pbxproj b/clang/clang.xcodeproj/project.pbxproj index 75d938806b00..b88c381faa0b 100644 --- a/clang/clang.xcodeproj/project.pbxproj +++ b/clang/clang.xcodeproj/project.pbxproj @@ -742,7 +742,6 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "clang" */; - compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* clang */; projectDirPath = "";