archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  Fix lineno in function redeclaration error
This commit is contained in:
Ilija Tovilo 2024-10-22 15:06:06 +02:00
commit cd8ee4dad1
No known key found for this signature in database
GPG key ID: 5050C66BFCD1015A
5 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -21,6 +21,8 @@ PHP NEWS
zend_lazy_object_clone). (Arnaud) zend_lazy_object_clone). (Arnaud)
. Fixed bug GH-16515 (Incorrect propagation of ZEND_ACC_RETURN_REFERENCE for . Fixed bug GH-16515 (Incorrect propagation of ZEND_ACC_RETURN_REFERENCE for
call trampoline). (ilutov) call trampoline). (ilutov)
. Fixed bug GH-16509 (Incorrect line number in function redeclaration error).
(ilutov)
- Curl: - Curl:
. Fixed bug GH-16302 (CurlMultiHandle holds a reference to CurlHandle if . Fixed bug GH-16302 (CurlMultiHandle holds a reference to CurlHandle if

7
Zend/tests/gh16509.inc Normal file
View file

@ -0,0 +1,7 @@
<?php
function test() {
echo 'foo';
}

11
Zend/tests/gh16509.phpt Normal file
View file

@ -0,0 +1,11 @@
--TEST--
GH-16509: Incorrect lineno reported for function redeclaration
--FILE--
<?php
include __DIR__ . '/gh16509.inc';
include __DIR__ . '/gh16509.inc';
?>
--EXPECTF--
Fatal error: Cannot redeclare function test() (previously declared in %sgh16509.inc:3) in %sgh16509.inc on line 3

3
Zend/zend_compile.c
View file

@ -1278,7 +1278,7 @@ static zend_never_inline ZEND_COLD ZEND_NORETURN void do_bind_function_error(zen
zend_error_noreturn(error_level, "Cannot redeclare function %s() (previously declared in %s:%d)", zend_error_noreturn(error_level, "Cannot redeclare function %s() (previously declared in %s:%d)",
op_array ? ZSTR_VAL(op_array->function_name) : ZSTR_VAL(old_function->common.function_name), op_array ? ZSTR_VAL(op_array->function_name) : ZSTR_VAL(old_function->common.function_name),
ZSTR_VAL(old_function->op_array.filename), ZSTR_VAL(old_function->op_array.filename),
old_function->op_array.opcodes[0].lineno); old_function->op_array.line_start);
} else { } else {
zend_error_noreturn(error_level, "Cannot redeclare function %s()", zend_error_noreturn(error_level, "Cannot redeclare function %s()",
op_array ? ZSTR_VAL(op_array->function_name) : ZSTR_VAL(old_function->common.function_name)); op_array ? ZSTR_VAL(op_array->function_name) : ZSTR_VAL(old_function->common.function_name));
@ -8362,6 +8362,7 @@ static zend_op_array *zend_compile_func_decl_ex(
} else if (toplevel) { } else if (toplevel) {
/* Only register the function after a successful compile */ /* Only register the function after a successful compile */
if (UNEXPECTED(zend_hash_add_ptr(CG(function_table), lcname, op_array) == NULL)) { if (UNEXPECTED(zend_hash_add_ptr(CG(function_table), lcname, op_array) == NULL)) {
CG(zend_lineno) = decl->start_lineno;
do_bind_function_error(lcname, op_array, true); do_bind_function_error(lcname, op_array, true);
} }
} }

4
ext/opcache/zend_accelerator_util_funcs.c
View file

@ -175,13 +175,13 @@ failure:
function2 = Z_PTR_P(t); function2 = Z_PTR_P(t);
CG(in_compilation) = 1; CG(in_compilation) = 1;
zend_set_compiled_filename(function1->op_array.filename); zend_set_compiled_filename(function1->op_array.filename);
CG(zend_lineno) = function1->op_array.opcodes[0].lineno; CG(zend_lineno) = function1->op_array.line_start;
if (function2->type == ZEND_USER_FUNCTION if (function2->type == ZEND_USER_FUNCTION
&& function2->op_array.last > 0) { && function2->op_array.last > 0) {
zend_error_noreturn(E_ERROR, "Cannot redeclare function %s() (previously declared in %s:%d)", zend_error_noreturn(E_ERROR, "Cannot redeclare function %s() (previously declared in %s:%d)",
ZSTR_VAL(function1->common.function_name), ZSTR_VAL(function1->common.function_name),
ZSTR_VAL(function2->op_array.filename), ZSTR_VAL(function2->op_array.filename),
(int)function2->op_array.opcodes[0].lineno); (int)function2->op_array.line_start);
} else { } else {
zend_error_noreturn(E_ERROR, "Cannot redeclare function %s()", ZSTR_VAL(function1->common.function_name)); zend_error_noreturn(E_ERROR, "Cannot redeclare function %s()", ZSTR_VAL(function1->common.function_name));
} }