Skip to content

Commit 380f9a7

Browse files
hyphyp
committed
[interop] add availability for foreign reference types
Such types have runtime support only SwiftStdlib 5.8 and above
1 parent 220e6fa commit 380f9a7

16 files changed

+48
-23
lines changed

‎lib/ClangImporter/ImportDecl.cpp‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2681,9 +2681,25 @@ namespace {
26812681
if (!result)
26822682
return nullptr;
26832683

2684-
if (auto classDecl = dyn_cast<ClassDecl>(result))
2684+
if (auto classDecl = dyn_cast<ClassDecl>(result)) {
26852685
validateForeignReferenceType(decl, classDecl);
26862686

2687+
auto ctx = Impl.SwiftContext.getSwift58Availability();
2688+
if (!ctx.isAlwaysAvailable()) {
2689+
assert(ctx.getOSVersion().hasLowerEndpoint());
2690+
auto AvAttr = new (Impl.SwiftContext) AvailableAttr(
2691+
SourceLoc(), SourceRange(),
2692+
targetPlatform(Impl.SwiftContext.LangOpts), "", "",
2693+
/*RenameDecl=*/nullptr, ctx.getOSVersion().getLowerEndpoint(),
2694+
/*IntroducedRange=*/SourceRange(), {},
2695+
/*DeprecatedRange=*/SourceRange(), {},
2696+
/*ObsoletedRange=*/SourceRange(),
2697+
PlatformAgnosticAvailabilityKind::None, /*Implicit=*/false,
2698+
false);
2699+
classDecl->getAttrs().add(AvAttr);
2700+
}
2701+
}
2702+
26872703
// If this module is declared as a C++ module, try to synthesize
26882704
// conformances to Swift protocols from the Cxx module.
26892705
auto clangModule = decl->getOwningModule();

‎test/Interop/Cxx/foreign-reference/base-class-layout-irgen.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop -module-name=test | %FileCheck %s
1+
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop -module-name=test -disable-availability-checking | %FileCheck %s
22

33
import MemberLayout
44

‎test/Interop/Cxx/foreign-reference/move-only-irgen.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop -validate-tbd-against-ir=none -disable-llvm-verify -Xcc -fignore-exceptions | %FileCheck %s
1+
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop -validate-tbd-against-ir=none -disable-llvm-verify -Xcc -fignore-exceptions -disable-availability-checking | %FileCheck %s
22
//
33
// XFAIL: OS=linux-android, OS=linux-androideabi
44

‎test/Interop/Cxx/foreign-reference/move-only-silgen.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-silgen %s -I %S/Inputs -enable-experimental-cxx-interop | %FileCheck %s
1+
// RUN: %target-swift-emit-silgen %s -I %S/Inputs -enable-experimental-cxx-interop -disable-availability-checking | %FileCheck %s
22
//
33
// XFAIL: OS=linux-android, OS=linux-androideabi
44

@@ -30,6 +30,6 @@ public func test() {
3030
_ = x.test()
3131
}
3232

33-
// CHECK-LABEL: sil [clang MoveOnly.create] @{{_ZN8MoveOnly6createEv|\?create\@MoveOnly\@\@SAPEAU1\@XZ}} : $@convention(c) () -> MoveOnly
33+
// CHECK-LABEL: sil{{ \[available .*\] | }}[clang MoveOnly.create] @{{_ZN8MoveOnly6createEv|\?create\@MoveOnly\@\@SAPEAU1\@XZ}} : $@convention(c) () -> MoveOnly
3434

35-
// CHECK-LABEL: sil [clang MoveOnly.test] @{{_ZNK8MoveOnly4testEv|\?test\@MoveOnly\@\@QEBAHXZ}} : $@convention(cxx_method) (@in_guaranteed MoveOnly) -> Int32
35+
// CHECK-LABEL: sil{{ \[available .*\] | }}[clang MoveOnly.test] @{{_ZNK8MoveOnly4testEv|\?test\@MoveOnly\@\@QEBAHXZ}} : $@convention(cxx_method) (@in_guaranteed MoveOnly) -> Int32

‎test/Interop/Cxx/foreign-reference/move-only.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none -Xfrontend -disable-llvm-verify)
1+
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none -Xfrontend -disable-llvm-verify -Xfrontend -disable-availability-checking)
22
//
33
// REQUIRES: executable_test
44

‎test/Interop/Cxx/foreign-reference/nullable.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none -Xfrontend -disable-llvm-verify -g)
1+
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none -Xfrontend -disable-llvm-verify -g -Xfrontend -disable-availability-checking)
22
//
33
// REQUIRES: executable_test
44

‎test/Interop/Cxx/foreign-reference/pod-irgen.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop -validate-tbd-against-ir=none -disable-llvm-verify -Xcc -fignore-exceptions | %FileCheck %s
1+
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop -validate-tbd-against-ir=none -disable-llvm-verify -Xcc -fignore-exceptions -disable-availability-checking | %FileCheck %s
22
//
33
// XFAIL: OS=linux-android, OS=linux-androideabi
44

‎test/Interop/Cxx/foreign-reference/pod-module-interface-macos.swift‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// RUN: %target-swift-ide-test -print-module -module-to-print=POD -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop -target %target-arch-apple-macos11 | %FileCheck %s
2+
3+
// REQUIRES: OS=macosx
4+
5+
// CHECK: @available(macOS 13.3.0, *)
6+
// CHECK-NEXT: class Empty {
7+
8+
// CHECK: @available(macOS 13.3.0, *)
9+
// CHECK-NEXT: class MultipleAttrs {

‎test/Interop/Cxx/foreign-reference/pod-silgen.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-silgen %s -I %S/Inputs -enable-experimental-cxx-interop | %FileCheck %s
1+
// RUN: %target-swift-emit-silgen %s -I %S/Inputs -enable-experimental-cxx-interop -disable-availability-checking | %FileCheck %s
22
//
33
// XFAIL: OS=linux-android, OS=linux-androideabi
44

@@ -36,6 +36,6 @@ public func test() {
3636
_ = x.test()
3737
}
3838

39-
// CHECK-LABEL: sil [clang IntPair.create] @{{_ZN7IntPair6createEv|\?create\@IntPair\@\@SAPEAU1\@XZ}} : $@convention(c) () -> IntPair
39+
// CHECK-LABEL: sil{{ \[available .*\] | }}[clang IntPair.create] @{{_ZN7IntPair6createEv|\?create\@IntPair\@\@SAPEAU1\@XZ}} : $@convention(c) () -> IntPair
4040

41-
// CHECK-LABEL: sil [clang IntPair.test] @{{_ZNK7IntPair4testEv|\?test\@IntPair\@\@QEBAHXZ}} : $@convention(cxx_method) (@in_guaranteed IntPair) -> Int32
41+
// CHECK-LABEL: sil{{ \[available .*\] | }}[clang IntPair.test] @{{_ZNK7IntPair4testEv|\?test\@IntPair\@\@QEBAHXZ}} : $@convention(cxx_method) (@in_guaranteed IntPair) -> Int32

‎test/Interop/Cxx/foreign-reference/pod.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none -Xfrontend -disable-llvm-verify -g)
1+
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none -Xfrontend -disable-llvm-verify -g -Xfrontend -disable-availability-checking)
22
//
33
// REQUIRES: executable_test
44
// XFAIL: OS=windows-msvc

0 commit comments

Comments
 (0)