-
Notifications
You must be signed in to change notification settings - Fork 8.1k
PFA: Fix strict_types checking when a const arg is inlined #23256
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+98
−0
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| --TEST-- | ||
| Constant argument optimization - strict_types bug | ||
| --CREDITS-- | ||
| Ryan @ Calif.io | ||
| --INI-- | ||
| opcache.enable=1 | ||
| opcache.enable_cli=1 | ||
| opcache.optimization_level=-1 | ||
| opcache.file_update_protection=0 | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| function cand_86014_typed(int $bound, mixed $placeholder): void | ||
| { | ||
| echo 'CALLED:', get_debug_type($bound), ':', $bound, "\n"; | ||
| } | ||
|
|
||
| function cand_86014_make_invalid(): Closure | ||
| { | ||
| return cand_86014_typed('123', ?); | ||
| } | ||
|
|
||
| try { | ||
| $partial = cand_86014_make_invalid(); | ||
| echo "CONSTRUCTED\n"; | ||
| } catch (Throwable $e) { | ||
| echo 'CREATE: ', get_class($e), ': ', $e->getMessage(), "\n"; | ||
| } | ||
|
|
||
| if (isset($partial)) { | ||
| try { | ||
| $partial(null); | ||
| } catch (Throwable $e) { | ||
| echo 'CALL: ', get_class($e), ': ', $e->getMessage(), "\n"; | ||
| } | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECT-- | ||
| CREATE: TypeError: cand_86014_typed(): Argument #1 ($bound) must be of type int, string given |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| --TEST-- | ||
| Constant argument optimization - strict_types | ||
| --INI-- | ||
| opcache.enable=1 | ||
| opcache.enable_cli=1 | ||
| opcache.optimization_level=-1 | ||
| opcache.file_update_protection=0 | ||
| --FILE-- | ||
| <?php | ||
| declare(strict_types=1); | ||
|
|
||
| function f(int $a, $b) { return $a; } | ||
|
|
||
| // Check that optimizations are enabled | ||
| $f = f(3, ?); | ||
| $usedVars = new ReflectionFunction($f)->getClosureUsedVariables(); | ||
| if ($usedVars !== []) { | ||
| echo "const arg optimization was not applied\n"; | ||
| var_dump($usedVars); | ||
| exit; | ||
| } | ||
|
|
||
| var_dump($f(0)); | ||
|
|
||
| // Actual test. Not catching this as it disables optimizations | ||
| f("3", ?)(0); | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| int(3) | ||
|
|
||
| Fatal error: Uncaught TypeError: f(): Argument #1 ($a) must be of type int, string given in %a |
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this being thrown "at compile time"? As I imagine this could be unexpected.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not exactly at compile time. This code executes when a PFA expression is evaluated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, then I can't see how this would differ in behaviour :)