From 7c34e2264edad3d2d99ba2ba6fbf41ec3a73e0ed Mon Sep 17 00:00:00 2001 From: Pierre Date: Fri, 2 Feb 2018 09:13:40 +0100 Subject: [PATCH 2/8] Add LLVM4 support in llvmjit_error.cpp --- src/backend/jit/llvm/llvmjit_error.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/backend/jit/llvm/llvmjit_error.cpp b/src/backend/jit/llvm/llvmjit_error.cpp index 625ba2d25d..1c78bd956d 100644 --- a/src/backend/jit/llvm/llvmjit_error.cpp +++ b/src/backend/jit/llvm/llvmjit_error.cpp @@ -56,7 +56,9 @@ llvm_enter_fatal_on_oom(void) if (fatal_new_handler_depth == 0) { old_new_handler = std::set_new_handler(fatal_system_new_handler); +#if LLVM_VERSION_MAJOR > 4 llvm::install_bad_alloc_error_handler(fatal_llvm_new_handler); +#endif llvm::install_fatal_error_handler(fatal_llvm_error_handler); } fatal_new_handler_depth++; @@ -72,7 +74,9 @@ llvm_leave_fatal_on_oom(void) if (fatal_new_handler_depth == 0) { std::set_new_handler(old_new_handler); +#if LLVM_VERSION_MAJOR > 4 llvm::remove_bad_alloc_error_handler(); +#endif llvm::remove_fatal_error_handler(); } } @@ -87,7 +91,9 @@ llvm_reset_after_error(void) if (fatal_new_handler_depth != 0) { std::set_new_handler(old_new_handler); +#if LLVM_VERSION_MAJOR > 4 llvm::remove_bad_alloc_error_handler(); +#endif llvm::remove_fatal_error_handler(); } fatal_new_handler_depth = 0; -- 2.16.1