SILCombine: fix keypath optimization with optional chaining and classes #37166
Conversation
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
|
@swift-ci test |
|
Build failed |
|
@swift-ci test linux |
atrick
approved these changes
Apr 30, 2021
| @@ -230,7 +230,7 @@ class GettablePropertyProjector : public ComponentProjector { | |||
| auto addr = builder.createAllocStack(loc, type); | |||
|
|
|||
| assertHasNoContext(); | |||
| assert(getter->getArguments().size() == 2); | |||
| assert(!getter->isDefinition() || getter->getArguments().size() == 2); | |||
There was a problem hiding this comment.
Why is the assertion loosened? Instead of getter->getConventions().getNumSILArguments()
| sil @kpsetter : $@convention(thin) (@in_guaranteed String, @in_guaranteed Kp2) -> () | ||
| sil @swift_getAtKeyPath : $@convention(thin) <τ_0_0, τ_0_1> (@in_guaranteed τ_0_0, @guaranteed KeyPath<τ_0_0, τ_0_1>) -> @out τ_0_1 | ||
|
|
||
| // CHECK-LABEL: sil @test_optional_chaining_keypath |
There was a problem hiding this comment.
I would never guess what that test is supposed to do. You can just paste the relevant source lines from the bug and explain how SILCombine lowers this optional keypath.
There was a problem hiding this comment.
I added a comment
For optional chaining a swift_enum is created. If the sub-projection is ending a begin_access in the some-branch, it also needs to be ended in the none-branch. Fixes a compiler crash and/or a miscompile. https://bugs.swift.org/browse/SR-14534 rdar://77224220
eeckstein
force-pushed
the
fix-keypath-optimization
branch
from
0335efe to
bd5d427
Compare
|
@swift-ci smoke test |
|
@swift-ci smoke test macOS |
1 similar comment
|
@swift-ci smoke test macOS |
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.
For optional chaining a swift_enum is created.
If the sub-projection is ending a begin_access in the some-branch, it also needs to be ended in the none-branch.
Fixes a compiler crash and/or a miscompile.
https://bugs.swift.org/browse/SR-14534
rdar://77224220