c2rust-analyze: Add a cargo wrapper
#1036
Merged
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
|
@fw-immunant, how'd you generate the |
kkysen
force-pushed
the
kkysen/analyze-cargo-wrapper
branch
from
d62b187 to
afd03d3
Compare
aneksteind
reviewed
Nov 1, 2023
aneksteind
reviewed
Nov 1, 2023
aneksteind
reviewed
Nov 1, 2023
aneksteind
reviewed
Nov 1, 2023
aneksteind
approved these changes
Nov 1, 2023
kkysen
force-pushed
the
kkysen/analyze-cargo-wrapper
branch
from
afd03d3 to
c05209b
Compare
…nstead of `if cfg!(unix)`.
It was tricky to get exactly the right ones with the right MSRV.
…rgo` on a whole crate. This copies the approach from `c2rust-instrument`. The main difference are: * We don't care about the instrumentation and metadata `c2rust-instrument` need. * We still allow `c2rust-analyze` to be called as a `rustc_wrapper` directly. More specifically, the `cargo` wrapper is supposed to set `RUST_SYSROOT`. `c2rust-instrument` requires this, while `c2rust-analyze` will re-calculate it if it wasn't. This allows us to keep using the `rustc` wrapper in tests, as the tests are all set up as single files meant to be compiled with `rustc` directly. We can change this, but that'll come later. For full crates we test like `lighttpd-minimal`, we'll definitely switch to the `cargo` wrapper, at the very least for a proof of concept.
…e the `cargo` wrapper. This is done mostly as a proof of concept for now. Ideally we'd want to add it as a method on `Analyze`/`FileCheck` and handle error reporting better. Now that `lighttpd-minimal` is run with `cargo`, we don't need the `extern crate libc;` anymore.
kkysen
force-pushed
the
kkysen/analyze-cargo-wrapper
branch
from
c05209b to
f071ea7
Compare
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.
c2rust-analyzebe acargoandrustcwrapper likec2rust-instrumentis now #709.if cfg!(unix)mis-usages #708.This adds an MVP of a
cargowrapper forc2rust-analyzeso that it can be run on a whole crate likecargo. This copies the approach fromc2rust-instrument, with some minor adjustments:c2rust-instrumentneed, so that code is gone.c2rust-analyzeto be called as arustc_wrapperdirectly. More specifically, thecargowrapper is supposed to setRUST_SYSROOT.c2rust-instrumentrequires this, whilec2rust-analyzewill re-calculate it if it wasn't.This allows us to keep using the
rustcwrapper in tests,as the tests are all set up as single files meant to be compiled with
rustcdirectly.We can change this, but that'll come later. The exception is the
lighttpd_minimalandwith_pdg_filetests, as those run on full crates. I convertedlighttpd_minimalto use thecargowrapper as a proof of concept to show it works. I tried to do the same forwith_pdg_file, but it updated some of the hashes or something so now the PDG binary has out-of-dateDefPathHashes, and I'm not sure how to regenerate a new one.