Skip to content

Commit ea2b0d3

Browse files
committed
Fixed JIT failures on Windows
1 parent efad137 commit ea2b0d3

File tree

4 files changed

+1
-18
lines changed

4 files changed

+1
-18
lines changed

Zend/tests/bug31098.phpt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
--TEST--
22
Bug #31098 (isset() / empty() incorrectly returns true in dereference of a wrong type)
3-
--SKIPIF--
4-
<?php
5-
if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
6-
die('xfail unresolved issues with JIT on Windows');
7-
}
8-
?>
93
--FILE--
104
<?php
115
$a = '';

Zend/tests/bug44660.phpt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
--TEST--
22
Bug #44660 (Indexed and reference assignment to property of non-object don't trigger warning)
3-
--SKIPIF--
4-
<?php
5-
if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
6-
die('xfail unresolved issues with JIT on Windows');
7-
}
8-
?>
93
--FILE--
104
<?php
115
$s = "hello";

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10993,7 +10993,7 @@ static int zend_jit_fetch_obj(dasm_State **Dst, const zend_op *opline, const zen
1099310993
if ((op1_info & ((MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF)- MAY_BE_OBJECT)) && JIT_G(trigger) != ZEND_JIT_ON_HOT_TRACE) {
1099410994
|7:
1099510995
if (opline->opcode != ZEND_FETCH_OBJ_IS) {
10996-
| SAVE_VALID_OPLINE opline, r1
10996+
| SAVE_VALID_OPLINE opline, r0
1099710997
if (opline->opcode != ZEND_FETCH_OBJ_W
1099810998
&& (op1_info & MAY_BE_UNDEF)) {
1099910999
zend_jit_addr orig_op1_addr = OP1_ADDR();

ext/opcache/tests/jit/fetch_obj_001.phpt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ opcache.file_update_protection=0
77
opcache.jit_buffer_size=1M
88
--SKIPIF--
99
<?php require_once('skipif.inc'); ?>
10-
<?php
11-
if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
12-
die('xfail unresolved issues with JIT on Windows');
13-
}
14-
?>
1510
--FILE--
1611
<?php
1712
function foo(&$a) {

0 commit comments

Comments
 (0)