archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Fix GH-16499: [JIT] Undefined to null coercion issues for return
This commit is contained in:
Dmitry Stogov 2024-10-21 14:51:52 +03:00
commit eef3e5ebca
No known key found for this signature in database
3 changed files with 37 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Zend/Optimizer/zend_inference.c
View file

@ -3959,6 +3959,9 @@ static zend_always_inline zend_result _zend_update_type_info(
} else { } else {
zend_arg_info *ret_info = op_array->arg_info - 1; zend_arg_info *ret_info = op_array->arg_info - 1;
tmp = zend_fetch_arg_info_type(script, ret_info, &ce); tmp = zend_fetch_arg_info_type(script, ret_info, &ce);
if ((tmp & MAY_BE_NULL) && opline->op1_type == IS_CV) {
tmp |= MAY_BE_UNDEF;
}
tmp |= (t1 & MAY_BE_INDIRECT); tmp |= (t1 & MAY_BE_INDIRECT);
// TODO: We could model more precisely how illegal types are converted. // TODO: We could model more precisely how illegal types are converted.

6
ext/opcache/jit/zend_jit_helpers.c
View file

@ -1917,6 +1917,12 @@ static bool ZEND_FASTCALL zend_jit_verify_arg_slow(zval *arg, zend_arg_info *arg
static void ZEND_FASTCALL zend_jit_verify_return_slow(zval *arg, const zend_op_array *op_array, zend_arg_info *arg_info, void **cache_slot) static void ZEND_FASTCALL zend_jit_verify_return_slow(zval *arg, const zend_op_array *op_array, zend_arg_info *arg_info, void **cache_slot)
{ {
if (Z_TYPE_P(arg) == IS_NULL) {
ZEND_ASSERT(ZEND_TYPE_IS_SET(arg_info->type));
if (EXPECTED(ZEND_TYPE_CONTAINS_CODE(arg_info->type, IS_NULL))) {
return;
}
}
if (UNEXPECTED(!zend_check_user_type_slow( if (UNEXPECTED(!zend_check_user_type_slow(
&arg_info->type, arg, /* ref */ NULL, cache_slot, /* is_return_type */ true))) { &arg_info->type, arg, /* ref */ NULL, cache_slot, /* is_return_type */ true))) {
zend_verify_return_error((zend_function*)op_array, arg); zend_verify_return_error((zend_function*)op_array, arg);

28
ext/opcache/tests/jit/gh16499.phpt Normal file
View file

@ -0,0 +1,28 @@
--TEST--
GH-16499 (Undefined to null coercion issues for return)
--EXTENSIONS--
opcache
--INI--
opcache.jit_buffer_size=64M
--FILE--
<?php
function test($cond): ?int {
if ($cond) {
$i = 'foo';
}
return $i;
}
var_dump(test(false));
var_dump(test(false));
?>
--EXPECTF--
Warning: Undefined variable $i in %sgh16499.php on line 6
Warning: Undefined variable $i in %sgh16499.php on line 6
NULL
Warning: Undefined variable $i in %sgh16499.php on line 6
Warning: Undefined variable $i in %sgh16499.php on line 6
NULL