-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[interop] update names and add docs for the interop C++ helper macros #64911
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| //===------------------ module.modulemap - C++ and Swift module -*- C++ -*-===// | ||
| // | ||
| // This source file is part of the Swift.org open source project | ||
| // | ||
| // Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors | ||
| // Licensed under Apache License v2.0 with Runtime Library Exception | ||
| // | ||
| // See https://swift.org/LICENSE.txt for license information | ||
| // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| module SwiftBridging { | ||
| header "bridging" | ||
|
|
||
| export * | ||
| } |
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
88 changes: 88 additions & 0 deletions
88
test/Interop/Cxx/ergonomics/swift-bridging-annotations.swift
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,88 @@ | ||
| // RUN: rm -rf %t | ||
| // RUN: split-file %s %t | ||
|
|
||
| // RUN: %target-swift-frontend %t/SwiftMod.swift -module-name SwiftMod -emit-module -o %t/SwiftMod.swiftmodule -I %t -enable-experimental-cxx-interop -Xcc -DFIRSTPASS | ||
|
|
||
| // RUN: %target-swift-ide-test -print-module -module-to-print=SwiftMod -module-to-print=CxxModule -I %t -I %t/Inputs -I %swift_src_root/lib/ClangImporter -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s | ||
|
|
||
| // RUN: %target-swift-ide-test -print-module -module-to-print=SwiftMod -module-to-print=CxxModule -I %t -I %t/Inputs -I %swift_src_root/lib/ClangImporter -source-filename=x -enable-experimental-cxx-interop -Xcc -DINCMOD | %FileCheck %s | ||
|
|
||
| //--- SwiftMod.swift | ||
|
|
||
| public protocol Proto { | ||
| } | ||
|
|
||
| //--- Inputs/module.modulemap | ||
| module CxxModule { | ||
| header "header.h" | ||
| requires cplusplus | ||
| } | ||
|
|
||
| //--- Inputs/header.h | ||
|
|
||
| // Note: in actuality, this will be included | ||
| // as <swift/bridging>, but in this test we include | ||
| // it directly. | ||
| #ifndef INCMOD | ||
| #include "bridging" | ||
| #else | ||
| #pragma clang module import SwiftBridging | ||
| #endif | ||
|
|
||
| class SWIFT_SELF_CONTAINED SelfContained { | ||
| public: | ||
| int *pointer; | ||
|
|
||
| SelfContained(); | ||
|
|
||
| const int *returnsIndependent() const SWIFT_RETURNS_INDEPENDENT_VALUE; | ||
| }; | ||
|
|
||
| class SWIFT_SHARED_REFERENCE(retainSharedObject, releaseSharedObject) | ||
| SharedObject { | ||
| public: | ||
| static SharedObject *create(); | ||
| }; | ||
|
|
||
| void retainSharedObject(SharedObject *); | ||
| void releaseSharedObject(SharedObject *); | ||
|
|
||
| class SWIFT_IMMORTAL_REFERENCE LoggerSingleton { | ||
| public: | ||
| LoggerSingleton(const LoggerSingleton &) = delete; | ||
| static LoggerSingleton *getInstance(); | ||
| }; | ||
|
|
||
| class SWIFT_UNSAFE_REFERENCE UnsafeNonCopyable { | ||
| public: | ||
| UnsafeNonCopyable(UnsafeNonCopyable &) = delete; | ||
| }; | ||
|
|
||
| UnsafeNonCopyable *returnsPointerToUnsafeReference(); | ||
| void takesPointerToUnsafeNonCopyable(UnsafeNonCopyable *); | ||
|
|
||
| class SWIFT_CONFORMS_TO_PROTOCOL(SwiftMod.Proto) ConformsTo { | ||
| public: | ||
| }; | ||
|
|
||
|
|
||
| // CHECK: struct SelfContained { | ||
|
|
||
| // CHECK: func returnsIndependent() -> UnsafePointer<Int32>! | ||
|
|
||
| // CHECK: class SharedObject { | ||
| // CHECK: class func create() -> SharedObject! | ||
| // CHECK: func retainSharedObject(_: SharedObject!) | ||
| // CHECK: func releaseSharedObject(_: SharedObject!) | ||
|
|
||
| // CHECK: class LoggerSingleton { | ||
| // CHECK: class func getInstance() -> LoggerSingleton! | ||
| // CHECK: } | ||
|
|
||
| // CHECK: class UnsafeNonCopyable { | ||
| // CHECK: } | ||
| // CHECK: func returnsPointerToUnsafeReference() -> UnsafeNonCopyable! | ||
| // CHECK: func takesPointerToUnsafeNonCopyable(_: UnsafeNonCopyable!) | ||
|
|
||
| // CHECK: struct ConformsTo : Proto { | ||
|
|
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.
Non blocking, but if it's easy, there's a reference to "import_reference" in this file that should probably be updated. Not a big deal, though.