Skip to content

{JSON,Plist}{En,De}coder defer container pops #13879

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

Jump to bottom
Merged
merged 2 commits into from
Jan 12, 2018
Merged

{JSON,Plist}{En,De}coder defer container pops #13879

merged 2 commits into from
Jan 12, 2018

Conversation

itaiferber
Copy link
Contributor

@itaiferber itaiferber commented Jan 11, 2018 •
edited by AnthonyLatsis
Loading

What's in this pull request?
Resolves #48633 (rdar://problem/34857336) resolves swiftlang/swift-corelibs-foundation#4051 (rdar://problem/36336754), which became more common failures after #13178.

Thanks to @zintus for #12969 — this expands on that and adds unit tests.

Itai Ferber added 2 commits January 11, 2018 12:20
Restore encoder state after throwing on encode
57e356b 
Resolve SR-6078 by restoring the JSON/PlistEncoder stack if an error
is thrown after a container was pushed during encode.
Restore decoder state after throwing on decode
1e110b8 
Resolve SR-6408 by restoring the JSON/PlistDecoder stack if an error
is thrown after a container was pushed during encode.
@itaiferber itaiferber requested a review from phausler January 11, 2018 21:01
@itaiferber
Copy link
Contributor Author

@swift-ci Please smoke test Linux

@itaiferber
Copy link
Contributor Author

@swift-ci Please test macOS

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 1e110b8

@jrose-apple
Copy link
Contributor

Given the number of reports this may be worth cherry-picking to 4.1 as well.

@itaiferber
Copy link
Contributor Author

itaiferber commented Jan 11, 2018 •
edited
Loading

@jrose-apple Yep, that's the plan. BTW, looks like unrelated test failure in IRGen/protocol_resilience_thunks.swift — you know if someone's looking into that, or is this a transient failure?

@itaiferber
Copy link
Contributor Author

@swift-ci Please clean test macOS

@jrose-apple
Copy link
Contributor

jrose-apple commented Jan 11, 2018 •
edited
Loading

Looks like a real mistake from someone who forgot we don't have the swifterror convention on i386. I don't know much about that area but I'll check on the file.

@itaiferber
Copy link
Contributor Author

Looks like job #1021 hit this this morning, too: https://ci.swift.org//job/oss-swift-package-osx/1021/consoleFull#-303088932ba62d58e-7248-467b-91e0-c7508d5cf947

@itaiferber
Copy link
Contributor Author

I'm likely going to need to re-run this after #13883 is merged. @shahmishal Is there a way to kill CI jobs so they don't waste needless resources?

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 1e110b8

@jrose-apple
Copy link
Contributor

@swift-ci Please test macOS

@itaiferber itaiferber merged commit e5fdc09 into swiftlang:master Jan 12, 2018
@itaiferber itaiferber deleted the jsonencoder-defer-container-pops branch January 12, 2018 15:58
@itaiferber itaiferber mentioned this pull request Jan 12, 2018
Merged
@itaiferber itaiferber mentioned this pull request Jan 23, 2018
Merged
@CodaFi CodaFi mentioned this pull request Nov 14, 2019
Closed
This was referenced Jan 12, 2018
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@phausler phausler phausler approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@itaiferber @swift-ci @jrose-apple @phausler