crux-mir-comp: Support nightly-2023-01-23
#1891
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
This patch bumps the `crucible` submodule to bring in the changes from GaloisInc/crucible#1096 and updates the code in `crucible-mir-comp` and `crux-mir-comp` accordingly. Some highlights: * All of the `crux-mir-comp` test cases now use `crux::test` instead of `crux_test`. * All of the `crux-mir-comp` test cases now scrub out the values of crate hash disambiguators to make their output more stable. * The overrides in `crux-mir-comp` no longer depend on the specific disambiguator values being used, which makes them work with the sometimes unpredictable hash values used for crate disambiguators. * I have added a `tyToShape` case for `TyStr` to handle new kinds of static values that arise in the new Rust nightly (mostly coming from constant values in the `fmt` crate). The code for this case is nearly identical to that in the `TySlice` case. * There are now static values of type `TyFnPtr` in the new Rust nightly (mostly coming from constant values in the `fmt` crate), so in order to handle them in `clobberGlobals`, I needed to add a `FnPtrShape` data constructor to `TypeShape`. This is mostly a quick hack, since I implemented all other functionality for `FnPtrShape` with calls to `error`. Nevertheless, that is enough to make all of the tests pass. We can always fill out the calls to `error` later if need be.
RyanGlScott
force-pushed
the
crux-mir-nightly-2023-01-23
branch
from
b19d1da
to
ebc7daf
Compare
RyanGlScott
added
the
ready-to-merge
29 tasks
This pull request was closed.
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.
This patch bumps the
cruciblesubmodule to bring in the changes from GaloisInc/crucible#1096 and updates the code incrucible-mir-compandcrux-mir-compaccordingly. Some highlights:crux-mir-comptest cases now usecrux::testinstead ofcrux_test.crux-mir-comptest cases now scrub out the values of crate hash disambiguators to make their output more stable.crux-mir-compno longer depend on the specific disambiguator values being used, which makes them work with the sometimes unpredictable hash values used for crate disambiguators.tyToShapecase forTyStrto handle new kinds of static values that arise in the new Rust nightly (mostly coming from constant values in thefmtcrate). The code for this case is nearly identical to that in theTySlicecase.TyFnPtrin the new Rust nightly (mostly coming from constant values in thefmtcrate), so in order to handle them inclobberGlobals, I needed to add aFnPtrShapedata constructor toTypeShape. This is mostly a quick hack, since I implemented all other functionality forFnPtrShapewith calls toerror. Nevertheless, that is enough to make all of the tests pass. We can always fill out the calls toerrorlater if need be.