Skip to content

Commit f7d5902

Browse files
committed
add std::span to module map for libstdc++
1 parent 34f3195 commit f7d5902

File tree

9 files changed

+234
-255
lines changed

9 files changed

+234
-255
lines changed

stdlib/public/Cxx/libstdcxx/libstdcxx.modulemap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ module std {
4242
header "ostream"
4343
header "queue"
4444
header "set"
45+
header "span"
4546
header "sstream"
4647
header "stack"
4748
header "stdexcept"

test/Interop/Cxx/class/access/swiftify-private-fileid.swift

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

66
// REQUIRES: swift_feature_SafeInteropWrappers
77

8-
// FIXME swift-ci linux tests do not support std::span
9-
// UNSUPPORTED: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
10-
118
//--- Inputs/swiftify-non-public.h
129
#pragma once
1310

test/Interop/Cxx/stdlib/std-span-interface.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
// REQUIRES: swift_feature_SafeInteropWrappers
99
// REQUIRES: swift_feature_Lifetimes
1010

11-
// FIXME swift-ci linux tests do not support std::span
12-
// UNSUPPORTED: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
13-
1411
#if !BRIDGING_HEADER
1512
import StdSpan
1613
#endif

test/Interop/Cxx/stdlib/std-span-transformed-execution.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// RUN: %target-run-simple-swift(-plugin-path %swift-plugin-dir -I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -swift-version 6 -Xfrontend -disable-availability-checking -Xcc -std=c++20 -enable-experimental-feature LifetimeDependence -enable-experimental-feature SafeInteropWrappers)
22

3-
// FIXME swift-ci linux tests do not support std::span
4-
// UNSUPPORTED: OS=linux-gnu
5-
63
// TODO: test failed in Windows PR testing: rdar://144384453
74
// UNSUPPORTED: OS=windows-msvc
85

test/Interop/Cxx/stdlib/use-std-span-typechecker.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-experimental-cxx-interop -Xcc -std=c++20 2>&1
22

3-
// FIXME swift-ci linux tests do not support std::span
4-
// UNSUPPORTED: OS=linux-gnu
5-
63
import StdSpan
74

85
let arr: [Int32] = [1, 2, 3]

test/Interop/Cxx/stdlib/use-std-span.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 -enable-experimental-cxx-interop -Xcc -std=c++20)
22
// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xcc -std=c++20 -Xcc -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG)
33

4-
// FIXME swift-ci linux tests do not support std::span
5-
// UNSUPPORTED: OS=linux-gnu
6-
74
// TODO: test failed in Windows PR testing: rdar://144384453
85
// UNSUPPORTED: OS=windows-msvc
96

test/Interop/Cxx/swiftify-import/import-as-instance-method.swift

Lines changed: 233 additions & 234 deletions
Large diffs are not rendered by default.

test/Interop/Cxx/swiftify-import/span-in-ctor.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// REQUIRES: swift_feature_SafeInteropWrappers
22

3-
// FIXME swift-ci linux tests do not support std::span
4-
// UNSUPPORTED: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
5-
63
// RUN: rm -rf %t
74
// RUN: split-file %s %t
85
// RUN: %target-swift-frontend -c -plugin-path %swift-plugin-dir -I %t/Inputs -Xcc -std=c++20 -cxx-interoperability-mode=default -enable-experimental-feature SafeInteropWrappers %t/method.swift -dump-macro-expansions -verify 2>&1 | %FileCheck %s

test/Interop/CxxToSwiftToCxx/span/span-execution.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
// RUN: %target-codesign %t/swift-cxx-execution
1010
// RUN: %target-run %t/swift-cxx-execution | %FileCheck %s
1111

12-
// FIXME swift-ci linux tests do not support std::span
13-
// UNSUPPORTED: OS=linux-gnu
14-
1512
// REQUIRES: executable_test
1613

1714
//--- header.h

0 commit comments

Comments
 (0)