Skip to content

Commit eb1cdb5

Browse files
committed
Fix opline argument for getting the function info for range()
Short-lived regression from 00c6d53, where in one of its commits (that was squashed) not all changes were reverted correctly.
1 parent 5057390 commit eb1cdb5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Zend/Optimizer/zend_func_info.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ static uint32_t zend_range_info(const zend_call_info *call_info, const zend_ssa
5858
&& ssa
5959
&& !(ssa->cfg.flags & ZEND_SSA_TSSA)) {
6060
zend_op_array *op_array = call_info->caller_op_array;
61-
uint32_t t1 = _ssa_op1_info(op_array, ssa, op_array->opcodes,
61+
uint32_t t1 = _ssa_op1_info(op_array, ssa, call_info->arg_info[0].opline,
6262
ssa->ops ? &ssa->ops[call_info->arg_info[0].opline - op_array->opcodes] : NULL);
63-
uint32_t t2 = _ssa_op1_info(op_array, ssa, op_array->opcodes,
63+
uint32_t t2 = _ssa_op1_info(op_array, ssa, call_info->arg_info[1].opline,
6464
ssa->ops ? &ssa->ops[call_info->arg_info[1].opline - op_array->opcodes] : NULL);
6565
uint32_t t3 = 0;
6666
uint32_t tmp = MAY_BE_RC1 | MAY_BE_ARRAY;
6767

6868
if (call_info->num_args == 3) {
69-
t3 = _ssa_op1_info(op_array, ssa, op_array->opcodes,
69+
t3 = _ssa_op1_info(op_array, ssa, call_info->arg_info[2].opline,
7070
ssa->ops ? &ssa->ops[call_info->arg_info[2].opline - op_array->opcodes] : NULL);
7171
}
7272
if ((t1 & MAY_BE_STRING) && (t2 & MAY_BE_STRING)) {

0 commit comments

Comments
 (0)