Merge pull request #69718 from eeckstein/embedded-stdlib

eeckstein · web-flow · commit 1e9135f7cdf5 · 2023-11-09T07:51:05.000+01:00
Two small fixes for the embedded stdlib
diff --git a/stdlib/public/core/CMakeLists.txt b/stdlib/public/core/CMakeLists.txt
@@ -415,6 +415,7 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
       GYB_SOURCES ${SWIFTLIB_EMBEDDED_GYB_SOURCES}
       SWIFT_COMPILE_FLAGS
         ${swift_stdlib_compile_flags} -Xcc -D__MACH__ -Xcc -D__APPLE__ -Xcc -ffreestanding -enable-experimental-feature Embedded
+        -Xfrontend -enable-ossa-modules
       MODULE_DIR "${CMAKE_BINARY_DIR}/lib/swift/embedded"
       SDK "embedded"
       ARCHITECTURE "${arch}"
diff --git a/stdlib/public/core/EmbeddedRuntime.swift b/stdlib/public/core/EmbeddedRuntime.swift
@@ -270,3 +270,8 @@ public func swift_once(predicate: UnsafeMutablePointer<Int>, fn: (@convention(c)
 public func swift_deletedMethodError() -> Never {
   Builtin.int_trap()
 }
+
+@_silgen_name("swift_willThrow")
+public func swift_willThrow() throws {
+}
+
diff --git a/test/embedded/throw-trap-stdlib.swift b/test/embedded/throw-trap-stdlib.swift
@@ -10,4 +10,4 @@ public func test() {
   }
 }
 
-// CHECK-NOT: swift_willThrow
+// CHECK: swift_willThrow

Original file line number	Diff line number	Diff line change
`@@ -270,3 +270,8 @@ public func swift_once(predicate: UnsafeMutablePointer<Int>, fn: (@convention(c)`
`270`	`270`	`public func swift_deletedMethodError() -> Never {`
`271`	`271`	`Builtin.int_trap()`
`272`	`272`	`}`
	`273`	`+`
	`274`	`+@_silgen_name("swift_willThrow")`
	`275`	`+public func swift_willThrow() throws {`
	`276`	`+}`
	`277`	`+`