Fix findAccessedStorage to handle cyclic phis. #21665
Merged
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. |
|
@swift-ci test source compatibility. |
|
@shajrawi I'm still writing a unit test, but the code can be reviewed in the meantime. |
|
@shajrawi I included the unit test. |
|
@swift-ci smoke test. |
shajrawi
approved these changes
Jan 7, 2019
lib/SIL/MemAccessUtils.cpp
Outdated
| namespace { | ||
| // The result of an accessed storage query. A complete result produces an | ||
| // AccessedStorage object, which may or may not be valid. An incomplete result | ||
| // produces an SILValue representing the source address for use with deeper |
lib/SIL/MemAccessUtils.cpp
Outdated
| // The result of an accessed storage query. A complete result produces an | ||
| // AccessedStorage object, which may or may not be valid. An incomplete result | ||
| // produces an SILValue representing the source address for use with deeper | ||
| // queries. The source address is not necessarilly a SIL address type because |
| return AccessedStorageResult::incomplete(operAddr); | ||
| } | ||
| return AccessedStorage(); | ||
|
|
There was a problem hiding this comment.
The following huge switch case works / I don't clearly see a better option, but I can see potential future bugs if someone adds new (relevant) SIL instructions / does not update it.
Fixes infinite recursion in findAccessedStorge. This routine was not designed to be recursive, but recursion was recently added as a hack for address-type phis. Naturally, phis can be cyclic, so this was not a correct workaround. This is only a problem with enforce-exclusivity=checked, with which findAccessedStorge is invoked after arbitrary optimization passes that introduce address-type phis. Ultimately, address phis will be disallowed in SIL, but some optimizer passes must be fixed first. Fixes <rdar://problem/47059671> swiftlang-1001.0.31.11 root: swiftc crashes
|
@swift-ci smoke test. |
|
@swift-ci smoke test OS X platform. |
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.
Fixes infinite recursion in findAccessedStorge. This routine was not
designed to be recursive, but recursion was recently added as a hack
for address-type phis. Naturally, phis can be cyclic, so this was not
a correct workaround.
This is only a problem with enforce-exclusivity=checked, with which
findAccessedStorge is invoked after arbitrary optimization passes that
introduce address-type phis. Ultimately, address phis will be
disallowed in SIL, but some optimizer passes must be fixed first.
Fixes rdar://problem/47059671 swiftlang-1001.0.31.11 root: swiftc crashes