Skip to content

Tracing JIT: keep the SEND_VAL type guard after assigning to a reference #24651

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
waroad wants to merge 1 commit into from
Closed

Tracing JIT: keep the SEND_VAL type guard after assigning to a reference #24651

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
16 changes: 3 additions & 13 deletions ext/opcache/jit/zend_jit_trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5131,19 +5131,6 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
&& ssa->vars[ssa_op->op1_def].alias == NO_ALIAS) {
ssa->var_info[ssa_op->op1_def].guarded_reference = 1;
}
if (opline->result_type == IS_UNUSED) {
res_addr = 0;
} else {
res_addr = RES_REG_ADDR();
if (Z_MODE(res_addr) != IS_REG
&& zend_jit_trace_next_is_send_result(opline, p, frame)) {
send_result = 1;
res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_RX, (opline+1)->result.var);
if (!zend_jit_reuse_ip(&ctx)) {
goto jit_failure;
}
}
}
op1_def_addr = op1_addr;
op1_def_info &= ~MAY_BE_REF;
} else if (op1_info & MAY_BE_REF) {
Expand All @@ -5161,6 +5148,9 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
res_addr = RES_REG_ADDR();
res_info = RES_INFO();
if (Z_MODE(res_addr) != IS_REG
/* assignment to typed reference may cause conversion,
* so SEND_VAL has to check the type of the result */
&& !ref_addr
&& zend_jit_trace_next_is_send_result(opline, p, frame)) {
send_result = 1;
res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_RX, (opline+1)->result.var);
Expand Down
38 changes: 38 additions & 0 deletions ext/opcache/tests/jit/gh24436.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
--TEST--
GH-24436 (Tracing JIT: wrong value of assignment to typed reference passed as argument)
--EXTENSIONS--
opcache
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.jit=tracing
--FILE--
<?php
class Box {
public $v = 1;
public float $f = 1;
public string $s = "";
}

function sink($x) {
return $x;
}

function work(&$x, $y) {
return sink($x = $y + 2);
}

$o = new Box;
foreach (['v', 'v', 'v', 'f', 's'] as $p) {
var_dump(work($o->$p, 3));
}
var_dump($o->f, $o->s);
?>
--EXPECT--
int(5)
int(5)
int(5)
float(5)
string(1) "5"
float(5)
string(1) "5"
Loading