aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2020-10-15 17:38:00 -0700
committerAndres Freund <andres@anarazel.de>2020-10-15 18:17:01 -0700
commit4a4f4487d2d20db9e56b0d022a8dd32af13d1953 (patch)
tree0154c4bb32c802ed99087bdb1fbe4650d6c114f4
parent16be4e435b74f3c7f4a8666ca161ab7f1cfa4c7b (diff)
downloadpostgresql-4a4f4487d2d20db9e56b0d022a8dd32af13d1953.tar.gz
postgresql-4a4f4487d2d20db9e56b0d022a8dd32af13d1953.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
-rw-r--r--src/backend/jit/llvm/llvmjit.c9
-rw-r--r--src/backend/jit/llvm/llvmjit_wrap.cpp32
-rw-r--r--src/include/jit/llvmjit.h2
3 files changed, 42 insertions, 1 deletions
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
index c401a1c5b48..929873cb496 100644
--- a/src/backend/jit/llvm/llvmjit.c
+++ b/src/backend/jit/llvm/llvmjit.c
@@ -337,7 +337,14 @@ llvm_copy_attributes_at_index(LLVMValueRef v_from, LLVMValueRef v_to, uint32 ind
LLVMAttributeRef *attrs;
int attno;
- 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);
diff --git a/src/backend/jit/llvm/llvmjit_wrap.cpp b/src/backend/jit/llvm/llvmjit_wrap.cpp
index 7490805fdca..9fc813dc949 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);
+}
diff --git a/src/include/jit/llvmjit.h b/src/include/jit/llvmjit.h
index 94e6612823b..4beb013a1e1 100644
--- a/src/include/jit/llvmjit.h
+++ b/src/include/jit/llvmjit.h
@@ -133,6 +133,8 @@ extern char *LLVMGetHostCPUName(void);
extern char *LLVMGetHostCPUFeatures(void);
#endif
+extern unsigned LLVMGetAttributeCountAtIndexPG(LLVMValueRef F, uint32 Idx);
+
#ifdef __cplusplus
} /* extern "C" */
#endif