-
Notifications
You must be signed in to change notification settings - Fork 8.1k
Elide the type check on typed property writes when the value type is statically proven #22347
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
Open
azjezz
wants to merge
3
commits into
php:master
Choose a base branch
from
carthage-software:elide-typed-prop-write-check
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
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
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
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
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
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
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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,45 @@ | ||
| --TEST-- | ||
| Elide the type check on a typed property write when the value provably satisfies the property type | ||
| --INI-- | ||
| opcache.enable=1 | ||
| opcache.enable_cli=1 | ||
| opcache.optimization_level=-1 | ||
| opcache.opt_debug_level=0x20000 | ||
| --EXTENSIONS-- | ||
| opcache | ||
| --FILE-- | ||
| <?php | ||
| class C { | ||
| public int $i = 0; | ||
| public float $f = 0.0; | ||
| public function exact(int $i): void { $this->i = $i; } | ||
| public function coerce(int $x): void { $this->f = $x; } | ||
| } | ||
| echo "done\n"; | ||
| ?> | ||
| --EXPECTF-- | ||
| $_main: | ||
| ; (lines=2, args=0, vars=0, tmps=0) | ||
| ; (after optimizer) | ||
| ; %s:1-10 | ||
| 0000 ECHO string("done\n") | ||
| 0001 RETURN int(1) | ||
|
|
||
| C::exact: | ||
| ; (lines=4, args=1, vars=1, tmps=0) | ||
| ; (after optimizer) | ||
| ; %s:5-5 | ||
| 0000 CV0($i) = RECV 1 | ||
| 0001 ASSIGN_OBJ THIS string("i") (skip type check) | ||
| 0002 OP_DATA CV0($i) | ||
| 0003 RETURN null | ||
|
|
||
| C::coerce: | ||
| ; (lines=4, args=1, vars=1, tmps=0) | ||
| ; (after optimizer) | ||
| ; %s:6-6 | ||
| 0000 CV0($x) = RECV 1 | ||
| 0001 ASSIGN_OBJ THIS string("f") | ||
| 0002 OP_DATA CV0($x) | ||
| 0003 RETURN null | ||
| done |
48 changes: 48 additions & 0 deletions
48
ext/opcache/tests/opt/elide_typed_prop_write_check_behavior.phpt
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,48 @@ | ||
| --TEST-- | ||
| Typed property write check elision preserves runtime behavior (exact match, coercion, both modes) | ||
| --INI-- | ||
| opcache.enable=1 | ||
| opcache.enable_cli=1 | ||
| opcache.optimization_level=-1 | ||
| --EXTENSIONS-- | ||
| opcache | ||
| --FILE-- | ||
| <?php | ||
| class C { | ||
| public int $i = 0; | ||
| public float $f = 0.0; | ||
| public string $s = ''; | ||
| public bool $b = false; | ||
| public ?int $ni = 0; | ||
| public function __construct(int $i, string $s) { $this->i = $i; $this->s = $s; } | ||
| public function setBool(bool $b): void { $this->b = $b; } | ||
| public function setNullable(?int $ni): void { $this->ni = $ni; } | ||
| public function coerceToFloat(int $x): void { $this->f = $x; } | ||
| } | ||
|
|
||
| $c = new C(5, "hello"); | ||
| var_dump($c->i, $c->s); | ||
| $c->setBool(true); | ||
| var_dump($c->b); | ||
| $c->setNullable(null); | ||
| var_dump($c->ni); | ||
| $c->setNullable(7); | ||
| var_dump($c->ni); | ||
| $c->coerceToFloat(3); | ||
| var_dump($c->f); | ||
|
|
||
| class Promoted { | ||
| public function __construct(public int $x, public readonly string $y) {} | ||
| } | ||
| $p = new Promoted(1, "ok"); | ||
| var_dump($p->x, $p->y); | ||
| ?> | ||
| --EXPECT-- | ||
| int(5) | ||
| string(5) "hello" | ||
| bool(true) | ||
| NULL | ||
| int(7) | ||
| float(3) | ||
| int(1) | ||
| string(2) "ok" |
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.
I couldn't verify this locally. and honestly not sure about it..