From 4ad95cfe3e0b4568f4353864e4cfdaa3b27d93c3 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 4 Jun 2014 18:51:46 +0000 Subject: [PATCH] Update for llvm api change. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@210204 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGCleanup.h | 4 ++-- lib/CodeGen/CGException.cpp | 2 +- lib/CodeGen/CGObjCRuntime.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/CodeGen/CGCleanup.h b/lib/CodeGen/CGCleanup.h index 066cdb2a07..1d4606f136 100644 --- a/lib/CodeGen/CGCleanup.h +++ b/lib/CodeGen/CGCleanup.h @@ -145,7 +145,7 @@ public: struct Handler { /// A type info value, or null (C++ null, not an LLVM null pointer) /// for a catch-all. - llvm::Value *Type; + llvm::Constant *Type; /// The catch handler for this type. llvm::BasicBlock *Block; @@ -183,7 +183,7 @@ public: setHandler(I, /*catchall*/ nullptr, Block); } - void setHandler(unsigned I, llvm::Value *Type, llvm::BasicBlock *Block) { + void setHandler(unsigned I, llvm::Constant *Type, llvm::BasicBlock *Block) { assert(I < getNumHandlers()); getHandlers()[I].Type = Type; getHandlers()[I].Block = Block; diff --git a/lib/CodeGen/CGException.cpp b/lib/CodeGen/CGException.cpp index 9fa478ce78..0938e830e3 100644 --- a/lib/CodeGen/CGException.cpp +++ b/lib/CodeGen/CGException.cpp @@ -622,7 +622,7 @@ void CodeGenFunction::EnterCXXTryStmt(const CXXTryStmt &S, bool IsFnTryBlock) { QualType CaughtType = C->getCaughtType(); CaughtType = CaughtType.getNonReferenceType().getUnqualifiedType(); - llvm::Value *TypeInfo = nullptr; + llvm::Constant *TypeInfo = nullptr; if (CaughtType->isObjCObjectPointerType()) TypeInfo = CGM.getObjCRuntime().GetEHType(CaughtType); else diff --git a/lib/CodeGen/CGObjCRuntime.cpp b/lib/CodeGen/CGObjCRuntime.cpp index 1a5db9b141..3d013da51e 100644 --- a/lib/CodeGen/CGObjCRuntime.cpp +++ b/lib/CodeGen/CGObjCRuntime.cpp @@ -149,7 +149,7 @@ namespace { const VarDecl *Variable; const Stmt *Body; llvm::BasicBlock *Block; - llvm::Value *TypeInfo; + llvm::Constant *TypeInfo; }; struct CallObjCEndCatch : EHScopeStack::Cleanup { -- 2.50.1