Fix a use-after-free in MandatoryInlining #35037
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 |
eeckstein
approved these changes
Dec 10, 2020
| @@ -481,6 +481,12 @@ class ClosureCleanup { | |||
| if (!operandVal->getType().is<SILFunctionType>()) | |||
| continue; | |||
|
|
|||
| // Skip debug instructions | |||
There was a problem hiding this comment.
This check should be done at the function entry.
Can you add a bit more information in the comment? E.g. Add the info what you wrote in the PR description.
Also, you should mention that the special handling of debug instruction is done in eraseFromParentWithDebugInsts.
meg-gupta
force-pushed
the
fixuseafterfree
branch
from
77b7839 to
2986115
Compare
In recordDeadFunction, we look at operands of an instruction to be deleted, and add back the defining instruction of the operands to the worklist. This works in general when we are deleting dead instructions recursively. But we also consider, an instruction with only debug uses as dead. So when we are deleting a debug instruction, we may have already deleted its operand's defining instruction. So it would be incorrect to add it to the worklist.
meg-gupta
force-pushed
the
fixuseafterfree
branch
from
2986115 to
0c25245
Compare
|
@swift-ci smoke test and merge |
|
Thanks @eeckstein . I'll add the test you wrote in a follow on commit. |
meg-gupta
added a commit
to meg-gupta/swift
that referenced
this pull request
Dec 11, 2020
ainu-bot
added a commit
to google/swift
that referenced
this pull request
Dec 11, 2020
* 'main' of github.com:apple/swift: Add test for swiftlang#35037
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.
In recordDeadFunction, we look at operands of an instruction to be deleted,
and add back the defining instruction of the operands to the worklist.
This works in general when we are deleting dead instructions
recursively.
But we also consider, an instruction with only debug uses as dead. So
when we are deleting a debug instruction, we may have already deleted
its operand's defining instruction. So it would be incorrect to add it
to the worklist.
Fixes rdar://72029485