Skip to content

Commit 4c68a06

Browse files
authored
Merge pull request #83844 from swiftlang/egorzhdan/6.2-frt-windows
πŸ’[cxx-interop] Enable reference-counted types on Windows
2 parents eaf9a80 + 5c7d5f6 commit 4c68a06

File tree

9 files changed

+1
-18
lines changed

9 files changed

+1
-18
lines changed

β€Žlib/IRGen/GenMeta.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6881,7 +6881,7 @@ namespace {
68816881

68826882
void emitInitializeMetadata(IRGenFunction &IGF, llvm::Value *metadata,
68836883
MetadataDependencyCollector *collector) {
6884-
llvm_unreachable("Not implemented for foreign reference types.");
6884+
// Foreign reference types do not currently require extra metadata.
68856885
}
68866886

68876887
// Visitor methods.

β€Žtest/Interop/C/struct/foreign-reference.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
//
44
// REQUIRES: executable_test
55

6-
// XFAIL: OS=windows-msvc
7-
// FIXME: Runtime support for C++ foreign reference types is missing on Windows (https://github.com/swiftlang/swift/issues/82643)
8-
96
import StdlibUnittest
107
import ForeignReference
118

β€Žtest/Interop/Cxx/foreign-reference/extensions.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -cxx-interoperability-mode=default -Xfrontend -disable-availability-checking -Onone) | %FileCheck %s
22
// REQUIRES: executable_test
33

4-
// Metadata for foreign reference types is not supported on Windows.
5-
// UNSUPPORTED: OS=windows-msvc
6-
74
import ReferenceCounted
85

96
protocol MyProto {

β€Žtest/Interop/Cxx/foreign-reference/inheritance.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// REQUIRES: executable_test
22
// RUN: %target-run-simple-swift(-cxx-interoperability-mode=default -Xfrontend -disable-availability-checking -I %S/Inputs)
33

4-
// TODO: Fix this lit test failure on windows rdar://145218056
5-
// XFAIL: OS=windows-msvc
6-
74
import Inheritance
85
import StdlibUnittest
96

β€Žtest/Interop/Cxx/foreign-reference/multiple-protocol-conformances.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// RUN: split-file %s %t
33
// RUN: %target-build-swift -I %S/Inputs %t/main.swift %t/second.swift -cxx-interoperability-mode=default -Xfrontend -disable-availability-checking
44

5-
// XFAIL: OS=windows-msvc
6-
75
//--- main.swift
86
import ReferenceCounted
97

β€Žtest/Interop/Cxx/foreign-reference/print-reference.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
// REQUIRES: executable_test
44

5-
// Metadata for foreign reference types is not supported on Windows.
6-
// UNSUPPORTED: OS=windows-msvc
7-
85
// Temporarily disable when running with an older runtime (rdar://153205860)
96
// UNSUPPORTED: use_os_stdlib
107
// UNSUPPORTED: back_deployment_runtime

β€Žtest/Interop/Cxx/foreign-reference/reference-counted-irgen.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %target-swift-emit-irgen %s -I %S/Inputs -cxx-interoperability-mode=default -Xcc -fignore-exceptions -disable-availability-checking | %FileCheck %s
2-
// XFAIL: OS=windows-msvc
32

43
import ReferenceCounted
54

β€Žtest/Interop/Cxx/foreign-reference/reference-counted.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// 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 -O)
33
//
44
// REQUIRES: executable_test
5-
// XFAIL: OS=windows-msvc
65

76
// Temporarily disable when running with an older runtime (rdar://128681137)
87
// UNSUPPORTED: use_os_stdlib

β€Žtest/Interop/Cxx/foreign-reference/witness-table.swift

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

65
// Temporarily disable when running with an older runtime (rdar://128681577)
76
// UNSUPPORTED: use_os_stdlib

0 commit comments

Comments
Β (0)