🍒[cxx-interop] Make std::string::append usable from Swift and avoid crashing for substitution failures
#66805
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
This code used to crash the compiler:
var s = std.string("hi")
s.append("foo")
`append` in this case resolves to a templated C++ method that accepts `std::string_view`, while we tried passing a Swift String to it as a parameter.
rdar://107018724
(cherry picked from commit 4a1afa9)
This adds a new Swift overload for `append` that takes another `std::string` as a parameter. The original C++ overload for `append` is not exposed into Swift because it returns a mutable reference `string&`. rdar://107018724 (cherry picked from commit 6cd4b7c)
|
@swift-ci please test |
DougGregor
approved these changes
Jun 21, 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.
Explanation: This makes
std::string::appendcallable from Swift. Previously this was causing a compiler crash, since it tried to substitutestd::stringas a templated parameter to anappendoverload that takesstd::string_viewas a parameter. This PR also prevents a compiler crash in this kind of cases.Scope: This adds a Swift function
appendinto the CxxStdlib overlay, and fixes the compiler crash.Risk: Low, this only has an effect when C++ interop is enabled.
Original PR: #66749
rdar://107018724
(cherry picked from commit 4a1afa9)
(cherry picked from commit 6cd4b7c)