php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source 
* PHP-8.2:
  Don't check "fake" closures (fix assertion)
This commit is contained in:
Dmitry Stogov
2022-11-07 12:21:03 +03:00
parent 5e23cf9381 05b63b1593
commit 08f9b50a9c
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/tests/first_class_callable_016.phpt
+16
View File
@@ -0,0 +1,16 @@
--TEST--
First class callables and &__call()
--FILE--
<?php
class Foo {
public function &__call($method, $args) {
return $method;
}
}
$foo = new Foo;
$bar = $foo->bar(...);
echo $bar(),"\n";
?>
--EXPECT--
bar
Zend/zend_vm_def.h
+1 -1
View File
@@ -4165,7 +4165,7 @@ ZEND_VM_HOT_HANDLER(60, ZEND_DO_FCALL, ANY, ANY, SPEC(RETVAL,OBSERVER))
}
#if ZEND_DEBUG
if (!EG(exception) && call->func) {
if (!EG(exception) && call->func && !(call->func->common.fn_flags & ZEND_ACC_FAKE_CLOSURE)) {
if (should_throw) {
zend_internal_call_arginfo_violation(call->func);
}
Zend/zend_vm_execute.h
Generated
+3 -3
View File
@@ -1845,7 +1845,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_RETV
}
#if ZEND_DEBUG
if (!EG(exception) && call->func) {
if (!EG(exception) && call->func && !(call->func->common.fn_flags & ZEND_ACC_FAKE_CLOSURE)) {
if (should_throw) {
zend_internal_call_arginfo_violation(call->func);
}
@@ -1954,7 +1954,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_RETV
}
#if ZEND_DEBUG
if (!EG(exception) && call->func) {
if (!EG(exception) && call->func && !(call->func->common.fn_flags & ZEND_ACC_FAKE_CLOSURE)) {
if (should_throw) {
zend_internal_call_arginfo_violation(call->func);
}
@@ -2064,7 +2064,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_OBS
}
#if ZEND_DEBUG
if (!EG(exception) && call->func) {
if (!EG(exception) && call->func && !(call->func->common.fn_flags & ZEND_ACC_FAKE_CLOSURE)) {
if (should_throw) {
zend_internal_call_arginfo_violation(call->func);
}