[4.2][pred-memopts] Rather than asserting on recursive initialization, jus… #16544
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
…t return false and bail. Until the beginning of the ownership transition, DI and predictable mem opts used the same memory use collector. I split them partially since I need to turn on ownership for predictable mem opts at one time, but also b/c there was a huge amount of special code that would only trigger if it was used by DI or used by predictable mem opts. After I did the copy some of the asserts that were needed for DI remained in the predictable mem opts code. When pred-memopts was only run in the mandatory pipeline keeping these assertions were ok, but pred-memopts was recently added to the perf pipeline meaning that it may see code that breaks these DI invariants (and thus hit this assertion). We should remove this limitation on predictable-memopts but that would require some scheduled time to read the code (more than I have to fix this bug = p). So instead I changed the code to just bail in these cases. rdar://40032102 (cherry picked from commit 269f8e8)
|
@swift-ci smoke test and merge |
|
erm |
|
@swift-ci test and merge |
gottesmm
changed the title
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.
…t return false and bail.
Until the beginning of the ownership transition, DI and predictable mem opts
used the same memory use collector. I split them partially since I need to turn
on ownership for predictable mem opts at one time, but also b/c there was a huge
amount of special code that would only trigger if it was used by DI or used by
predictable mem opts. After I did the copy some of the asserts that were needed
for DI remained in the predictable mem opts code. When pred-memopts was only run
in the mandatory pipeline keeping these assertions were ok, but pred-memopts was
recently added to the perf pipeline meaning that it may see code that breaks
these DI invariants (and thus hit this assertion).
We should remove this limitation on predictable-memopts but that would require
some scheduled time to read the code (more than I have to fix this bug = p). So
instead I changed the code to just bail in these cases.
rdar://40032102
(cherry picked from commit 269f8e8)
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.