Skip to content

Fix JIT ignoring exceptions from typed property set hooks #25075

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

Closed
devnexen wants to merge 1 commit into from
+45 −0
Closed

Fix JIT ignoring exceptions from typed property set hooks #25075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Zend/Optimizer/zend_inference.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5264,6 +5264,7 @@ ZEND_API bool zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op
* and the value already has this type: the old value has no destructor.
* If the property holds a reference, all its type sources accept this type because they accept the current value. */
if ((prop_info->flags & (ZEND_ACC_READONLY|ZEND_ACC_PPP_SET_MASK))
|| prop_info->hooks
|| ZEND_TYPE_IS_COMPLEX(prop_info->type)
|| (type_mask & ~(MAY_BE_NULL|MAY_BE_BOOL|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_STRING))
/* single type, this excludes bool too as a reference can exist to true or false standalone types. */
Expand Down
44 changes: 44 additions & 0 deletions ext/opcache/tests/jit/assign_obj_007.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
--TEST--
JIT ASSIGN_OBJ: exception thrown by a set hook on a typed property
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=1M
opcache.jit=tracing
opcache.jit_hot_loop=1
opcache.jit_hot_func=1
opcache.jit_hot_return=1
opcache.jit_hot_side_exit=1
--FILE--
<?php
class Foo {
public int $test = 1 {
set(int $v) {
if ($v === 3) {
throw new Exception('hook threw');
}
$this->test = $v;
}
}
}

function test() {
$foo = new Foo;
for ($i = 0; $i < 10; $i++) {
$foo->test = $i;
echo $i, PHP_EOL;
}
}

try {
test();
} catch (Exception $e) {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
0
1
2
Exception: hook threw
Loading