diff options
-rw-r--r-- | clang/lib/CodeGen/CGCleanup.h | 4 | ||||
-rw-r--r-- | clang/lib/CodeGen/CGException.cpp | 2 | ||||
-rw-r--r-- | clang/lib/CodeGen/CGObjCRuntime.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGCleanup.h b/clang/lib/CodeGen/CGCleanup.h index 066cdb2a072..1d4606f1366 100644 --- a/clang/lib/CodeGen/CGCleanup.h +++ b/clang/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/clang/lib/CodeGen/CGException.cpp b/clang/lib/CodeGen/CGException.cpp index 9fa478ce78b..0938e830e3e 100644 --- a/clang/lib/CodeGen/CGException.cpp +++ b/clang/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/clang/lib/CodeGen/CGObjCRuntime.cpp b/clang/lib/CodeGen/CGObjCRuntime.cpp index 1a5db9b1411..3d013da51e6 100644 --- a/clang/lib/CodeGen/CGObjCRuntime.cpp +++ b/clang/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 { |