[MoveOnlyAddressChecker] Fix representation for reinit'd fields. #66945
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 |
|
@swift-ci please test macos platform |
atrick
reviewed
Jun 27, 2023
| if (bits.size() == 0) | ||
| return; | ||
|
|
||
| Optional<std::pair<unsigned, /*isSet*/ bool>> current = llvm::None; |
There was a problem hiding this comment.
Would it be simpler to do:
Optional<unsigned> current = None
for ...
if (current) {
if (!isSet) {
callback
current = None
}
} else if (isSet) {
current = bit
}
}
if (current) { callback }
disclaimer, I didn't think hard about this
nate-chandler
force-pushed
the
rdar111356251
branch
from
fbf1561 to
eb4a25b
Compare
|
@swift-ci please test |
atrick
approved these changes
Jun 27, 2023
gottesmm
approved these changes
Jun 27, 2023
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.
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
nate-chandler
force-pushed
the
rdar111356251
branch
from
eb4a25b to
4a5009a
Compare
|
Rebased and force-pushed in order to prefix the new use of Optional with |
|
@swift-ci please test and merge |
|
@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.
The move-only 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 value. 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 #66728 , a SmallBitVector is the representation chosen.
rdar://111356251