transpile: fix curl transpile breakage while maintaining a total SrcLoc order
#1163
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rcLoc` order #1128 fixed the non-total (non-transitive) `SrcLoc` ordering, but accidentally broke the `curl` transpilation test in `c2rust-testsuites`, which is tested in CI, but was broken for external contributors PRs (fixed now in #1159). In the `curl` transpilation, a couple of `use` imports (`__sigset_t` and `C2RustUnnamed_4`) were missing, cause the build to fail afterward. I'm still not exactly sure why this fixes the issue while maintaining a transitive, total order, but it passes the total order test and transpiles `curl` correctly now. Hopefully this is a complete fix, and I didn't just fix a one-off error in `curl`.
|
@Kriskras99, does this still also fix the crash you were seeing in #1126? |
|
Still fixes the crash! |
Awesome!! |
fw-immunant
approved these changes
Nov 18, 2024
There was a problem hiding this comment.
This looks sane; it's easier to review by looking at the cumulative diff since df42b55: git diff df42b55eae9ecfd4380004a513a10526ef8776cf..9679a3befb9d5d9431ee7db4d967347edb64536d -- c2rust-transpile/src/c_ast/mod.rs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#1128 fixed the non-total (non-transitive)
SrcLocordering, but accidentally broke thecurltranspilation test inc2rust-testsuites, which is tested in CI, but was broken for external contributors PRs (fixed now in #1159).In the
curltranspilation, a couple ofuseimports (__sigset_tandC2RustUnnamed_4) were missing, cause the build to fail afterward.I'm still not exactly sure why this fixes the issue while maintaining a transitive, total order, but it passes the total order test and transpiles
curlcorrectly now. Hopefully this is a complete fix, and I didn't just fix a one-off error incurl.