[cxx-interop] Pass foreign reference types with correct level of indirection #83850
+146
−21
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
egorzhdan
requested review from
Xazax-hun,
fahadnayyar,
hnrklssn,
j-hui,
rjmccall,
susmonteiro and
zoecarver
as code owners
|
@swift-ci please test |
…rection When calling a C++ function that takes a reference to a pointer to a foreign reference type, Swift would previously pass a pointer to the foreign reference type as an argument (instead of a reference to a pointer), which resulted in invalid memory accesses. This was observed when using `std::vector<ImmortalRef*>::push_back`. rdar://150791778
egorzhdan
force-pushed
the
egorzhdan/frt-indirection
branch
from
5628bf4 to
0a766e5
Compare
egorzhdan
commented
Aug 22, 2025
Comment on lines
-4551
to
-4555
| // In Swift, values that are foreign references types will always be | ||
| // pointers. Additionally, we only import functions which use foreign | ||
| // reference types indirectly (as pointers), so we know in every case, if | ||
| // the argument type is a foreign reference type, the types will match up | ||
| // and we can simply use the input directly. |
There was a problem hiding this comment.
This comment is no longer correct, since we now import ImmortalRef *const & as ImmortalRef!.
egorzhdan
commented
Aug 22, 2025
Comment on lines
-35
to
-38
| if (type.isForeignReferenceType()) | ||
| return getClangType(type.getASTType() | ||
| ->wrapInPointer(PTK_UnsafePointer) | ||
| ->getCanonicalType()); |
There was a problem hiding this comment.
This is now handled inside of getClangTypeForIRGen, so this logic was adding an (incorrect) extra pointer.
|
@swift-ci please test |
Xazax-hun
approved these changes
Aug 22, 2025
|
@swift-ci please test Windows |
1 similar comment
|
@swift-ci please test Windows |
|
@swift-ci please test Windows |
finagolfin
reviewed
Aug 24, 2025
| @@ -0,0 +1,54 @@ | |||
| // RUN: %target-run-simple-swift(-I %S/Inputs -cxx-interoperability-mode=upcoming-swift -Xfrontend -disable-availability-checking) | |||
There was a problem hiding this comment.
@egorzhdan, all %target-run-simple-swift tests have to include // REQUIRES: executable_test, else they fail in host-test mode.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
When calling a C++ function that takes a reference to a pointer to a foreign reference type, Swift would previously pass a pointer to the foreign reference type as an argument (instead of a reference to a pointer), which resulted in invalid memory accesses.
This was observed when using
std::vector<ImmortalRef*>::push_back.rdar://150791778