JIT: Remove FETCH_THIS+FETCH_OBJ_* optimizations for closures for

dstogov · dstogov · commit 3e706536d9ef · 2021-09-27T12:52:34.000+03:00
functon JIT introduced in d1a0b93. They caused failure of Zend/tests/closure_038.phpt with -d opcache.jit=1215
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -3177,14 +3177,6 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 									}
 								}
 							}
-							if (ssa->ops && ssa->vars) {
-								zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];
-								if (ssa_op->op1_use >= 0) {
-									if (ssa->vars[ssa_op->op1_use].definition >= 0) {
-										on_this = op_array->opcodes[ssa->vars[ssa_op->op1_use].definition].opcode == ZEND_FETCH_THIS;
-									}
-								}
-							}
 						}
 						if (!zend_jit_incdec_obj(&dasm_state, opline, op_array, ssa, ssa_op,
 								op1_info, op1_addr,
@@ -3234,14 +3226,6 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 									}
 								}
 							}
-							if (ssa->ops && ssa->vars) {
-								zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];
-								if (ssa_op->op1_use >= 0) {
-									if (ssa->vars[ssa_op->op1_use].definition >= 0) {
-										on_this = op_array->opcodes[ssa->vars[ssa_op->op1_use].definition].opcode == ZEND_FETCH_THIS;
-									}
-								}
-							}
 						}
 						if (!zend_jit_assign_obj_op(&dasm_state, opline, op_array, ssa, ssa_op,
 								op1_info, op1_addr, OP1_DATA_INFO(), OP1_DATA_RANGE(),
@@ -3284,14 +3268,6 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 									}
 								}
 							}
-							if (ssa->ops && ssa->vars) {
-								zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];
-								if (ssa_op->op1_use >= 0) {
-									if (ssa->vars[ssa_op->op1_use].definition >= 0) {
-										on_this = op_array->opcodes[ssa->vars[ssa_op->op1_use].definition].opcode == ZEND_FETCH_THIS;
-									}
-								}
-							}
 						}
 						if (!zend_jit_assign_obj(&dasm_state, opline, op_array, ssa, ssa_op,
 								op1_info, op1_addr, OP1_DATA_INFO(),
@@ -3802,14 +3778,6 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 									}
 								}
 							}
-							if (ssa->ops && ssa->vars) {
-								zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];
-								if (ssa_op->op1_use >= 0) {
-									if (ssa->vars[ssa_op->op1_use].definition >= 0) {
-										on_this = op_array->opcodes[ssa->vars[ssa_op->op1_use].definition].opcode == ZEND_FETCH_THIS;
-									}
-								}
-							}
 						}
 						if (!zend_jit_fetch_obj(&dasm_state, opline, op_array, ssa, ssa_op,
 								op1_info, op1_addr, 0, ce, ce_is_instanceof, on_this, 0, 0, NULL,
@@ -3961,14 +3929,6 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 									}
 								}
 							}
-							if (ssa->ops && ssa->vars) {
-								zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];
-								if (ssa_op->op1_use >= 0) {
-									if (ssa->vars[ssa_op->op1_use].definition >= 0) {
-										on_this = op_array->opcodes[ssa->vars[ssa_op->op1_use].definition].opcode == ZEND_FETCH_THIS;
-									}
-								}
-							}
 						}
 						if (!zend_jit_init_method_call(&dasm_state, opline, b, op_array, ssa, ssa_op, call_level,
 								op1_info, op1_addr, ce, ce_is_instanceof, on_this, 0, NULL,

Original file line number	Diff line number	Diff line change
`@@ -3177,14 +3177,6 @@ static int zend_jit(const zend_op_array op_array, zend_ssa ssa, const zend_op`
`3177`	`3177`	`}`
`3178`	`3178`	`}`
`3179`	`3179`	`}`
`3180`		`- if (ssa->ops && ssa->vars) {`
`3181`		`- zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];`
`3182`		`- if (ssa_op->op1_use >= 0) {`
`3183`		`- if (ssa->vars[ssa_op->op1_use].definition >= 0) {`
`3184`		`- on_this = op_array->opcodes[ssa->vars[ssa_op->op1_use].definition].opcode == ZEND_FETCH_THIS;`
`3185`		`- }`
`3186`		`- }`
`3187`		`- }`
`3188`	`3180`	`}`
`3189`	`3181`	`if (!zend_jit_incdec_obj(&dasm_state, opline, op_array, ssa, ssa_op,`
`3190`	`3182`	`op1_info, op1_addr,`
`@@ -3234,14 +3226,6 @@ static int zend_jit(const zend_op_array op_array, zend_ssa ssa, const zend_op`
`3234`	`3226`	`}`
`3235`	`3227`	`}`
`3236`	`3228`	`}`
`3237`		`- if (ssa->ops && ssa->vars) {`
`3238`		`- zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];`
`3239`		`- if (ssa_op->op1_use >= 0) {`
`3240`		`- if (ssa->vars[ssa_op->op1_use].definition >= 0) {`
`3241`		`- on_this = op_array->opcodes[ssa->vars[ssa_op->op1_use].definition].opcode == ZEND_FETCH_THIS;`
`3242`		`- }`
`3243`		`- }`
`3244`		`- }`
`3245`	`3229`	`}`
`3246`	`3230`	`if (!zend_jit_assign_obj_op(&dasm_state, opline, op_array, ssa, ssa_op,`
`3247`	`3231`	`op1_info, op1_addr, OP1_DATA_INFO(), OP1_DATA_RANGE(),`
`@@ -3284,14 +3268,6 @@ static int zend_jit(const zend_op_array op_array, zend_ssa ssa, const zend_op`
`3284`	`3268`	`}`
`3285`	`3269`	`}`
`3286`	`3270`	`}`
`3287`		`- if (ssa->ops && ssa->vars) {`
`3288`		`- zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];`
`3289`		`- if (ssa_op->op1_use >= 0) {`
`3290`		`- if (ssa->vars[ssa_op->op1_use].definition >= 0) {`
`3291`		`- on_this = op_array->opcodes[ssa->vars[ssa_op->op1_use].definition].opcode == ZEND_FETCH_THIS;`
`3292`		`- }`
`3293`		`- }`
`3294`		`- }`
`3295`	`3271`	`}`
`3296`	`3272`	`if (!zend_jit_assign_obj(&dasm_state, opline, op_array, ssa, ssa_op,`
`3297`	`3273`	`op1_info, op1_addr, OP1_DATA_INFO(),`
`@@ -3802,14 +3778,6 @@ static int zend_jit(const zend_op_array op_array, zend_ssa ssa, const zend_op`
`3802`	`3778`	`}`
`3803`	`3779`	`}`
`3804`	`3780`	`}`
`3805`		`- if (ssa->ops && ssa->vars) {`
`3806`		`- zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];`
`3807`		`- if (ssa_op->op1_use >= 0) {`
`3808`		`- if (ssa->vars[ssa_op->op1_use].definition >= 0) {`
`3809`		`- on_this = op_array->opcodes[ssa->vars[ssa_op->op1_use].definition].opcode == ZEND_FETCH_THIS;`
`3810`		`- }`
`3811`		`- }`
`3812`		`- }`
`3813`	`3781`	`}`
`3814`	`3782`	`if (!zend_jit_fetch_obj(&dasm_state, opline, op_array, ssa, ssa_op,`
`3815`	`3783`	`op1_info, op1_addr, 0, ce, ce_is_instanceof, on_this, 0, 0, NULL,`
`@@ -3961,14 +3929,6 @@ static int zend_jit(const zend_op_array op_array, zend_ssa ssa, const zend_op`
`3961`	`3929`	`}`
`3962`	`3930`	`}`
`3963`	`3931`	`}`
`3964`		`- if (ssa->ops && ssa->vars) {`
`3965`		`- zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];`
`3966`		`- if (ssa_op->op1_use >= 0) {`
`3967`		`- if (ssa->vars[ssa_op->op1_use].definition >= 0) {`
`3968`		`- on_this = op_array->opcodes[ssa->vars[ssa_op->op1_use].definition].opcode == ZEND_FETCH_THIS;`
`3969`		`- }`
`3970`		`- }`
`3971`		`- }`
`3972`	`3932`	`}`
`3973`	`3933`	`if (!zend_jit_init_method_call(&dasm_state, opline, b, op_array, ssa, ssa_op, call_level,`
`3974`	`3934`	`op1_info, op1_addr, ce, ce_is_instanceof, on_this, 0, NULL,`