diff options
Diffstat (limited to 'contrib/llvm/tools/clang/lib/CodeGen/EHScopeStack.h')
| -rw-r--r-- | contrib/llvm/tools/clang/lib/CodeGen/EHScopeStack.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/contrib/llvm/tools/clang/lib/CodeGen/EHScopeStack.h b/contrib/llvm/tools/clang/lib/CodeGen/EHScopeStack.h index e9d9a33..b9ccfb6 100644 --- a/contrib/llvm/tools/clang/lib/CodeGen/EHScopeStack.h +++ b/contrib/llvm/tools/clang/lib/CodeGen/EHScopeStack.h @@ -19,8 +19,8 @@ #include "clang/Basic/LLVM.h" #include "llvm/ADT/SmallVector.h" #include "llvm/IR/BasicBlock.h" -#include "llvm/IR/Value.h" #include "llvm/IR/Instructions.h" +#include "llvm/IR/Value.h" namespace clang { namespace CodeGen { @@ -65,9 +65,9 @@ template <class T> struct InvariantValue { template <class T> struct DominatingValue : InvariantValue<T> {}; template <class T, bool mightBeInstruction = - llvm::is_base_of<llvm::Value, T>::value && - !llvm::is_base_of<llvm::Constant, T>::value && - !llvm::is_base_of<llvm::BasicBlock, T>::value> + std::is_base_of<llvm::Value, T>::value && + !std::is_base_of<llvm::Constant, T>::value && + !std::is_base_of<llvm::BasicBlock, T>::value> struct DominatingPointer; template <class T> struct DominatingPointer<T,false> : InvariantValue<T*> {}; // template <class T> struct DominatingPointer<T,true> at end of file @@ -182,7 +182,7 @@ public: typedef typename DominatingValue<A0>::saved_type A0_saved; A0_saved a0_saved; - void Emit(CodeGenFunction &CGF, Flags flags) { + void Emit(CodeGenFunction &CGF, Flags flags) override { A0 a0 = DominatingValue<A0>::restore(CGF, a0_saved); T(a0).Emit(CGF, flags); } @@ -199,7 +199,7 @@ public: A0_saved a0_saved; A1_saved a1_saved; - void Emit(CodeGenFunction &CGF, Flags flags) { + void Emit(CodeGenFunction &CGF, Flags flags) override { A0 a0 = DominatingValue<A0>::restore(CGF, a0_saved); A1 a1 = DominatingValue<A1>::restore(CGF, a1_saved); T(a0, a1).Emit(CGF, flags); @@ -219,7 +219,7 @@ public: A1_saved a1_saved; A2_saved a2_saved; - void Emit(CodeGenFunction &CGF, Flags flags) { + void Emit(CodeGenFunction &CGF, Flags flags) override { A0 a0 = DominatingValue<A0>::restore(CGF, a0_saved); A1 a1 = DominatingValue<A1>::restore(CGF, a1_saved); A2 a2 = DominatingValue<A2>::restore(CGF, a2_saved); @@ -242,7 +242,7 @@ public: A2_saved a2_saved; A3_saved a3_saved; - void Emit(CodeGenFunction &CGF, Flags flags) { + void Emit(CodeGenFunction &CGF, Flags flags) override { A0 a0 = DominatingValue<A0>::restore(CGF, a0_saved); A1 a1 = DominatingValue<A1>::restore(CGF, a1_saved); A2 a2 = DominatingValue<A2>::restore(CGF, a2_saved); @@ -301,8 +301,8 @@ private: void *pushCleanup(CleanupKind K, size_t DataSize); public: - EHScopeStack() : StartOfBuffer(0), EndOfBuffer(0), StartOfData(0), - InnermostNormalCleanup(stable_end()), + EHScopeStack() : StartOfBuffer(nullptr), EndOfBuffer(nullptr), + StartOfData(nullptr), InnermostNormalCleanup(stable_end()), InnermostEHScope(stable_end()) {} ~EHScopeStack() { delete[] StartOfBuffer; } |
