com php-src: Update abstarct stack before guard to keep proper type in side trace: ext/opcache/jit/zend_jit_trace.c

From: Date: Mon, 27 Jul 2020 21:14:28 +0000
Subject: com php-src: Update abstarct stack before guard to keep proper type in side trace: ext/opcache/jit/zend_jit_trace.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-112395@lists.php.net to get a copy of this message
Commit: 226617d35804464cda33a1adf0424327da0cde42 Author: Dmitry Stogov <dmitry@zend.com> Tue, 28 Jul 2020 00:14:28 +0300 Parents: 274131e4afaa2c2ac07350ef153ebf207baa7b0b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=226617d35804464cda33a1adf0424327da0cde42 Log: Update abstarct stack before guard to keep proper type in side trace Changed paths: M ext/opcache/jit/zend_jit_trace.c Diff: diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index e558a48705..abedddec7c 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/ext/opcache/jit/zend_jit_trace.c @@ -4125,6 +4125,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par } if (opline->op1_type != IS_CONST && (p+1)->op == ZEND_JIT_TRACE_INIT_CALL && (p+1)->func) { + SET_STACK_TYPE(stack, EX_VAR_TO_NUM(opline->result.var), IS_OBJECT); if (!zend_jit_init_fcall_guard(&dasm_state, opline, (p+1)->func, opline+1)) { goto jit_failure; }

« previous php.cvs (#112395) next »