From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 2 Jan 2019 07:32:29 +0000 (+0800)
Subject: Merge branch 'PHP-7.3'
X-Git-Tag: php-7.4.0alpha1~1315
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a0c325b89b13b459fc8c4cc1385cf80ed826e28;p=php

Merge branch 'PHP-7.3'

* PHP-7.3:
  Fixed bug #77376 ("undefined function" message no longer includes namespace)
---

1a0c325b89b13b459fc8c4cc1385cf80ed826e28
diff --cc Zend/zend_vm_def.h
index b82982bd33,a49baa5a9b..4a23e72574
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -3431,13 -3443,12 +3431,12 @@@ ZEND_VM_HOT_HANDLER(69, ZEND_INIT_NS_FC
  
  	fbc = CACHED_PTR(opline->result.num);
  	if (UNEXPECTED(fbc == NULL)) {
- 		func_name = RT_CONSTANT(opline, opline->op2) + 1;
- 		func = zend_hash_find_ex(EG(function_table), Z_STR_P(func_name), 1);
+ 		func_name = (zval *)RT_CONSTANT(opline, opline->op2);
+ 		func = zend_hash_find_ex(EG(function_table), Z_STR_P(func_name + 1), 1);
  		if (func == NULL) {
- 			func_name++;
- 			func = zend_hash_find_ex(EG(function_table), Z_STR_P(func_name), 1);
+ 			func = zend_hash_find_ex(EG(function_table), Z_STR_P(func_name + 2), 1);
  			if (UNEXPECTED(func == NULL)) {
 -				ZEND_VM_DISPATCH_TO_HELPER(zend_undefined_function_helper, function_name, func_name);
 +				ZEND_VM_DISPATCH_TO_HELPER(zend_undefined_function_helper);
  			}
  		}
  		fbc = Z_FUNC_P(func);
diff --cc Zend/zend_vm_execute.h
index 73a47fbc4b,49bc2c0de7..267f223cf6
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -2113,13 -2153,12 +2113,12 @@@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_
  
  	fbc = CACHED_PTR(opline->result.num);
  	if (UNEXPECTED(fbc == NULL)) {
- 		func_name = RT_CONSTANT(opline, opline->op2) + 1;
- 		func = zend_hash_find_ex(EG(function_table), Z_STR_P(func_name), 1);
+ 		func_name = (zval *)RT_CONSTANT(opline, opline->op2);
+ 		func = zend_hash_find_ex(EG(function_table), Z_STR_P(func_name + 1), 1);
  		if (func == NULL) {
- 			func_name++;
- 			func = zend_hash_find_ex(EG(function_table), Z_STR_P(func_name), 1);
+ 			func = zend_hash_find_ex(EG(function_table), Z_STR_P(func_name + 2), 1);
  			if (UNEXPECTED(func == NULL)) {
 -				ZEND_VM_TAIL_CALL(zend_undefined_function_helper_SPEC(func_name ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 +				ZEND_VM_TAIL_CALL(zend_undefined_function_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU));
  			}
  		}
  		fbc = Z_FUNC_P(func);