mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source
This commit is contained in:
Bob Weinand 2023-03-13 12:39:40 +01:00
commit a00e4a3649
5 changed files with 74 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/opcache/jit/zend_jit_arm64.dasc
View File

@ -9586,13 +9586,17 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
zend_jit_reset_last_valid_opline();
| // fbc->internal_function.handler(call, ret);
| // (zend_execute_internal ? zend_execute_internal : fbc->internal_function.handler)(call, ret);
| mov FCARG1x, RX
if (func) {
| EXT_CALL func->internal_function.handler, REG0
if (zend_execute_internal) {
| EXT_CALL zend_execute_internal, REG0
} else {
| ldr TMP1, [REG0, #offsetof(zend_internal_function, handler)]
| blr TMP1
if (func) {
| EXT_CALL func->internal_function.handler, REG0
} else {
| ldr TMP1, [REG0, #offsetof(zend_internal_function, handler)]
| blr TMP1
}
}
if (ZEND_OBSERVER_ENABLED) {

21
ext/opcache/jit/zend_jit_x86.dasc
View File

@ -10294,12 +10294,23 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
zend_jit_reset_last_valid_opline();
| // fbc->internal_function.handler(call, ret);
| mov FCARG1a, RX
if (func) {
| EXT_CALL func->internal_function.handler, r0
| // (zend_execute_internal ? zend_execute_internal : fbc->internal_function.handler)(call, ret);
if (zend_execute_internal) {
|.if X64
| // CARG2 and FCARG2a are identical
| mov CARG1, RX
|.else
| mov aword A2, FCARG2a
| mov aword A1, RX
|.endif
| EXT_CALL zend_execute_internal, r0
} else {
| call aword [r0 + offsetof(zend_internal_function, handler)]
| mov FCARG1a, RX
if (func) {
| EXT_CALL func->internal_function.handler, r0
} else {
| call aword [r0 + offsetof(zend_internal_function, handler)]
}
}
if (ZEND_OBSERVER_ENABLED) {

27
ext/zend_test/observer.c
View File

@ -268,6 +268,27 @@ void declared_class_observer(zend_class_entry *ce, zend_string *name) {
}
}
static void (*zend_test_prev_execute_internal)(zend_execute_data *execute_data, zval *return_value);
static void zend_test_execute_internal(zend_execute_data *execute_data, zval *return_value) {
zend_function *fbc = execute_data->func;
if (fbc->common.function_name) {
if (fbc->common.scope) {
php_printf("%*s<!-- internal enter %s::%s() -->\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
} else {
php_printf("%*s<!-- internal enter %s() -->\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->common.function_name));
}
} else {
php_printf("%*s<!-- internal enter '%s' -->\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->op_array.filename));
}
if (zend_test_prev_execute_internal) {
zend_test_prev_execute_internal(execute_data, return_value);
} else {
fbc->internal_function.handler(execute_data, return_value);
}
}
static ZEND_INI_MH(zend_test_observer_OnUpdateCommaList)
{
zend_array **p = (zend_array **) ZEND_INI_GET_ADDR();
@ -323,6 +344,7 @@ PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("zend_test.observer.fiber_init", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_fiber_init, zend_zend_test_globals, zend_test_globals)
STD_PHP_INI_BOOLEAN("zend_test.observer.fiber_switch", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_fiber_switch, zend_zend_test_globals, zend_test_globals)
STD_PHP_INI_BOOLEAN("zend_test.observer.fiber_destroy", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_fiber_destroy, zend_zend_test_globals, zend_test_globals)
STD_PHP_INI_BOOLEAN("zend_test.observer.execute_internal", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_execute_internal, zend_zend_test_globals, zend_test_globals)
PHP_INI_END()
void zend_test_observer_init(INIT_FUNC_ARGS)
@ -351,6 +373,11 @@ void zend_test_observer_init(INIT_FUNC_ARGS)
zend_observer_function_declared_register(declared_function_observer);
zend_observer_class_linked_register(declared_class_observer);
}
if (ZT_G(observer_execute_internal)) {
zend_test_prev_execute_internal = zend_execute_internal;
zend_execute_internal = zend_test_execute_internal;
}
}
void zend_test_observer_shutdown(SHUTDOWN_FUNC_ARGS)

1
ext/zend_test/php_test.h
View File

@ -49,6 +49,7 @@ ZEND_BEGIN_MODULE_GLOBALS(zend_test)
int observer_fiber_init;
int observer_fiber_switch;
int observer_fiber_destroy;
int observer_execute_internal;
HashTable global_weakmap;
int replace_zend_execute_ex;
int register_passes;

21
ext/zend_test/tests/execute_internal.phpt Normal file
View File

@ -0,0 +1,21 @@
--TEST--
Test zend_execute_internal being called
--EXTENSIONS--
zend_test
--INI--
zend_test.observer.execute_internal=1
--FILE--
<?php
function f($a) {
var_dump(array_sum($a));
}
f(time() > 0 ? [1, 2, 3] : []);
?>
--EXPECT--
<!-- internal enter time() -->
<!-- internal enter array_sum() -->
<!-- internal enter var_dump() -->
int(6)