From 91d8b747686aa07341337e1cd0b7c2244e955adb Mon Sep 17 00:00:00 2001 From: Thomas Munro Date: Tue, 9 Apr 2024 18:57:48 +1200 Subject: [PATCH 2/2] Run LLVM verify pass on all generated IR. We fixed a recent problem that crashed LLVM 18, but Dmitry pointed out that we'd have known about that all along if we'd automatically run the verify pass on the IR we generate. Turn that on in assertion builds. That reveals one other complaint about a name, which is also fixed here. Suggested-by: Dmitry Dolgov <9erthalion6@gmail.com> Discussion: https://postgr.es/m/CAFj8pRACpVFr7LMdVYENUkScG5FCYMZDDdSGNU-tch%2Bw98OxYg%40mail.gmail.com --- src/backend/jit/llvm/llvmjit.c | 11 +++++++++-- src/backend/jit/llvm/llvmjit_expr.c | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c index 92b4993a98a..bc429e970f2 100644 --- a/src/backend/jit/llvm/llvmjit.c +++ b/src/backend/jit/llvm/llvmjit.c @@ -703,10 +703,17 @@ llvm_optimize_module(LLVMJitContext *context, LLVMModuleRef module) LLVMErrorRef err; const char *passes; + /* In assertion builds, run the LLVM verify pass. */ +#ifdef USE_ASSERT_CHECKING +#define PASSES_PREFIX "verify," +#else +#define PASSES_PREFIX "" +#endif + if (context->base.flags & PGJIT_OPT3) - passes = "default"; + passes = PASSES_PREFIX "default"; else - passes = "default,mem2reg"; + passes = PASSES_PREFIX "default,mem2reg"; options = LLVMCreatePassBuilderOptions(); diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c index 9e0efd26687..cd956fa7e38 100644 --- a/src/backend/jit/llvm/llvmjit_expr.c +++ b/src/backend/jit/llvm/llvmjit_expr.c @@ -2765,7 +2765,7 @@ create_LifetimeEnd(LLVMModuleRef mod) LLVMContextRef lc; /* variadic pointer argument */ - const char *nm = "llvm.lifetime.end.p0i8"; + const char *nm = "llvm.lifetime.end.p0"; fn = LLVMGetNamedFunction(mod, nm); if (fn) -- 2.44.0