Fixed JIT failures on Windows

diff --git a/Zend/tests/bug31098.phpt b/Zend/tests/bug31098.phpt
index 325ed177272a540cfc5f2286542fc89869d290fa..4d01d36cd8673e220d08bdb402209062faadc0af 100644 (file)
--- a/Zend/tests/bug31098.phpt
+++ b/Zend/tests/bug31098.phpt
@@ -1,11 +1,5 @@
 --TEST--
 Bug #31098 (isset() / empty() incorrectly returns true in dereference of a wrong type)
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
-    die('xfail unresolved issues with JIT on Windows');
-}
-?>
 --FILE--
 <?php
 $a = '';

diff --git a/Zend/tests/bug44660.phpt b/Zend/tests/bug44660.phpt
index 08de20db011bc958f7197c68ebbe0d4d87def8c1..5097fa7518389ba9f7ee92427cb38fe42fa1e31f 100644 (file)
--- a/Zend/tests/bug44660.phpt
+++ b/Zend/tests/bug44660.phpt
@@ -1,11 +1,5 @@
 --TEST--
 Bug #44660 (Indexed and reference assignment to property of non-object don't trigger warning)
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
-    die('xfail unresolved issues with JIT on Windows');
-}
-?>
 --FILE--
 <?php
 $s = "hello";

diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
index 29d462b4e3a637986875ad96bf4e598a088d3725..d4af1216185e60b133c5aab64246e011c79d8a23 100644 (file)
--- a/ext/opcache/jit/zend_jit_x86.dasc
+++ b/ext/opcache/jit/zend_jit_x86.dasc
@@ -10993,7 +10993,7 @@ static int zend_jit_fetch_obj(dasm_State **Dst, const zend_op *opline, const zen
        if ((op1_info & ((MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF)- MAY_BE_OBJECT)) && JIT_G(trigger) != ZEND_JIT_ON_HOT_TRACE) {
                |7:
                if (opline->opcode != ZEND_FETCH_OBJ_IS) {
-                       |       SAVE_VALID_OPLINE opline, r1
+                       |       SAVE_VALID_OPLINE opline, r0
                        if (opline->opcode != ZEND_FETCH_OBJ_W
                         && (op1_info & MAY_BE_UNDEF)) {
                                zend_jit_addr orig_op1_addr = OP1_ADDR();

diff --git a/ext/opcache/tests/jit/fetch_obj_001.phpt b/ext/opcache/tests/jit/fetch_obj_001.phpt
index 666bd02d48a2b8c49e1eb567d1805d2721a37553..49de772b66c9fd831ff5971ada6c34f9f1f0c5c5 100644 (file)
--- a/ext/opcache/tests/jit/fetch_obj_001.phpt
+++ b/ext/opcache/tests/jit/fetch_obj_001.phpt
@@ -7,11 +7,6 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php
-if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
-    die('xfail unresolved issues with JIT on Windows');
-}
-?>
 --FILE--
 <?php
 function foo(&$a) {