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:00 -0700 |
| commit | fe2a16d8b3e6fde07a8a990057e983854ad50616 (patch) | |
| tree | 7a6c5d65d5f95928893b66456d490619a42118c6 /src/backend/jit/llvm/llvmjit.c | |
| parent | 536de14e2bdf467aefc5e25f85056fe1adf4846d (diff) | |
| download | postgresql-fe2a16d8b3e6fde07a8a990057e983854ad50616.tar.gz postgresql-fe2a16d8b3e6fde07a8a990057e983854ad50616.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.c')
| -rw-r--r-- | src/backend/jit/llvm/llvmjit.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c index 7965b61165e..4c026d37d0d 100644 --- a/src/backend/jit/llvm/llvmjit.c +++ b/src/backend/jit/llvm/llvmjit.c @@ -333,7 +333,14 @@ llvm_copy_attributes_at_index(LLVMValueRef v_from, LLVMValueRef v_to, uint32 ind int num_attributes; LLVMAttributeRef *attrs; - num_attributes = LLVMGetAttributeCountAtIndex(v_from, index); + num_attributes = LLVMGetAttributeCountAtIndexPG(v_from, index); + + /* + * Not just for efficiency: LLVM <= 3.9 crashes when + * LLVMGetAttributesAtIndex() is called for an index with 0 attributes. + */ + if (num_attributes == 0) + return; attrs = palloc(sizeof(LLVMAttributeRef) * num_attributes); LLVMGetAttributesAtIndex(v_from, index, attrs); |