diff options
Diffstat (limited to 'src/backend/jit/llvm')
| -rw-r--r-- | src/backend/jit/llvm/llvmjit.c | 4 | ||||
| -rw-r--r-- | src/backend/jit/llvm/llvmjit_expr.c | 18 | ||||
| -rw-r--r-- | src/backend/jit/llvm/llvmjit_types.c | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c index c4d38a64a44..82c4afb7011 100644 --- a/src/backend/jit/llvm/llvmjit.c +++ b/src/backend/jit/llvm/llvmjit.c @@ -85,7 +85,7 @@ LLVMValueRef FuncVarsizeAny; LLVMValueRef FuncSlotGetsomeattrsInt; LLVMValueRef FuncSlotGetmissingattrs; LLVMValueRef FuncMakeExpandedObjectReadOnlyInternal; -LLVMValueRef FuncExecEvalArrayRefSubscript; +LLVMValueRef FuncExecEvalSubscriptingRef; LLVMValueRef FuncExecEvalSysVar; LLVMValueRef FuncExecAggTransReparent; LLVMValueRef FuncExecAggInitGroup; @@ -829,7 +829,7 @@ llvm_create_types(void) FuncSlotGetsomeattrsInt = LLVMGetNamedFunction(mod, "slot_getsomeattrs_int"); FuncSlotGetmissingattrs = LLVMGetNamedFunction(mod, "slot_getmissingattrs"); FuncMakeExpandedObjectReadOnlyInternal = LLVMGetNamedFunction(mod, "MakeExpandedObjectReadOnlyInternal"); - FuncExecEvalArrayRefSubscript = LLVMGetNamedFunction(mod, "ExecEvalArrayRefSubscript"); + FuncExecEvalSubscriptingRef = LLVMGetNamedFunction(mod, "ExecEvalSubscriptingRef"); FuncExecEvalSysVar = LLVMGetNamedFunction(mod, "ExecEvalSysVar"); FuncExecAggTransReparent = LLVMGetNamedFunction(mod, "ExecAggTransReparent"); FuncExecAggInitGroup = LLVMGetNamedFunction(mod, "ExecAggInitGroup"); diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c index df7e620da71..1bb58e3e61a 100644 --- a/src/backend/jit/llvm/llvmjit_expr.c +++ b/src/backend/jit/llvm/llvmjit_expr.c @@ -1144,20 +1144,20 @@ llvm_compile_expr(ExprState *state) break; } - case EEOP_ARRAYREF_OLD: - build_EvalXFunc(b, mod, "ExecEvalArrayRefOld", + case EEOP_SBSREF_OLD: + build_EvalXFunc(b, mod, "ExecEvalSubscriptingRefOld", v_state, v_econtext, op); LLVMBuildBr(b, opblocks[i + 1]); break; - case EEOP_ARRAYREF_ASSIGN: - build_EvalXFunc(b, mod, "ExecEvalArrayRefAssign", + case EEOP_SBSREF_ASSIGN: + build_EvalXFunc(b, mod, "ExecEvalSubscriptingRefAssign", v_state, v_econtext, op); LLVMBuildBr(b, opblocks[i + 1]); break; - case EEOP_ARRAYREF_FETCH: - build_EvalXFunc(b, mod, "ExecEvalArrayRefFetch", + case EEOP_SBSREF_FETCH: + build_EvalXFunc(b, mod, "ExecEvalSubscriptingRefFetch", v_state, v_econtext, op); LLVMBuildBr(b, opblocks[i + 1]); break; @@ -1775,14 +1775,14 @@ llvm_compile_expr(ExprState *state) LLVMBuildBr(b, opblocks[i + 1]); break; - case EEOP_ARRAYREF_SUBSCRIPT: + case EEOP_SBSREF_SUBSCRIPT: { LLVMValueRef v_fn; - int jumpdone = op->d.arrayref_subscript.jumpdone; + int jumpdone = op->d.sbsref_subscript.jumpdone; LLVMValueRef v_params[2]; LLVMValueRef v_ret; - v_fn = llvm_get_decl(mod, FuncExecEvalArrayRefSubscript); + v_fn = llvm_get_decl(mod, FuncExecEvalSubscriptingRef); v_params[0] = v_state; v_params[1] = l_ptr_const(op, l_ptr(StructExprEvalStep)); diff --git a/src/backend/jit/llvm/llvmjit_types.c b/src/backend/jit/llvm/llvmjit_types.c index c814bc7b3ee..9522b972c1a 100644 --- a/src/backend/jit/llvm/llvmjit_types.c +++ b/src/backend/jit/llvm/llvmjit_types.c @@ -103,7 +103,7 @@ void *referenced_functions[] = slot_getsomeattrs_int, slot_getmissingattrs, MakeExpandedObjectReadOnlyInternal, - ExecEvalArrayRefSubscript, + ExecEvalSubscriptingRef, ExecEvalSysVar, ExecAggTransReparent, ExecAggInitGroup |