From 35e0506a2e7ea586a56b51412ec120f7656a0d63 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 11 Jan 2021 15:12:27 +0300 Subject: Add guard if lvalue of assignment may be a reference, but wasn't a reference during recording --- ext/opcache/jit/zend_jit_trace.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index 0b4edb1092..853be7517a 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/ext/opcache/jit/zend_jit_trace.c @@ -1625,6 +1625,10 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin break; } ADD_OP2_TRACE_GUARD(); + if (op1_type != IS_UNKNOWN + && (tssa->var_info[tssa->ops[idx].op1_use].type & MAY_BE_REF)) { + ADD_OP1_TRACE_GUARD(); + } break; case ZEND_CAST: if (opline->extended_value != op1_type) { @@ -4506,6 +4510,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par op2_info = OP2_INFO(); CHECK_OP2_TRACE_TYPE(); op1_info = OP1_INFO(); + CHECK_OP1_TRACE_TYPE(); op1_def_info = OP1_DEF_INFO(); op1_addr = OP1_REG_ADDR(); op1_def_addr = OP1_DEF_REG_ADDR(); -- cgit v1.2.1