diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2021-06-25 09:55:26 +1200 |
|---|---|---|
| committer | Thomas Munro <tmunro@postgresql.org> | 2021-06-25 11:28:20 +1200 |
| commit | 9b4e4cfe66ff133717c1b8ba3c2725d525c3e67c (patch) | |
| tree | 70cc9bb23106aa07be7dcf623c346052ebbdddda | |
| parent | c13585fe9e55813cf9feac67fe7b65d3a78fff92 (diff) | |
| download | postgresql-9b4e4cfe66ff133717c1b8ba3c2725d525c3e67c.tar.gz postgresql-9b4e4cfe66ff133717c1b8ba3c2725d525c3e67c.zip | |
Prepare for forthcoming LLVM 13 API change.
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
| -rw-r--r-- | src/backend/jit/llvm/llvmjit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c index 71029a39a98..df691cbf1c5 100644 --- 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; |