Skip to content

Commit 3737e0a

Browse files
arnaud-lbarnaud-lb
committed
Merge branch 'PHP-8.4'
* PHP-8.4: JIT: Check exception on exit
2 parents f1b7335 + 978c01c commit 3737e0a

File tree

7 files changed

+168
-17
lines changed

7 files changed

+168
-17
lines changed

‎ext/opcache/jit/zend_jit_internal.h‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -321,17 +321,18 @@ typedef enum _zend_jit_trace_stop {
321321

322322
#define ZEND_JIT_TRACE_SUPPORTED 0
323323

324-
#define ZEND_JIT_EXIT_JITED (1<<0)
325-
#define ZEND_JIT_EXIT_BLACKLISTED (1<<1)
326-
#define ZEND_JIT_EXIT_TO_VM (1<<2) /* exit to VM without attempt to create a side trace */
327-
#define ZEND_JIT_EXIT_RESTORE_CALL (1<<3) /* deoptimizer should restore EX(call) chain */
328-
#define ZEND_JIT_EXIT_POLYMORPHISM (1<<4) /* exit because of polymorphic call */
329-
#define ZEND_JIT_EXIT_FREE_OP1 (1<<5)
330-
#define ZEND_JIT_EXIT_FREE_OP2 (1<<6)
331-
#define ZEND_JIT_EXIT_PACKED_GUARD (1<<7)
332-
#define ZEND_JIT_EXIT_CLOSURE_CALL (1<<8) /* exit because of polymorphic INIT_DYNAMIC_CALL call */
333-
#define ZEND_JIT_EXIT_METHOD_CALL (1<<9) /* exit because of polymorphic INIT_METHOD_CALL call */
334-
#define ZEND_JIT_EXIT_INVALIDATE (1<<10) /* invalidate current trace */
324+
#define ZEND_JIT_EXIT_JITED (1<<0)
325+
#define ZEND_JIT_EXIT_BLACKLISTED (1<<1)
326+
#define ZEND_JIT_EXIT_TO_VM (1<<2) /* exit to VM without attempt to create a side trace */
327+
#define ZEND_JIT_EXIT_RESTORE_CALL (1<<3) /* deoptimizer should restore EX(call) chain */
328+
#define ZEND_JIT_EXIT_POLYMORPHISM (1<<4) /* exit because of polymorphic call */
329+
#define ZEND_JIT_EXIT_FREE_OP1 (1<<5)
330+
#define ZEND_JIT_EXIT_FREE_OP2 (1<<6)
331+
#define ZEND_JIT_EXIT_PACKED_GUARD (1<<7)
332+
#define ZEND_JIT_EXIT_CLOSURE_CALL (1<<8) /* exit because of polymorphic INIT_DYNAMIC_CALL call */
333+
#define ZEND_JIT_EXIT_METHOD_CALL (1<<9) /* exit because of polymorphic INIT_METHOD_CALL call */
334+
#define ZEND_JIT_EXIT_INVALIDATE (1<<10) /* invalidate current trace */
335+
#define ZEND_JIT_EXIT_CHECK_EXCEPTION (1<<11)
335336

336337
#define ZEND_JIT_EXIT_FIXED (1U<<31) /* the exit_info can't be changed by zend_jit_snapshot_handler() */
337338

‎ext/opcache/jit/zend_jit_ir.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14646,12 +14646,12 @@ static int zend_jit_fetch_obj(zend_jit_ctx *jit,
1464614646
ZEND_ASSERT(end_inputs == IR_UNUSED);
1464714647
if ((res_info & MAY_BE_GUARD) && JIT_G(current_frame)) {
1464814648
uint8_t type = concrete_type(res_info);
14649-
uint32_t flags = 0;
14649+
uint32_t flags = ZEND_JIT_EXIT_CHECK_EXCEPTION;
1465014650

1465114651
if ((opline->op1_type & (IS_VAR|IS_TMP_VAR))
1465214652
&& !delayed_fetch_this
1465314653
&& !op1_avoid_refcounting) {
14654-
flags = ZEND_JIT_EXIT_FREE_OP1;
14654+
flags |= ZEND_JIT_EXIT_FREE_OP1;
1465514655
}
1465614656

1465714657
if ((opline->result_type & (IS_VAR|IS_TMP_VAR))

‎ext/opcache/jit/zend_jit_trace.c‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3503,7 +3503,7 @@ static int zend_jit_trace_exit_needs_deoptimization(uint32_t trace_num, uint32_t
35033503
uint32_t stack_size;
35043504
zend_jit_trace_stack *stack;
35053505

3506-
if (opline || (flags & (ZEND_JIT_EXIT_RESTORE_CALL|ZEND_JIT_EXIT_FREE_OP1|ZEND_JIT_EXIT_FREE_OP2))) {
3506+
if (opline || (flags & (ZEND_JIT_EXIT_RESTORE_CALL|ZEND_JIT_EXIT_FREE_OP1|ZEND_JIT_EXIT_FREE_OP2|ZEND_JIT_EXIT_CHECK_EXCEPTION))) {
35073507
return 1;
35083508
}
35093509

@@ -3663,7 +3663,7 @@ static int zend_jit_trace_deoptimization(
36633663
}
36643664
}
36653665

3666-
if (flags & (ZEND_JIT_EXIT_FREE_OP1|ZEND_JIT_EXIT_FREE_OP2)) {
3666+
if (flags & (ZEND_JIT_EXIT_FREE_OP1|ZEND_JIT_EXIT_FREE_OP2|ZEND_JIT_EXIT_CHECK_EXCEPTION)) {
36673667
zend_jit_check_exception(jit);
36683668
}
36693669

@@ -8013,6 +8013,9 @@ static void zend_jit_dump_exit_info(zend_jit_trace_info *t)
80138013
if (t->exit_info[i].flags & ZEND_JIT_EXIT_FREE_OP2) {
80148014
fprintf(stderr, "/FREE_OP2");
80158015
}
8016+
if (t->exit_info[i].flags & ZEND_JIT_EXIT_CHECK_EXCEPTION) {
8017+
fprintf(stderr, "/CHK_EXC");
8018+
}
80168019
for (j = 0; j < stack_size; j++) {
80178020
uint8_t type = STACK_TYPE(stack, j);
80188021
if (type != IS_UNKNOWN) {
@@ -8724,9 +8727,14 @@ int ZEND_FASTCALL zend_jit_trace_exit(uint32_t exit_num, zend_jit_registers_buf
87248727
EX(opline) = opline-1;
87258728
zval_ptr_dtor_nogc(EX_VAR((opline-1)->op1.var));
87268729
}
8727-
if (t->exit_info[exit_num].flags & (ZEND_JIT_EXIT_FREE_OP1|ZEND_JIT_EXIT_FREE_OP2)) {
8730+
if (t->exit_info[exit_num].flags & (ZEND_JIT_EXIT_FREE_OP1|ZEND_JIT_EXIT_FREE_OP2|ZEND_JIT_EXIT_CHECK_EXCEPTION)) {
87288731
if (EG(exception)) {
8729-
return 1;
8732+
/* EX(opline) was overridden in zend_jit_trace_exit_stub(),
8733+
* and may be wrong when IP is reused. */
8734+
if (GCC_GLOBAL_REGS) {
8735+
EX(opline) = EG(exception_op);
8736+
}
8737+
return 0;
87308738
}
87318739
}
87328740
if (t->exit_info[exit_num].flags & ZEND_JIT_EXIT_METHOD_CALL) {

‎ext/opcache/tests/jit/gh18262-001.phpt‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
--TEST--
2+
GH-18262 001 (Assertion failure Zend/zend_vm_execute.h JIT)
3+
--CREDITS--
4+
YuanchengJiang
5+
--FILE--
6+
<?php
7+
#[AllowDynamicProperties]
8+
class B {
9+
public int $fusion;
10+
}
11+
class C extends B {
12+
}
13+
class D extends C {
14+
public function __destruct() {
15+
}
16+
}
17+
$tests = [
18+
[C::class, new C()],
19+
[C::class, new B()],
20+
[D::class, new B()],
21+
];
22+
foreach ($tests as [$class, $instance]) {
23+
$obj = (new ReflectionClass($class))->newLazyProxy(function ($obj) use ($instance) {
24+
$instance->b = 1;
25+
return $instance;
26+
});
27+
var_dump($obj->b);
28+
}
29+
?>
30+
--EXPECTF--
31+
int(1)
32+
int(1)
33+
34+
Fatal error: Uncaught TypeError: %s in %s:%d
35+
Stack trace:
36+
#0 {main}
37+
thrown in %s on line %d

‎ext/opcache/tests/jit/gh18262-002.phpt‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
--TEST--
2+
GH-18262 002 (Assertion failure Zend/zend_vm_execute.h JIT)
3+
--FILE--
4+
<?php
5+
#[AllowDynamicProperties]
6+
class B {
7+
public function __construct($init) {
8+
if ($init) {
9+
$this->b = $init;
10+
}
11+
}
12+
}
13+
14+
$tests = [
15+
new B(1),
16+
new B(0),
17+
];
18+
19+
set_error_handler(function ($_, $errstr) {
20+
throw new \Exception($errstr);
21+
});
22+
23+
foreach ($tests as $obj) {
24+
var_dump($obj->b);
25+
}
26+
?>
27+
--EXPECTF--
28+
int(1)
29+
30+
Fatal error: Uncaught Exception: Undefined property: B::$b in %s:%d
31+
Stack trace:
32+
#0 %s(%d): {closure:%s:%d}(2, 'Undefined prope...', '%s', %d)
33+
#1 {main}
34+
thrown in %s on line %d

‎ext/opcache/tests/jit/gh18262-003.phpt‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
--TEST--
2+
GH-18262 003 (Assertion failure Zend/zend_vm_execute.h JIT)
3+
--FILE--
4+
<?php
5+
#[AllowDynamicProperties]
6+
class B {
7+
public function __construct($init) {
8+
if ($init) {
9+
$this->b = $init;
10+
}
11+
}
12+
}
13+
14+
$tests = [
15+
new B(1),
16+
new B('str'), // slow deoptimization, create linked side trace
17+
new B(0), // jump to side trace with fast deoptimization
18+
];
19+
20+
set_error_handler(function ($_, $errstr) {
21+
throw new \Exception($errstr);
22+
});
23+
24+
foreach ($tests as $obj) {
25+
try {
26+
var_dump($obj->b);
27+
} catch (Exception $e) {
28+
printf("%s: %s\n", $e::class, $e->getMessage());
29+
}
30+
}
31+
?>
32+
--EXPECT--
33+
int(1)
34+
string(3) "str"
35+
Exception: Undefined property: B::$b

‎ext/opcache/tests/jit/gh18262-004.phpt‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
--TEST--
2+
GH-18262 004 (Assertion failure Zend/zend_vm_execute.h JIT)
3+
--FILE--
4+
<?php
5+
class B {
6+
public function __construct(
7+
public $throw,
8+
) { }
9+
public function __get($name) {
10+
return $this->throw === '1' ? 'str' : 1;
11+
}
12+
public function __destruct() {
13+
if ($this->throw === '1') {
14+
throw new Exception(__METHOD__);
15+
}
16+
}
17+
}
18+
19+
$tests = [
20+
'0',
21+
'1',
22+
];
23+
24+
foreach ($tests as $test) {
25+
// Second iteration exits, and free op1 throws
26+
var_dump((new B($test))->b);
27+
}
28+
?>
29+
--EXPECTF--
30+
int(1)
31+
32+
Fatal error: Uncaught Exception: B::__destruct in %s:%d
33+
Stack trace:
34+
#0 %s(%d): B->__destruct()
35+
#1 {main}
36+
thrown in %s on line %d

0 commit comments

Comments
 (0)