Commit f6fc0fd

committed

Add missing type guard

1 parent 6c8ef1d commit f6fc0fdCopy full SHA for f6fc0fd

File tree

+10

-0

lines changed

+10

-0

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6557,6 +6557,16 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`6557`	`6557`
`6558`	`6558`	`for (i = 0; i < op_array->last_var; i++,j++) {`
`6559`	`6559`	`if (ra[j] && (ra[j]->flags & ZREG_LOAD) != 0) {`
	`6560`	`+ if ((ssa->var_info[j].type & MAY_BE_GUARD) != 0) {`
	`6561`	`+ uint8_t op_type;`
	`6562`	`+`
	`6563`	`+ ssa->var_info[j].type &= ~MAY_BE_GUARD;`
	`6564`	`+ op_type = concrete_type(ssa->var_info[j].type);`
	`6565`	`+ if (!zend_jit_type_guard(&dasm_state, opline, EX_NUM_TO_VAR(i), op_type)) {`
	`6566`	`+ goto jit_failure;`
	`6567`	`+ }`
	`6568`	`+ SET_STACK_TYPE(stack, i, op_type, 1);`
	`6569`	`+ }`
`6560`	`6570`	`SET_STACK_REG_EX(stack, i, ra[j]->reg, ZREG_LOAD);`
`6561`	`6571`	`if (!zend_jit_load_var(&dasm_state, ssa->var_info[j].type, i, ra[j]->reg)) {`
`6562`	`6572`	`goto jit_failure;`

Comments

(0)