Fix undefined function error message

This got fixed on 7.3, but the implementation is slightly different
on master and the new test was failing.

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 4a23e7257458945f1db59b753b2fb369d53f780d..f78b961c721510ba8035c9f115641d3d880ebdcc 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -784,16 +784,10 @@ ZEND_VM_COLD_HELPER(zend_undefined_function_helper, ANY, ANY)
 {
        USE_OPLINE
        zval *function_name;
-       char *name;
 
        SAVE_OPLINE();
        function_name = RT_CONSTANT(opline, opline->op2);
-       if (opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME) {
-               name = Z_STRVAL_P(function_name + 2);
-       } else {
-               name = Z_STRVAL_P(function_name);
-       }
-       zend_throw_error(NULL, "Call to undefined function %s()", name);
+       zend_throw_error(NULL, "Call to undefined function %s()", Z_STRVAL_P(function_name));
        HANDLE_EXCEPTION();
 }
 

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 267f223cf68f91f43c89965ac1d1f3825efe97cb..790e01b8f3ab3200afab5ffde412e39465b48e4e 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -474,16 +474,10 @@ static zend_never_inline ZEND_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_un
 {
        USE_OPLINE
        zval *function_name;
-       char *name;
 
        SAVE_OPLINE();
        function_name = RT_CONSTANT(opline, opline->op2);
-       if (opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME) {
-               name = Z_STRVAL_P(function_name + 2);
-       } else {
-               name = Z_STRVAL_P(function_name);
-       }
-       zend_throw_error(NULL, "Call to undefined function %s()", name);
+       zend_throw_error(NULL, "Call to undefined function %s()", Z_STRVAL_P(function_name));
        HANDLE_EXCEPTION();
 }