JIT: Fixed missing type load

php · Sep 27, 2021 · 7981d48 · 7981d48
1 parent 0015fc9
commit 7981d48
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
@@ -12278,9 +12278,7 @@ static int zend_jit_fetch_obj(dasm_State          **Dst,
 				|	IF_NOT_TYPE TMP1w, IS_REFERENCE, >1
 				|	GET_Z_PTR REG0, REG0
 				|	add REG0, REG0, #offsetof(zend_reference, val)
-				if (type >= IS_STRING) {
-					|	GET_ZVAL_TYPE_INFO REG2w, val_addr, TMP1
-				}
+				|	GET_ZVAL_TYPE_INFO REG2w, val_addr, TMP1
 			}
 			res_info &= ~MAY_BE_GUARD;
 			ssa->var_info[ssa_op->result_def].type &= ~MAY_BE_GUARD;

diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -12985,9 +12985,7 @@ static int zend_jit_fetch_obj(dasm_State          **Dst,
 				|	IF_NOT_TYPE dl, IS_REFERENCE, >1
 				|	GET_Z_PTR r0, r0
 				|	add r0, offsetof(zend_reference, val)
-				if (type >= IS_STRING) {
-					|	GET_ZVAL_TYPE_INFO edx, val_addr
-				}
+				|	GET_ZVAL_TYPE_INFO edx, val_addr
 			}
 			res_info &= ~MAY_BE_GUARD;
 			ssa->var_info[ssa_op->result_def].type &= ~MAY_BE_GUARD;