Skip to content

[cxx-interop] Do not consider std::span<T>::size and co unsafe #84389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2025
+52 −2
Merged

[cxx-interop] Do not consider std::span<T>::size and co unsafe #84389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion stdlib/public/Cxx/std/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ add_custom_command_target(unused_var
CUSTOM_TARGET_NAME CxxStdlib-apinotes
COMMAND ${CMAKE_COMMAND} "-E" "make_directory" "${output_dir}"
COMMAND ${CMAKE_COMMAND} "-E" "copy_if_different" "${CMAKE_CURRENT_SOURCE_DIR}/std.apinotes" "${output_dir}"
COMMAND ${CMAKE_COMMAND} "-E" "copy_if_different" "${CMAKE_CURRENT_SOURCE_DIR}/std_span.apinotes" "${output_dir}"
COMMAND ${CMAKE_COMMAND} "-E" "copy_if_different" "${CMAKE_CURRENT_SOURCE_DIR}/std_string_view.apinotes" "${output_dir}"
COMMENT "Copying CxxStdlib API Notes to ${output_dir}"
OUTPUT "${output_dir}/std.apinotes"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/std.apinotes")
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/std.apinotes"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/std_span.apinotes"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/std_string_view.apinotes")

swift_install_in_component(FILES std.apinotes
DESTINATION "lib/swift/apinotes"
Expand Down
17 changes: 17 additions & 0 deletions stdlib/public/Cxx/std/std.apinotes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,20 @@ Namespaces:
Methods:
- Name: data
SwiftName: __dataUnsafe()
- Name: size
SwiftSafety: safe
- Name: size_bytes
SwiftSafety: safe
- Name: empty
SwiftSafety: safe
- Name: basic_string_view
Methods:
- Name: size
SwiftSafety: safe
- Name: max_size
SwiftSafety: safe
- Name: length
SwiftSafety: safe
- Name: empty
SwiftSafety: safe

14 changes: 14 additions & 0 deletions stdlib/public/Cxx/std/std_span.apinotes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Name: std_span
Namespaces:
- Name: std
Tags:
- Name: span
Methods:
- Name: data
SwiftName: __dataUnsafe()
- Name: size
SwiftSafety: safe
- Name: size_bytes
SwiftSafety: safe
- Name: empty
SwiftSafety: safe
14 changes: 14 additions & 0 deletions stdlib/public/Cxx/std/std_string_view.apinotes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Name: std_string_view
Namespaces:
- Name: std
Tags:
- Name: basic_string_view
Methods:
- Name: size
SwiftSafety: safe
- Name: max_size
SwiftSafety: safe
- Name: length
SwiftSafety: safe
- Name: empty
SwiftSafety: safe
3 changes: 2 additions & 1 deletion test/Interop/Cxx/class/safe-interop-mode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

// RUN: rm -rf %t
// RUN: split-file %s %t
// RUN: %target-swift-frontend -typecheck -verify -I %swift_src_root/lib/ClangImporter/SwiftBridging -Xcc -std=c++20 -I %t/Inputs %t/test.swift -strict-memory-safety -enable-experimental-feature LifetimeDependence -cxx-interoperability-mode=default -diagnostic-style llvm 2>&1
// RUN: %target-swift-frontend -typecheck -verify -I %swift_src_root/lib/ClangImporter/SwiftBridging -Xcc -iapinotes-modules -Xcc %swift_src_root/stdlib/public/Cxx/std -Xcc -std=c++20 -I %t/Inputs %t/test.swift -strict-memory-safety -enable-experimental-feature LifetimeDependence -cxx-interoperability-mode=default -diagnostic-style llvm 2>&1

// REQUIRES: objc_interop
// REQUIRES: swift_feature_LifetimeDependence
Expand Down Expand Up @@ -134,6 +134,7 @@ func useUnsafeTuple(x: UnsafeTuple) {
func useCppSpan(x: SpanOfInt) {
// expected-warning@+1{{expression uses unsafe constructs but is not marked with 'unsafe'}}
_ = x // expected-note{{reference to parameter 'x' involves unsafe type}}
_ = x.size()
}

func useCppSpan2(x: SpanOfIntAlias) {
Expand Down