[stdlib] Fix buffer size of small-capacity strings #67929
Merged
Conversation
This file contains 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 smoke test |
glessard
reviewed
Aug 15, 2023
stdlib/public/core/SmallString.swift
Outdated
| @@ -243,7 +243,9 @@ extension _SmallString { | |||
| fileprivate mutating func withMutableCapacity( | |||
| _ f: (UnsafeMutableRawBufferPointer) throws -> Int | |||
| ) rethrows { | |||
| let len = try withUnsafeMutableBytes(of: &_storage, f) | |||
| let len = try withUnsafeMutableBytes(of: &_storage) { | |||
| try f(.init(rebasing: $0.prefix(_SmallString.capacity))) | |||
There was a problem hiding this comment.
It would be justifiable to use .init(_uncheckedStart:count:) here: the preconditions are known to be met.
There was a problem hiding this comment.
UMRBP doesn't have an unchecked initializer, so I used init(start:count:) instead.
glessard
reviewed
Aug 15, 2023
| let smol = try _SmallString(initializingUTF8With: initializer) | ||
| let smol = try _SmallString(initializingUTF8With: { | ||
| try initializer(.init(rebasing: $0.prefix(capacity))) | ||
| }) |
There was a problem hiding this comment.
Could also use .init(_uncheckedStart:count:) here.
There was a problem hiding this comment.
The given capacity could be negative, so I used init(start:count:) instead.
|
@swift-ci please test |
lorentey
approved these changes
Aug 16, 2023
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.
Resolves #57911