Skip to content

Commit 2afd4ec

Browse files
committed
Revert "add std::span to module map for libstdc++"
This reverts commit f7d5902. It was part of a larger PR in #84755, but turned out to be broken for older versions of libstdc++. Since it's not critical to the functionality of the larger PR, this reverts the problematic part. rdar://161999183
1 parent 69a38d9 commit 2afd4ec

File tree

9 files changed

+24
-1
lines changed

9 files changed

+24
-1
lines changed

stdlib/public/Cxx/libstdcxx/libstdcxx.modulemap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ module std {
4242
header "ostream"
4343
header "queue"
4444
header "set"
45-
header "span"
4645
header "sstream"
4746
header "stack"
4847
header "stdexcept"

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
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+
811
//--- Inputs/swiftify-non-public.h
912
#pragma once
1013

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

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

12+
// FIXME swift-ci linux tests do not support std::span
13+
// UNSUPPORTED: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
14+
1215
#if !BRIDGING_HEADER
1316
import StdSpan
1417
#endif

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
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+
36
// TODO: test failed in Windows PR testing: rdar://144384453
47
// UNSUPPORTED: OS=windows-msvc
58

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
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+
36
import StdSpan
47

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
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+
47
// TODO: test failed in Windows PR testing: rdar://144384453
58
// UNSUPPORTED: OS=windows-msvc
69

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
// RUN: %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/Test.swiftmodule -I %t/Inputs -enable-experimental-feature SafeInteropWrappers -strict-memory-safety -warnings-as-errors -Xcc -Werror %t/test.swift -cxx-interoperability-mode=default -Xcc -std=c++20 -verify -verify-additional-file %t/Inputs/instance.h -DVERIFY
77
// RUN: env SWIFT_BACKTRACE="" %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/Test.swiftmodule -I %t/Inputs -enable-experimental-feature SafeInteropWrappers -strict-memory-safety -warnings-as-errors -Xcc -Werror %t/test.swift -cxx-interoperability-mode=default -Xcc -std=c++20 -dump-macro-expansions 2>&1 | %FileCheck %s --match-full-lines --strict-whitespace --implicit-check-not __swiftmacro
88

9+
// FIXME swift-ci linux tests do not support std::span
10+
// UNSUPPORTED: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
11+
912
//--- test.swift
1013
import Instance
1114

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
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+
36
// RUN: rm -rf %t
47
// RUN: split-file %s %t
58
// 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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
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+
1215
// REQUIRES: executable_test
1316

1417
//--- header.h

0 commit comments

Comments
 (0)