You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by ch...@apache.org on 2025/07/18 07:53:33 UTC

(cloudberry) branch cbdb-postgres-merge updated: Fix conflicts for jit

This is an automated email from the ASF dual-hosted git repository.

chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git


The following commit(s) were added to refs/heads/cbdb-postgres-merge by this push:
     new 24afe8f333a Fix conflicts for jit
24afe8f333a is described below

commit 24afe8f333afb6b1711d85c1e4ad09103dc9a9ec
Author: Jinbao Chen <ch...@gmail.com>
AuthorDate: Fri Jul 18 15:53:22 2025 +0800

    Fix conflicts for jit
---
 src/backend/jit/llvm/llvmjit.c | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
index ea657749754..2c249b5f7a8 100644
--- a/src/backend/jit/llvm/llvmjit.c
+++ b/src/backend/jit/llvm/llvmjit.c
@@ -251,19 +251,8 @@ llvm_create_context(int jitFlags)
 static void
 llvm_release_context(JitContext *context)
 {
-<<<<<<< HEAD
 	LLVMJitContext *llvm_context = (LLVMJitContext *) context;
 	ListCell   *lc;
-=======
-	LLVMJitContext *llvm_jit_context = (LLVMJitContext *) context;
-	ListCell   *lc;
-
-	/*
-	 * Consider as cleaned up even if we skip doing so below, that way we can
-	 * verify the tracking is correct (see llvm_shutdown()).
-	 */
-	llvm_jit_context_in_use_count--;
->>>>>>> REL_16_9
 
 	/*
 	 * When this backend is exiting, don't clean up LLVM. As an error might
@@ -275,21 +264,13 @@ llvm_release_context(JitContext *context)
 
 	llvm_enter_fatal_on_oom();
 
-<<<<<<< HEAD
 	if (llvm_context->module)
-=======
-	if (llvm_jit_context->module)
->>>>>>> REL_16_9
 	{
 		LLVMDisposeModule(llvm_jit_context->module);
 		llvm_jit_context->module = NULL;
 	}
 
-<<<<<<< HEAD
 	foreach(lc, llvm_context->handles)
-=======
-	foreach(lc, llvm_jit_context->handles)
->>>>>>> REL_16_9
 	{
 		LLVMJitHandle *jit_handle = (LLVMJitHandle *) lfirst(lc);
 
@@ -319,15 +300,8 @@ llvm_release_context(JitContext *context)
 
 		pfree(jit_handle);
 	}
-<<<<<<< HEAD
 	list_free(llvm_context->handles);
 	llvm_context->handles = NIL;
-=======
-	list_free(llvm_jit_context->handles);
-	llvm_jit_context->handles = NIL;
-
-	llvm_leave_fatal_on_oom();
->>>>>>> REL_16_9
 }
 
 /*
@@ -1050,13 +1024,8 @@ llvm_shutdown(int code, Datum arg)
 	 * has occurred in the middle of LLVM code. It is not safe to call back
 	 * into LLVM (which is why a FATAL error was thrown).
 	 *
-<<<<<<< HEAD
-	 * We do need to shutdown LLVM in other shutdown cases, otherwise
-	 * e.g. profiling data won't be written out.
-=======
 	 * We do need to shutdown LLVM in other shutdown cases, otherwise e.g.
 	 * profiling data won't be written out.
->>>>>>> REL_16_9
 	 */
 	if (llvm_in_fatal_on_oom())
 	{
@@ -1064,13 +1033,6 @@ llvm_shutdown(int code, Datum arg)
 		return;
 	}
 
-<<<<<<< HEAD
-=======
-	if (llvm_jit_context_in_use_count != 0)
-		elog(PANIC, "LLVMJitContext in use count not 0 at exit (is %zu)",
-			 llvm_jit_context_in_use_count);
-
->>>>>>> REL_16_9
 #if LLVM_VERSION_MAJOR > 11
 	{
 		if (llvm_opt3_orc)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org