Skip to content

Attempt to fix new-codable Windows test crashes #1851

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

Open
kperryua wants to merge 1 commit into
base: experimental/new-codable
Choose a base branch
from
+5 −11
Open

Attempt to fix new-codable Windows test crashes #1851

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
1 change: 1 addition & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ let package = Package(
name: "NewCodable",
dependencies: [
.target(name: "FoundationEssentials"),
.target(name: "_FoundationCShims"),
"NewCodableMacros",
.product(name: "OrderedCollections", package: "swift-collections"),
.product(name: "BasicContainers", package: "swift-collections"),
Expand Down
15 changes: 4 additions & 11 deletions Sources/NewCodable/JSON/NewJSONDecoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import ucrt
import WASILibc
#endif

internal import _FoundationCShims

public struct NewJSONDecoder {
@usableFromInline
internal var options: Options
Expand Down Expand Up @@ -220,21 +222,12 @@ extension Double : PrevalidatedJSONNumberBufferConvertible {
@usableFromInline
init?(prevalidatedBuffer buffer: borrowing RawSpan) {
let decodedValue = buffer.withUnsafeBytes { buff -> Double? in
// TODO: Trying to diagnose why floating point parsing is failing w
// if let str = String._tryFromUTF8(buff.bindMemory(to: UInt8.self)) {
// print("Parsing: \(str) from baseAddress \(buff.baseAddress!)")
// }

var endPtr: UnsafeMutablePointer<CChar>? = nil
// TODO: strtoX_l everywhere.
let decodedValue = strtod(buff.baseAddress!, &endPtr)
let decodedValue = _stringshims_strtod_clocale(buff.baseAddress!, &endPtr)
if let endPtr {
if buff.baseAddress!.advanced(by: buff.count) == endPtr {
return decodedValue
}
// else {
// print("Got value: \(decodedValue) but failing prevalidatedBuffer because of bad pointer. Expected \(buff.baseAddress!.advanced(by: buff.count)) vs \(endPtr)")
// }
return nil
} else {
return nil
Expand All @@ -250,7 +243,7 @@ extension Float : PrevalidatedJSONNumberBufferConvertible {
init?(prevalidatedBuffer buffer: RawSpan) {
let decodedValue = buffer.withUnsafeBytes { buff -> Float? in
var endPtr: UnsafeMutablePointer<CChar>? = nil
let decodedValue = strtof(buff.baseAddress!, &endPtr)
let decodedValue = _stringshims_strtof_clocale(buff.baseAddress!, &endPtr)
if let endPtr, buff.baseAddress!.advanced(by: buff.count) == endPtr {
return decodedValue
} else {
Expand Down
Loading