Skip to content

Commit 9ad9862

Browse files
committed
jit: Adjust back-patch of f90b4a8 to 12 and 13.
While back-patching f90b4a8, I missed that branches before REL_14_STABLE did some (accidental?) type punning in a function parameter, and failed to adjust these two branches accordingly. That didn't seem to cause a problem for newer LLVM versions or non-debug builds, but older debug builds would fail a type cross-check assertion. Fix by supplying the correct function argument type. In REL_14_STABLE the same change was made by commit df99ddc. Per build farm animal xenodermus, which runs a debug build of LLVM 6 with jit_above_cost=0. Discussion: https://postgr.es/m/CA%2BhUKGLQ38rgZ3bvNHXPRjsWFAg3pa%3Dtnpeq0osa%2B%3DmiFD5jAw%40mail.gmail.com
1 parent 527e62a commit 9ad9862

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/backend/jit/llvm/llvmjit_expr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ llvm_compile_expr(ExprState *state)
11541154
llvm_pg_var_type("TypeExecEvalSubroutine"));
11551155

11561156
v_params[0] = v_state;
1157-
v_params[1] = l_ptr_const(op, l_ptr(TypeSizeT));
1157+
v_params[1] = l_ptr_const(op, l_ptr(StructExprEvalStep));
11581158
v_params[2] = v_econtext;
11591159
l_call(b,
11601160
LLVMGetFunctionType(ExecEvalSubroutineTemplate),

0 commit comments

Comments
 (0)