[cxx-interop] Add support for subscripts of non-copyable types #86125
There are no files selected for viewing
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 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 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 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 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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| // RUN: %empty-directory(%t) | ||
| // RUN: split-file %s %t | ||
| // RUN: %target-build-swift %t%{fs-sep}test.swift -I %t%{fs-sep}Inputs -o %t%{fs-sep}out -cxx-interoperability-mode=default | ||
| // RUN: %target-codesign %t%{fs-sep}out | ||
| // RUN: %target-run %t%{fs-sep}out | ||
| // | ||
| // REQUIRES: executable_test | ||
|
|
||
| //--- Inputs/module.modulemap | ||
| module Test { | ||
| header "noncopyable.h" | ||
| requires cplusplus | ||
| } | ||
|
|
||
| //--- Inputs/noncopyable.h | ||
| #include <string> | ||
|
|
||
| struct NonCopyable { | ||
| NonCopyable() = default; | ||
| NonCopyable(int x) : number(x) {} | ||
| NonCopyable(const NonCopyable& other) = delete; | ||
| NonCopyable(NonCopyable&& other) = default; | ||
|
|
||
| int number = 0; | ||
| }; | ||
|
|
||
| template<typename T> | ||
| struct HasSubscript { | ||
| T &operator[](int idx) { return element; } | ||
| T element; | ||
| }; | ||
|
|
||
| using HasSubscriptInt = HasSubscript<int>; | ||
| using HasSubscriptNonCopyable = HasSubscript<NonCopyable>; | ||
|
|
||
| struct InheritsFromHasSubscript : public HasSubscript<NonCopyable> {}; | ||
|
|
||
| //--- test.swift | ||
| import StdlibUnittest | ||
| import Test | ||
|
|
||
| var NonCopyableTestSuite = TestSuite("NonCopyable") | ||
|
|
||
| func borrow(_ x: borrowing NonCopyable) -> Int32 { return x.number; } | ||
|
|
||
| NonCopyableTestSuite.test("Use subscript") { | ||
| var o1 = HasSubscriptInt(element: 7) | ||
| expectEqual(o1[42], 7) | ||
|
|
||
| var o2 = HasSubscriptNonCopyable(element: NonCopyable(5)) | ||
| expectEqual(borrow(o2[42]), 5) | ||
|
|
||
| var inherited = InheritsFromHasSubscript() | ||
| expectEqual(borrow(inherited[42]), 0) | ||
| } | ||
|
|
||
| NonCopyableTestSuite.test("Mutate subscript") { | ||
| var o1 = HasSubscriptInt(element: 7) | ||
| expectEqual(o1[42], 7) | ||
| o1[42] = 8 | ||
| expectEqual(o1[42], 8) | ||
|
|
||
| var o2 = HasSubscriptNonCopyable(element: NonCopyable(5)) | ||
| expectEqual(borrow(o2[42]), 5) | ||
| o2[42] = NonCopyable(16) | ||
| expectEqual(borrow(o2[42]), 16) | ||
|
|
||
| var inherited = InheritsFromHasSubscript() | ||
| expectEqual(borrow(inherited[42]), 0) | ||
| inherited[42] = NonCopyable(3) | ||
| expectEqual(borrow(inherited[42]), 3) | ||
| } | ||
|
|
||
| runAllTests() |
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 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Accidental change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doug noticed these radars numbers and asked for them to be removed. Since this is a small change, in a file that this patch touches, I thought it would be reasonable to do it here instead of creating a separate patch just for this. Would you prefer me to do it in a separate patch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's better to keep it out of this PR, since you're not modifying this code part here.
If you'd like to remove there rdar links, could you please file GitHub issues and link to them in the comments instead? That way someone encountering this FIXME and actually fixing it would remember to close the corresponding issue. If there isn't an issue link, the issue (or rdar) probably won't get closed.