From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 8 Apr 2020 07:34:24 +0000 (+0300)
Subject: Update stack type, only if necessary
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f915b5516c30e1a92fdb150f1c31308e7b639e99;p=php

Update stack type, only if necessary
---

diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
index 213ca5d42b..0f5f1244eb 100644
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -335,8 +335,8 @@ static zend_always_inline uint32_t zend_jit_trace_type_to_info(zend_uchar type)
 				} \
 				op_info &= ~MAY_BE_GUARD; \
 				ssa->var_info[_ssa_var].type &= op_info; \
+				SET_STACK_VAR_TYPE(_var, op_type); \
 			} \
-			SET_STACK_VAR_TYPE(_var, op_type); \
 		} \
 	} while (0)