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.c | |
| 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.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 373ae3e3d42..352aeab8210 100644 --- a/src/backend/jit/llvm/llvmjit.c +++ b/src/backend/jit/llvm/llvmjit.c @@ -339,7 +339,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); |