diff options
| author | Andres Freund <andres@anarazel.de> | 2020-02-06 19:06:16 -0800 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2020-02-06 19:54:43 -0800 |
| commit | 1fdb7f9789c4550204cd62d1746a7deed1dc4c29 (patch) | |
| tree | 877c68ff731bf42a811be492dca9c79db71494be /src/backend/jit/llvm/llvmjit_expr.c | |
| parent | 1ec7679f1b67e84be688a311dce234eeaa1d5de8 (diff) | |
| download | postgresql-1fdb7f9789c4550204cd62d1746a7deed1dc4c29.tar.gz postgresql-1fdb7f9789c4550204cd62d1746a7deed1dc4c29.zip | |
expression eval: Don't redundantly keep track of AggState.
It's already tracked via ExprState->parent, so we don't need to also
include it in ExprEvalStep. When that code originally was written
ExprState->parent didn't exist, but it since has been introduced in
6719b238e8f.
Author: Andres Freund
Discussion: https://postgr.es/m/20191023163849.sosqbfs5yenocez3@alap3.anarazel.de
Diffstat (limited to 'src/backend/jit/llvm/llvmjit_expr.c')
| -rw-r--r-- | src/backend/jit/llvm/llvmjit_expr.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c index a2302b4d4d6..521d9337e7c 100644 --- a/src/backend/jit/llvm/llvmjit_expr.c +++ b/src/backend/jit/llvm/llvmjit_expr.c @@ -85,6 +85,7 @@ llvm_compile_expr(ExprState *state) /* state itself */ LLVMValueRef v_state; LLVMValueRef v_econtext; + LLVMValueRef v_parent; /* returnvalue */ LLVMValueRef v_isnullp; @@ -173,6 +174,9 @@ llvm_compile_expr(ExprState *state) v_tmpisnullp = LLVMBuildStructGEP(b, v_state, FIELDNO_EXPRSTATE_RESNULL, "v.state.resnull"); + v_parent = l_load_struct_gep(b, v_state, + FIELDNO_EXPRSTATE_PARENT, + "v.state.parent"); /* build global slots */ v_scanslot = l_load_struct_gep(b, v_econtext, @@ -1989,7 +1993,7 @@ llvm_compile_expr(ExprState *state) LLVMValueRef v_tmpcontext; LLVMValueRef v_oldcontext; - aggstate = op->d.agg_deserialize.aggstate; + aggstate = castNode(AggState, state->parent); fcinfo = op->d.agg_deserialize.fcinfo_data; v_tmpcontext = @@ -2078,7 +2082,6 @@ llvm_compile_expr(ExprState *state) case EEOP_AGG_INIT_TRANS: { - AggState *aggstate; AggStatePerTrans pertrans; LLVMValueRef v_aggstatep; @@ -2095,11 +2098,10 @@ llvm_compile_expr(ExprState *state) LLVMBasicBlockRef b_init; - aggstate = op->d.agg_init_trans.aggstate; pertrans = op->d.agg_init_trans.pertrans; - v_aggstatep = l_ptr_const(aggstate, - l_ptr(StructAggState)); + v_aggstatep = + LLVMBuildBitCast(b, v_parent, l_ptr(StructAggState), ""); v_pertransp = l_ptr_const(pertrans, l_ptr(StructAggStatePerTransData)); @@ -2176,7 +2178,6 @@ llvm_compile_expr(ExprState *state) case EEOP_AGG_STRICT_TRANS_CHECK: { - AggState *aggstate; LLVMValueRef v_setoff, v_transno; @@ -2188,8 +2189,8 @@ llvm_compile_expr(ExprState *state) int jumpnull = op->d.agg_strict_trans_check.jumpnull; - aggstate = op->d.agg_strict_trans_check.aggstate; - v_aggstatep = l_ptr_const(aggstate, l_ptr(StructAggState)); + v_aggstatep = + LLVMBuildBitCast(b, v_parent, l_ptr(StructAggState), ""); /* * pergroup = &aggstate->all_pergroups @@ -2256,13 +2257,13 @@ llvm_compile_expr(ExprState *state) LLVMValueRef v_tmpcontext; LLVMValueRef v_oldcontext; - aggstate = op->d.agg_trans.aggstate; + aggstate = castNode(AggState, state->parent); pertrans = op->d.agg_trans.pertrans; fcinfo = pertrans->transfn_fcinfo; - v_aggstatep = l_ptr_const(aggstate, - l_ptr(StructAggState)); + v_aggstatep = + LLVMBuildBitCast(b, v_parent, l_ptr(StructAggState), ""); v_pertransp = l_ptr_const(pertrans, l_ptr(StructAggStatePerTransData)); |