diff options
author | Andres Freund <andres@anarazel.de> | 2020-10-15 17:38:00 -0700 |
---|---|---|
committer | Andres Freund <andres@anarazel.de> | 2020-10-15 18:17:01 -0700 |
commit | c835c7ffe21dae8233d21c0ad01e3cbbe475082d (patch) | |
tree | be631692ba3b2735fc50ab87a72115324cfc097a /src/backend/jit/llvm/llvmjit_wrap.cpp | |
parent | 0ab7ca98a16f9e4954f47c7f180e0760b4f355ec (diff) | |
download | postgresql-c835c7ffe21dae8233d21c0ad01e3cbbe475082d.tar.gz postgresql-c835c7ffe21dae8233d21c0ad01e3cbbe475082d.zip |
llvmjit: Work around bug in LLVM 3.9 causing crashes after 72559438f92.
Unfortunately in LLVM 3.9 LLVMGetAttributeCountAtIndex(func, index)
crashes when called with an index that has 0 attributes. Since there's
no way to work around this in the C API, add a small C++ wrapper doing
so.
The only reason this didn't fail before 72559438f92 is that there
always are function attributes...
Author: Andres Freund <andres@anarazel.de>
Discussion: https://postgr.es/m/20201016001254.w2nfj7gd74jmb5in@alap3.anarazel.de
Backpatch: 11-, like 72559438f92
Diffstat (limited to 'src/backend/jit/llvm/llvmjit_wrap.cpp')
-rw-r--r-- | src/backend/jit/llvm/llvmjit_wrap.cpp | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/src/backend/jit/llvm/llvmjit_wrap.cpp b/src/backend/jit/llvm/llvmjit_wrap.cpp index 18876ec5209..9b66d73af3b 100644 --- a/src/backend/jit/llvm/llvmjit_wrap.cpp +++ b/src/backend/jit/llvm/llvmjit_wrap.cpp @@ -16,6 +16,13 @@ extern "C" #include "postgres.h" } +#include <llvm-c/Core.h> + +/* Avoid macro clash with LLVM's C++ headers */ +#undef Min + +#include <llvm/IR/Attributes.h> +#include <llvm/IR/Function.h> #include <llvm/MC/SubtargetFeature.h> #include <llvm/Support/Host.h> @@ -44,3 +51,28 @@ char *LLVMGetHostCPUFeatures(void) { return strdup(Features.getString().c_str()); } #endif + +/* + * Like LLVM's LLVMGetAttributeCountAtIndex(), works around a bug in LLVM 3.9. + * + * In LLVM <= 3.9, LLVMGetAttributeCountAtIndex() segfaults if there are no + * attributes at an index (fixed in LLVM commit ce9bb1097dc2). + */ +unsigned +LLVMGetAttributeCountAtIndexPG(LLVMValueRef F, uint32 Idx) +{ + /* + * This is more expensive, so only do when using a problematic LLVM + * version. + */ +#if LLVM_VERSION_MAJOR < 4 + if (!llvm::unwrap<llvm::Function>(F)->getAttributes().hasAttributes(Idx)) + return 0; +#endif + + /* + * There is no nice public API to determine the count nicely, so just + * always fall back to LLVM's C API. + */ + return LLVMGetAttributeCountAtIndex(F, Idx); +} |