Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 47d2264

Browse files
committed
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
1 parent 79ff96a commit 47d2264

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/backend/jit/llvm/llvmjit.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,6 +1108,9 @@ llvm_resolve_symbols(LLVMOrcDefinitionGeneratorRef GeneratorObj, void *Ctx,
11081108
{
11091109
const char *name = LLVMOrcSymbolStringPoolEntryStr(LookupSet[i].Name);
11101110

1111+
#if LLVM_VERSION_MAJOR > 12
1112+
LLVMOrcRetainSymbolStringPoolEntry(LookupSet[i].Name);
1113+
#endif
11111114
symbols[i].Name = LookupSet[i].Name;
11121115
symbols[i].Sym.Address = llvm_resolve_symbol(name, NULL);
11131116
symbols[i].Sym.Flags.GenericFlags = LLVMJITSymbolGenericFlagsExported;

0 commit comments

Comments
 (0)