[MoveOnlyAddressChecker] Fix representation for initialized fields. #66955
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 please test |
nate-chandler
force-pushed
the
rdar111391893
branch
from
3662698 to
d0319ce
Compare
nate-chandler
force-pushed
the
rdar111391893
branch
from
d0319ce to
57d6391
Compare
Used the TypeTreeLeafTypeRange::setBits helper rather than looping over the range and setting the bits in place.
In preparation to share the getOrCreateConsumingBlock functionality with another overload of recordConsumingBlock.
nate-chandler
force-pushed
the
rdar111391893
branch
from
57d6391 to
7ba1c81
Compare
|
Rebased on top of main to avoid conflict with |
gottesmm
reviewed
Jun 27, 2023
| @@ -621,11 +624,11 @@ struct UseState { | |||
|
|
|||
| /// A map from an instruction that initializes memory to the description of | |||
| /// the part of the type tree that it initializes. | |||
| llvm::SmallMapVector<SILInstruction *, TypeTreeLeafTypeRange, 4> initInsts; | |||
| llvm::SmallMapVector<SILInstruction *, SmallBitVector, 4> initInsts; | |||
There was a problem hiding this comment.
@nate-chandler shouldn't this also use inst to bit map?
gottesmm
approved these changes
Jun 27, 2023
nate-chandler
force-pushed
the
rdar111391893
branch
from
7ba1c81 to
e1d9afc
Compare
|
@swift-ci please test |
The new overload iterates over the contiguous ranges in the bit vector and calls through to the overload that takes a range.
The address checker records instructions that reinit fields in its reinitInsts map. Previously, that map mapped from an instruction to a range of fields of the type. But an instruction can use multiple discontiguous fields of a single value. (Indeed an attempt to add a second range that was reinit'd by an already reinit'ing instruction--even if it were overlapping or adjacent--would have no effect and the map wouldn't be updated.) Here, this is fixed by fixing the representation and updating the storage whenver a new range is seen to be reinit'd by the instruction. As in swiftlang#66728 , a SmallBitVector is the representation chosen. rdar://111356251
In preparation for having a third instance getting or creating the bits affected by an instruction, introduce a typealias for maps SILInstruction->SmallBitVector and a helper function that returns a reference to the SmallBitVector for an instruction and two others that set into those bits the bits from another bit vector or from a range.
The address checker records instructions that initialize fields in its initInsts map. Previously, that map mapped from an instruction to a range of fields of the type. But an instruction can initialize multiple discontiguous fields of a single value. (Indeed an attempt to add a second range that was initialized by an already initializing instruction--even if it were overlapping or adjacent--would have no effect and the map wouldn't be updated.) Here, this is fixed by fixing the representation and updating the storage whenver a new range is seen to be initialized by the instruction. As in swiftlang#66728 , a SmallBitVector is the representation chosen. rdar://111391893
nate-chandler
force-pushed
the
rdar111391893
branch
from
e1d9afc to
d00da4a
Compare
|
@swift-ci please test |
|
@swift-ci please smoke test macos 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.
Based on #66945 , only the last two commits are new here.
The address checker records instructions that initialize fields in its initInsts map. Previously, that map mapped from an instruction to a range of fields of the type. But an instruction can initialize multiple discontiguous fields of a single value. (Indeed an attempt to add a second range that was initialized by an already initializing instruction--even if it were overlapping or adjacent--would have no effect and the map wouldn't be updated.) Here, this is fixed by fixing the representation and updating the storage whenver a new range is seen to be initialized by the instruction. As in #66728 , a SmallBitVector is the representation chosen.
rdar://111391893