git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Prepare for forthcoming LLVM 13 API change.

author Thomas Munro <tmunro@postgresql.org>

2021年6月24日 21:55:26 +0000 (09:55 +1200)

committer Thomas Munro <tmunro@postgresql.org>

2021年6月24日 23:28:20 +0000 (11:28 +1200)

LLVM 13 (due out in September) has changed the semantics of
LLVMOrcAbsoluteSymbols(), so we need to bump some reference counts to
avoid a double-free that causes crashes and bad query results.

A proactive change seems necessary to avoid having a window of time
where our respective latest releases would interact badly. It's
possible that the situation could change before then, though.

Thanks to Fabien Coelho for monitoring bleeding edge LLVM and Andres
Freund for tracking down the change.

Back-patch to 11, where the JIT code arrived.

Discussion: https://postgr.es/m/CA%2BhUKGLEy8mgtN7BNp0ooFAjUedDTJj5dME7NxLU-m91b85siA%40mail.gmail.com

src/backend/jit/llvm/llvmjit.c patch | blob | blame | history

diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c

index 71029a39a989bf08afccb51c1c7d4048fc5940ec..df691cbf1c539e4fc5f3034fc7303fac38e4910b 100644 (file)

--- a/src/backend/jit/llvm/llvmjit.c

+++ b/src/backend/jit/llvm/llvmjit.c

@@ -1106,6 +1106,9 @@ llvm_resolve_symbols(LLVMOrcDefinitionGeneratorRef GeneratorObj, void *Ctx,

{

const char *name = LLVMOrcSymbolStringPoolEntryStr(LookupSet[i].Name);

+#if LLVM_VERSION_MAJOR > 12

+ LLVMOrcRetainSymbolStringPoolEntry(LookupSet[i].Name);

+#endif

symbols[i].Name = LookupSet[i].Name;

symbols[i].Sym.Address = llvm_resolve_symbol(name, NULL);

symbols[i].Sym.Flags.GenericFlags = LLVMJITSymbolGenericFlagsExported;

This is the main PostgreSQL git repository.

RSS Atom