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 
Discussion: https://postgr.es/m/20201016001254[email protected]
Backpatch: 11-, like 72559438f92

diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
index 373ae3e3d424aab53b393758f22422443455fb3e..352aeab8210e0aaf730926c33863100b1b02fd91 100644 (file)
--- 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);

diff --git a/src/backend/jit/llvm/llvmjit_wrap.cpp b/src/backend/jit/llvm/llvmjit_wrap.cpp
index 18876ec520973696cf55fe227862c1e2ea2c0957..9b66d73af3b54bb988b18df3f1b13b9bcf8c3c69 100644 (file)
--- 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 
+
+/* Avoid macro clash with LLVM's C++ headers */
+#undef Min
+
+#include 
+#include 
 #include 
 #include 
 
@@ -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(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 6178864b2e66797a697d7456b1f2f507d5aaa724..d9f9d6afc1fdcd43f4234b5cd6bda9fca0d8cbad 100644 (file)
--- a/src/include/jit/llvmjit.h
+++ b/src/include/jit/llvmjit.h
@@ -138,6 +138,8 @@ extern char *LLVMGetHostCPUName(void);
 extern char *LLVMGetHostCPUFeatures(void);
 #endif
 
+extern unsigned LLVMGetAttributeCountAtIndexPG(LLVMValueRef F, uint32 Idx);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif