Skip to content
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

[wasm] Mark errno as nonisolated(unsafe) in wasi-libc #75821

Merged
merged 2 commits into from
Aug 17, 2024
Merged

[wasm] Mark errno as nonisolated(unsafe) in wasi-libc #75821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90799cf
Revert "[wasm] Fix ambiguous `errno` error when importing WASILibc mo…
kateinoigakukun Aug 10, 2024
be08ebb
[wasm] Annotate errno as SwiftPrivate by apinotes
kateinoigakukun Aug 10, 2024
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
28 changes: 28 additions & 0 deletions stdlib/public/Platform/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,34 @@ if("WASI" IN_LIST SWIFT_SDKS)
DESTINATION "lib/swift_static/${arch_subdir}"
COMPONENT sdk-overlay)
endif()

set(wasilibc_apinotes_source "SwiftWASILibc.apinotes")
add_custom_command_target(
copy_wasilibc_apinotes_resource
COMMAND
"${CMAKE_COMMAND}" "-E" "make_directory" ${SWIFTLIB_DIR}/apinotes ${SWIFTSTATICLIB_DIR}/apinotes
COMMAND
"${CMAKE_COMMAND}" "-E" "copy_if_different"
"${CMAKE_CURRENT_SOURCE_DIR}/${wasilibc_apinotes_source}" ${SWIFTLIB_DIR}/apinotes
COMMAND
"${CMAKE_COMMAND}" "-E" "copy_if_different"
"${CMAKE_CURRENT_SOURCE_DIR}/${wasilibc_apinotes_source}" ${SWIFTSTATICLIB_DIR}/apinotes
OUTPUT
${SWIFTLIB_DIR}/apinotes/${wasilibc_apinotes_source}
${SWIFTSTATICLIB_DIR}/apinotes/${wasilibc_apinotes_source}
COMMENT "Copying WASILibc API notes to resource directories")

list(APPEND wasilibc_modulemap_target_list ${copy_wasilibc_apinotes_resource})
add_dependencies(sdk-overlay ${copy_wasilibc_apinotes_resource})
swift_install_in_component(FILES "${wasilibc_apinotes_source}"
DESTINATION "lib/swift/apinotes"
COMPONENT sdk-overlay)
if(SWIFT_BUILD_STATIC_STDLIB)
swift_install_in_component(FILES "${wasilibc_apinotes_source}"
DESTINATION "lib/swift_static/apinotes"
COMPONENT sdk-overlay)
endif()

endforeach()
endif()
add_custom_target(wasilibc_modulemap DEPENDS ${wasilibc_modulemap_target_list})
Expand Down
6 changes: 0 additions & 6 deletions stdlib/public/Platform/Platform.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,6 @@ func _convertDarwinBooleanToBool(_ x: DarwinBoolean) -> Bool {

#endif

// wasi-libc defines `errno` in a way ClangImporter can understand, so we don't
// need to define shims for it. On the contrary, if we define the shim, we will
// get an ambiguity error when importing WASILibc module and SwiftWASILibc Clang
// module (or a Clang module that re-exports SwiftWASILibc).
#if !os(WASI)
//===----------------------------------------------------------------------===//
// sys/errno.h
//===----------------------------------------------------------------------===//
Expand All @@ -101,7 +96,6 @@ public var errno : Int32 {
return _swift_stdlib_setErrno(val)
}
}
#endif


//===----------------------------------------------------------------------===//
Expand Down
5 changes: 5 additions & 0 deletions stdlib/public/Platform/SwiftWASILibc.apinotes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Name: SwiftWASILibc
Globals:
# errno macro is importable but we provide explicit Swift wrapper
- Name: errno
SwiftPrivate: true
19 changes: 19 additions & 0 deletions test/stdlib/WASILibcAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// RUN: %target-swift-frontend -typecheck -swift-version 6 %s -verify
// REQUIRES: executable_test
// REQUIRES: OS=wasi

import WASILibc

// errno is a global thread-local variable, so it should be accessible
// from any context.

enum TestErrno {
static func testSyncContext() {
_ = errno
errno = 0
}
static func testAsyncContext() async {
_ = errno
errno = 0
}
}