Commit5784a49

committed

Move resowner from common JitContext to LLVM specific

Only the LLVM specific code uses it since resource owners were madeextensible in commitb8bff07. This isnew in v17, so backpatch there to keep the branches from divergingjust yet.Author: Andreas Karlsson <andreas@proxel.se>Discussion:https://www.postgresql.org/message-id/fd3a2a00-6605-4e30-a118-48418b478e6e@proxel.se

1 parent3a137ab commit5784a49Copy full SHA for 5784a49

File tree

-7

lines changed

-7

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ llvm_create_context(int jitFlags)`
`249`	`249`	`context->base.flags=jitFlags;`
`250`	`250`
`251`	`251`	`/* ensure cleanup */`
`252`		`-context->base.resowner=CurrentResourceOwner;`
	`252`	`+context->resowner=CurrentResourceOwner;`
`253`	`253`	`ResourceOwnerRememberJIT(CurrentResourceOwner,context);`
`254`	`254`
`255`	`255`	`llvm_jit_context_in_use_count++;`
`@@ -323,8 +323,8 @@ llvm_release_context(JitContext *context)`
`323`	`323`
`324`	`324`	`llvm_leave_fatal_on_oom();`
`325`	`325`
`326`		`-if (context->resowner)`
`327`		`-ResourceOwnerForgetJIT(context->resowner,llvm_jit_context);`
	`326`	`+if (llvm_jit_context->resowner)`
	`327`	`+ResourceOwnerForgetJIT(llvm_jit_context->resowner,llvm_jit_context);`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`/*`
`@@ -1377,8 +1377,8 @@ llvm_error_message(LLVMErrorRef error)`
`1377`	`1377`	`staticvoid`
`1378`	`1378`	`ResOwnerReleaseJitContext(Datumres)`
`1379`	`1379`	`{`
`1380`		`-JitContextcontext= (JitContext)DatumGetPointer(res);`
	`1380`	`+LLVMJitContextcontext= (LLVMJitContext)DatumGetPointer(res);`
`1381`	`1381`
`1382`	`1382`	`context->resowner=NULL;`
`1383`		`-jit_release_context(context);`
	`1383`	`+jit_release_context(&context->base);`
`1384`	`1384`	`}`

Lines changed: 0 additions & 2 deletions

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ typedef struct LLVMJitContext`
`39`	`39`	`{`
`40`	`40`	`JitContextbase;`
`41`	`41`
	`42`	`+/* used to ensure cleanup of context */`
	`43`	`+ResourceOwnerresowner;`
	`44`	`+`
`42`	`45`	`/* number of modules created */`
`43`	`46`	`size_tmodule_generation;`
`44`	`47`

Comments

(0)