Skip to content

Commit cbf9694

Browse files
authored
Merge pull request #68942 from kubamracek/embedded-freefix
[embedded] Avoid using Optional in the forward declared free() function in EmbeddedRuntime
2 parents f15485e + e996132 commit cbf9694

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Diff for: stdlib/public/core/EmbeddedRuntime.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public struct HeapObject {
4949
func posix_memalign(_: UnsafeMutablePointer<UnsafeMutableRawPointer?>, _: Int, _: Int) -> CInt
5050

5151
@_silgen_name("free")
52-
func free(_ p: UnsafeMutableRawPointer?)
52+
func free(_ p: Builtin.RawPointer)
5353

5454

5555

@@ -74,8 +74,8 @@ public func swift_slowAlloc(_ size: Int, _ alignMask: Int) -> UnsafeMutableRawPo
7474
}
7575

7676
@_cdecl("swift_slowDealloc")
77-
public func swift_slowDealloc(_ ptr: UnsafeMutableRawPointer?, _ size: Int, _ alignMask: Int) {
78-
free(ptr)
77+
public func swift_slowDealloc(_ ptr: UnsafeMutableRawPointer, _ size: Int, _ alignMask: Int) {
78+
free(ptr._rawValue)
7979
}
8080

8181
@_silgen_name("swift_allocObject")
@@ -89,7 +89,7 @@ public func swift_allocObject(metadata: UnsafeMutablePointer<ClassMetadata>, req
8989

9090
@_silgen_name("swift_deallocObject")
9191
public func swift_deallocObject(object: UnsafeMutablePointer<HeapObject>, allocatedSize: Int, allocatedAlignMask: Int) {
92-
free(object)
92+
free(object._rawValue)
9393
}
9494

9595
@_silgen_name("swift_deallocClassInstance")
@@ -98,7 +98,7 @@ public func swift_deallocClassInstance(object: UnsafeMutablePointer<HeapObject>,
9898
return
9999
}
100100

101-
free(object)
101+
free(object._rawValue)
102102
}
103103

104104
@_silgen_name("swift_initStaticObject")

0 commit comments

Comments
 (0)