Skip to content

Backport fix for GH-9011 #17052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 5, 2024
Merged

Backport fix for GH-9011 #17052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95c9cd6
Backport fix for GH-9011
dstogov Dec 5, 2024
1556723
Fix build
dstogov Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 50 additions & 14 deletions ext/opcache/jit/zend_jit_x86.dasc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9240,19 +9240,11 @@ static int zend_jit_init_fcall_guard(dasm_State **Dst, uint32_t level, const zen
int32_t exit_point;
const void *exit_addr;

if (func->type == ZEND_INTERNAL_FUNCTION) {
#ifdef ZEND_WIN32
// TODO: ASLR may cause different addresses in different workers ???
return 0;
#endif
} else if (func->type == ZEND_USER_FUNCTION) {
if (func->type == ZEND_USER_FUNCTION) {
if (!zend_accel_in_shm(func->op_array.opcodes)) {
/* op_array and op_array->opcodes are not persistent. We can't link. */
return 0;
}
} else {
ZEND_UNREACHABLE();
return 0;
}

exit_point = zend_jit_trace_get_exit_point(to_opline, ZEND_JIT_EXIT_POLYMORPHISM);
Expand Down Expand Up @@ -9286,6 +9278,22 @@ static int zend_jit_init_fcall_guard(dasm_State **Dst, uint32_t level, const zen
| cmp aword [r1 + offsetof(zend_op_array, opcodes)], opcodes
| .endif
| jne &exit_addr
#ifdef _WIN32
} else if (func->type == ZEND_INTERNAL_FUNCTION) {
const zif_handler handler = func->internal_function.handler;

| .if X64
|| if (!IS_SIGNED_32BIT(handler)) {
| mov64 r2, ((ptrdiff_t)handler)
| cmp aword [r1 + offsetof(zend_internal_function, handler)], r2
|| } else {
| cmp aword [r1 + offsetof(zend_internal_function, handler)], handler
|| }
| .else
| cmp aword [r1 + offsetof(zend_internal_function, handler)], handler
| .endif
| jne &exit_addr
#endif
} else {
| .if X64
|| if (!IS_SIGNED_32BIT(func)) {
Expand Down Expand Up @@ -9432,6 +9440,22 @@ static int zend_jit_init_fcall(dasm_State **Dst, const zend_op *opline, uint32_t
| cmp aword [r0 + offsetof(zend_op_array, opcodes)], opcodes
| .endif
| jz >3
#ifdef _WIN32
} else if (func->type == ZEND_INTERNAL_FUNCTION) {
const zif_handler handler = func->internal_function.handler;

| .if X64
|| if (!IS_SIGNED_32BIT(handler)) {
| mov64 r1, ((ptrdiff_t)handler)
| cmp aword [r0 + offsetof(zend_internal_function, handler)], r1
|| } else {
| cmp aword [r0 + offsetof(zend_internal_function, handler)], handler
|| }
| .else
| cmp aword [r0 + offsetof(zend_internal_function, handler)], handler
| .endif
| jz >3
#endif
} else {
| .if X64
|| if (!IS_SIGNED_32BIT(func)) {
Expand Down Expand Up @@ -9618,11 +9642,7 @@ static int zend_jit_init_method_call(dasm_State **Dst,
if ((!func || zend_jit_may_be_modified(func, op_array))
&& trace
&& trace->op == ZEND_JIT_TRACE_INIT_CALL
&& trace->func
#ifdef _WIN32
&& trace->func->type != ZEND_INTERNAL_FUNCTION
#endif
) {
&& trace->func) {
int32_t exit_point;
const void *exit_addr;

Expand Down Expand Up @@ -9651,6 +9671,22 @@ static int zend_jit_init_method_call(dasm_State **Dst,
| cmp aword [r0 + offsetof(zend_op_array, opcodes)], opcodes
| .endif
| jne &exit_addr
#ifdef _WIN32
} else if (func->type == ZEND_INTERNAL_FUNCTION) {
const zif_handler handler = func->internal_function.handler;

| .if X64
|| if (!IS_SIGNED_32BIT(handler)) {
| mov64 r1, ((ptrdiff_t)handler)
| cmp aword [r0 + offsetof(zend_internal_function, handler)], r1
|| } else {
| cmp aword [r0 + offsetof(zend_internal_function, handler)], handler
|| }
| .else
| cmp aword [r0 + offsetof(zend_internal_function, handler)], handler
| .endif
| jne &exit_addr
#endif
} else {
| .if X64
|| if (!IS_SIGNED_32BIT(func)) {
Expand Down
27 changes: 27 additions & 0 deletions ext/opcache/tests/jit/gh9011.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--TEST--
GH-9011: Assertion failure with tracing JIT
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
--FILE--
<?php
$foo = [];
$foo[] = new \Exception(); /* Native interface implemented Native instance */
$foo[] = new class () implements \Stringable /* Native interface implemented User instance */
{
public function __toString(): string
{
return "bar";
}
};

foreach ($foo as $baz) {
for ($i = 0; $i < 64; $i++) {
$baz->__toString();
}
}
?>
DONE
--EXPECT--
DONE
Loading