Merge pull request #84894 from hnrklssn/revert-span-for-libstdc++

[6.2] Revert "add std::span to module map for libstdc++"

stdlib/public/Cxx/libstdcxx/libstdcxx.modulemap

@@ -42,7 +42,6 @@ module std {
   header "ostream"
   header "queue"
   header "set"
-  header "span"
   header "sstream"
   header "stack"
   header "stdexcept"

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

@@ -5,6 +5,9 @@
 
 // REQUIRES: swift_feature_SafeInteropWrappers
 
+// FIXME swift-ci linux tests do not support std::span
+// UNSUPPORTED: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
+
 //--- Inputs/swiftify-non-public.h
 #pragma once
 

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

@@ -9,6 +9,9 @@
 // REQUIRES: swift_feature_Lifetimes
 // REQUIRES: rdar161999174
 
+// FIXME swift-ci linux tests do not support std::span
+// UNSUPPORTED: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
+
 #if !BRIDGING_HEADER
 import StdSpan
 #endif

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

@@ -1,5 +1,8 @@
 // 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)
 
+// FIXME swift-ci linux tests do not support std::span
+// UNSUPPORTED: OS=linux-gnu
+
 // TODO: test failed in Windows PR testing: rdar://144384453
 // UNSUPPORTED: OS=windows-msvc
 

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

@@ -1,5 +1,8 @@
 // RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-experimental-cxx-interop -Xcc -std=c++20 2>&1
 
+// FIXME swift-ci linux tests do not support std::span
+// UNSUPPORTED: OS=linux-gnu
+
 import StdSpan
 
 let arr: [Int32] = [1, 2, 3]

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

@@ -1,6 +1,9 @@
 // RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xcc -std=c++20)
 // 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)
 
+// FIXME swift-ci linux tests do not support std::span
+// UNSUPPORTED: OS=linux-gnu
+
 // TODO: test failed in Windows PR testing: rdar://144384453
 // UNSUPPORTED: OS=windows-msvc
 

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

@@ -6,6 +6,9 @@
 // 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
 // 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
 
+// FIXME swift-ci linux tests do not support std::span
+// UNSUPPORTED: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
+
 //--- test.swift
 import Instance
 

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

@@ -1,5 +1,8 @@
 // REQUIRES: swift_feature_SafeInteropWrappers
 
+// FIXME swift-ci linux tests do not support std::span
+// UNSUPPORTED: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
+
 // RUN: rm -rf %t
 // RUN: split-file %s %t
 // 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

@@ -9,6 +9,9 @@
 // RUN: %target-codesign %t/swift-cxx-execution
 // RUN: %target-run %t/swift-cxx-execution | %FileCheck %s
 
+// FIXME swift-ci linux tests do not support std::span
+// UNSUPPORTED: OS=linux-gnu
+
 // REQUIRES: executable_test
 
 //--- header.h