> On Tue, May 14, 2024 at 11:09:39AM -0400, Robert Haas wrote: > On Tue, Apr 9, 2024 at 8:44 PM Thomas Munro <thomas.mu...@gmail.com> wrote: > > I pushed the illegal attribute fix though. Thanks for the detective work! > > This was commit 53c8d6c9f157f2bc8211b8de02417e55fefddbc7 and as I > understand it that fixed the issue originally reported on this thread. > > Therefore, I have marked https://commitfest.postgresql.org/48/4917/ as > Committed. > > If that's not correct, please feel free to fix. If there are other > issues that need to be patched separately, please consider opening a > new CF entry for those issues once a patch is available.
Thanks, that's correct. I think the only thing left is to add a verifier pass, which everybody seems to be agreed is nice to have. The plan is to add it only to master without back-patching. I assume Thomas did not have time for that yet, so I've added the latest suggestions into his patch, and going to open a CF item to not forget about it.
>From 67d955d9b69ea5204f02ace1a27ee4938b0dfd3a Mon Sep 17 00:00:00 2001 From: Thomas Munro <thomas.mu...@gmail.com> Date: Tue, 9 Apr 2024 18:57:48 +1200 Subject: [PATCH v1] 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 <9erthali...@gmail.com> Discussion: https://postgr.es/m/CAFj8pRACpVFr7LMdVYENUkScG5FCYMZDDdSGNU-tch%2Bw98OxYg%40mail.gmail.com --- src/backend/jit/llvm/llvmjit.c | 5 +++++ src/backend/jit/llvm/llvmjit_expr.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c index 1d439f24554..0bafe309bb6 100644 --- a/src/backend/jit/llvm/llvmjit.c +++ b/src/backend/jit/llvm/llvmjit.c @@ -714,6 +714,11 @@ llvm_optimize_module(LLVMJitContext *context, LLVMModuleRef module) LLVMPassBuilderOptionsSetDebugLogging(options, 1); #endif + /* In assertion builds, run the LLVM verify pass. */ +#ifdef USE_ASSERT_CHECKING + LLVMPassBuilderOptionsSetVerifyEach(options, true); +#endif + LLVMPassBuilderOptionsSetInlinerThreshold(options, 512); err = LLVMRunPasses(module, passes, NULL, options); 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) base-commit: a3e6c6f929912f928fa405909d17bcbf0c1b03ee -- 2.41.0
