Improve error messages mentioning parameters instead of arguments #5999
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kocsismate
force-pushed
the
pass-by-arg
branch
2 times, most recently
from
9425533 to
c0422ce
Compare
kocsismate
changed the title
kocsismate
force-pushed
the
pass-by-arg
branch
5 times, most recently
from
0257580 to
86fecd9
Compare
kocsismate
force-pushed
the
pass-by-arg
branch
5 times, most recently
from
f114414 to
25bbdcc
Compare
kocsismate
force-pushed
the
pass-by-arg
branch
3 times, most recently
from
32038d6 to
84557e1
Compare
nikic
reviewed
Sep 7, 2020
nikic
reviewed
Sep 7, 2020
kocsismate
force-pushed
the
pass-by-arg
branch
from
84557e1 to
663d012
Compare
kocsismate
commented
Sep 8, 2020
| return zend_create_member_string(func->common.scope->name, func->common.function_name); | ||
| } | ||
|
|
||
| return func->common.function_name ? zend_string_copy(func->common.function_name) : zend_string_init("main", sizeof("main") - 1, 0); |
There was a problem hiding this comment.
or alternatively, should we could add an assert that function_name is not null?
kocsismate
force-pushed
the
pass-by-arg
branch
from
c544ffb to
1cd5faf
Compare
nikic
reviewed
Sep 8, 2020
Zend/zend_execute_API.c
Outdated
| /* }}} */ | ||
|
|
||
| /* return class name and "::" or "". */ | ||
| ZEND_API const char *get_class_name(const zend_function *func, const char **space) /* {{{ */ |
There was a problem hiding this comment.
I thought that they will come handy in the future, but probably we shouldn't prematurely optimize for the future in this case :) so I've just removed the unneeded functions.
Zend/zend_execute_API.c
Outdated
| } | ||
| /* }}} */ | ||
|
|
||
| ZEND_API const char *get_function_name(const zend_function *func) /* {{{ */ |
Zend/zend_execute_API.c
Outdated
| { | ||
| if (!zend_is_executing()) { | ||
| return zend_string_init("", 0, 0); | ||
| } |
There was a problem hiding this comment.
You can ZEND_ASSERT this, I think.
ext/opcache/jit/zend_jit_helpers.c
Outdated
| ); | ||
|
|
||
| zend_string_release(func_name); | ||
| } |
There was a problem hiding this comment.
Maybe have this in a function in zend_execute.c that can be used both by zend_vm_def and jit?
ext/opcache/jit/zend_jit_x86.dasc
Outdated
| | LOAD_ADDR CARG2, "Cannot pass parameter %d by reference" | ||
| | mov CARG3d, dword OP:r0->op2.num | ||
| | EXT_CALL zend_throw_error, r0 | ||
| | mov CARG1d, dword OP:r0->op2.num |
There was a problem hiding this comment.
Suggested change
| | mov CARG1d, dword OP:r0->op2.num | |
| | mov FCARG1d, dword OP:r0->op2.num |
and drop the if/else.
kocsismate
force-pushed
the
pass-by-arg
branch
4 times, most recently
from
4ae6447 to
910a199
Compare
kocsismate
force-pushed
the
pass-by-arg
branch
from
910a199 to
23f1a00
Compare
nikic
approved these changes
Sep 9, 2020
| @@ -583,6 +583,19 @@ static zend_never_inline ZEND_COLD bool zend_wrong_assign_to_variable_reference( | |||
| return 1; | |||
| } | |||
|
|
|||
| ZEND_API void zend_cannot_pass_by_reference(uint32_t arg_num) | |||
There was a problem hiding this comment.
Suggested change
| ZEND_API void zend_cannot_pass_by_reference(uint32_t arg_num) | |
| ZEND_API ZEND_COLD void zend_cannot_pass_by_reference(uint32_t arg_num) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cannot pass parameter 1 by reference->test(): Argument #1 ($param) cannot be passed by referencestr_pad() expects at least 2 parameters, 1 given->str_pad() expects at least 2 arguments, 1 givenWarning: count(): Parameter must be an array or an object that implements Countable->Warning: count(): Argument #1 ($var) must be of type Countable|array, Generator given