Skip to content

Bump mir-json, crucible submodules #2864

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

Merged
RyanGlScott merged 2 commits into from
Dec 4, 2025
Merged

Bump mir-json, crucible submodules #2864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ff476b
test1980: Regenerate using schema version 6
RyanGlScott Dec 4, 2025
3e2e56a
Bump mir-json, crucible submodules
RyanGlScott Dec 4, 2025
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
2 changes: 1 addition & 1 deletion deps/crucible
Open in desktop
Submodule crucible updated 18 files
+10 −0 .github/dependabot.yml
+1 −1 .github/workflows/crucible-go-build.yml
+1 −1 .github/workflows/crucible-jvm-build.yml
+1 −1 .github/workflows/crucible-wasm-build.yml
+11 −7 .github/workflows/crux-llvm-build.yml
+11 −7 .github/workflows/crux-mir-build.yml
+14 −64 crucible-mir/src/Mir/Generator.hs
+15 −10 crucible-mir/src/Mir/ParseTranslate.hs
+15 −44 crucible-mir/src/Mir/Trans.hs
+19 −8 crucible-mir/src/Mir/TransCustom.hs
+7 −1 crux-mir/test/conc_eval/array/clone.rs
+9 −2 crux-mir/test/conc_eval/clos/clone_shim.rs
+6 −3 crux-mir/test/conc_eval/fnptr/clone.rs
+7 −1 crux-mir/test/conc_eval/tuple/clone.rs
+7 −1 crux-mir/test/conc_eval/tuple/clone_rec.rs
+7 −1 crux-mir/test/conc_eval/tuple/clone_struct.rs
+1 −0 crux-mir/test/conc_eval/tuple/clone_unit.rs
+7 −1 crux-mir/test/symb_eval/vec/clone.rs
2 changes: 1 addition & 1 deletion deps/mir-json
Open in desktop
Submodule mir-json updated 5 files
+18 −8 src/bin/mir-json-rustc-wrapper.rs
+8 −4 src/bin/mir-json.rs
+1 −1 tests/issues/test0077/test.sh
+16 −0 tests/issues/test0201/README.md
+33 −0 tests/issues/test0201/test.sh
2 changes: 2 additions & 0 deletions intTests/test1980/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
MIR_SRCS=test
include ../support/mir-blobs.mk
2 changes: 1 addition & 1 deletion intTests/test1980/test.linked-mir.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":5,"fns":[{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}],"body":{"blocks":[{"block":{"data":[],"terminator":{"args":[{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}},"kind":"Copy"}],"destination":[{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}},"bb1"],"func":{"data":{"rendered":{"kind":"zst"},"ty":"ty::FnDef::bf45af6907508207"},"kind":"Constant"},"kind":"Call","pos":"test.rs:2:25: 2:29"}},"blockid":"bb0"},{"block":{"data":[],"terminator":{"kind":"Return","pos":"test.rs:2:31: 2:31"}},"blockid":"bb1"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}]},"name":"test/9464768e::g","return_ty":"ty::u8","spread_arg":null},{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}],"body":{"blocks":[{"block":{"data":[],"terminator":{"args":[{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}},"kind":"Copy"}],"destination":[{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}},"bb1"],"func":{"data":{"rendered":{"kind":"zst"},"ty":"ty::FnDef::b180de67029c78f2"},"kind":"Constant"},"kind":"Call","pos":"test.rs:3:27: 3:31"}},"blockid":"bb0"},{"block":{"data":[],"terminator":{"kind":"Return","pos":"test.rs:3:33: 3:33"}},"blockid":"bb1"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}]},"name":"test/9464768e::h","return_ty":"ty::u16","spread_arg":null},{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}],"body":{"blocks":[{"block":{"data":[{"kind":"Assign","lhs":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}},"pos":"test.rs:1:26: 1:27","rhs":{"kind":"Use","usevar":{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}},"kind":"Move"}}}],"terminator":{"kind":"Return","pos":"test.rs:1:29: 1:29"}},"blockid":"bb0"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}]},"name":"test/9464768e::f::_inst2efc261c2cb07b6c[0]","return_ty":"ty::u8","spread_arg":null},{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}],"body":{"blocks":[{"block":{"data":[{"kind":"Assign","lhs":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}},"pos":"test.rs:1:26: 1:27","rhs":{"kind":"Use","usevar":{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}},"kind":"Move"}}}],"terminator":{"kind":"Return","pos":"test.rs:1:29: 1:29"}},"blockid":"bb0"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}]},"name":"test/9464768e::f::_inst3c788d91c468a39d[0]","return_ty":"ty::u16","spread_arg":null}],"adts":[],"statics":[],"vtables":[],"traits":[],"intrinsics":[{"inst":{"args":[],"def_id":"test/9464768e::g","kind":"Item"},"name":"test/9464768e::g"},{"inst":{"args":[],"def_id":"test/9464768e::h","kind":"Item"},"name":"test/9464768e::h"},{"inst":{"args":["ty::u8"],"def_id":"test/9464768e::f","kind":"Item"},"name":"test/9464768e::f::_inst2efc261c2cb07b6c[0]"},{"inst":{"args":["ty::u16"],"def_id":"test/9464768e::f","kind":"Item"},"name":"test/9464768e::f::_inst3c788d91c468a39d[0]"}],"tys":[{"layout":{"align":1,"size":1},"name":"ty::u8","needs_drop":false,"ty":{"kind":"Uint","uintkind":{"kind":"U8"}}},{"layout":{"align":1,"size":0},"name":"ty::FnDef::bf45af6907508207","needs_drop":false,"ty":{"defid":"test/9464768e::f::_inst2efc261c2cb07b6c[0]","kind":"FnDef"}},{"layout":{"align":2,"size":2},"name":"ty::u16","needs_drop":false,"ty":{"kind":"Uint","uintkind":{"kind":"U16"}}},{"layout":{"align":1,"size":0},"name":"ty::FnDef::b180de67029c78f2","needs_drop":false,"ty":{"defid":"test/9464768e::f::_inst3c788d91c468a39d[0]","kind":"FnDef"}}],"lang_items":[],"roots":["test/9464768e::g","test/9464768e::h"],"tests":[]}
{"version":6,"fns":[{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}],"body":{"blocks":[{"block":{"data":[],"terminator":{"args":[{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}},"kind":"Copy"}],"destination":[{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}},"bb1"],"func":{"data":{"rendered":{"kind":"zst"},"ty":"ty::FnDef::91a0dcb270812297"},"kind":"Constant"},"kind":"Call","pos":"test.rs:3:27: 3:31"}},"blockid":"bb0"},{"block":{"data":[],"terminator":{"kind":"Return","pos":"test.rs:3:33: 3:33"}},"blockid":"bb1"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}]},"name":"test/f90bd504::h","return_ty":"ty::u16","spread_arg":null},{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}],"body":{"blocks":[{"block":{"data":[],"terminator":{"args":[{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}},"kind":"Copy"}],"destination":[{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}},"bb1"],"func":{"data":{"rendered":{"kind":"zst"},"ty":"ty::FnDef::918d0e1293e4f0d2"},"kind":"Constant"},"kind":"Call","pos":"test.rs:2:25: 2:29"}},"blockid":"bb0"},{"block":{"data":[],"terminator":{"kind":"Return","pos":"test.rs:2:31: 2:31"}},"blockid":"bb1"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}]},"name":"test/f90bd504::g","return_ty":"ty::u8","spread_arg":null},{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}],"body":{"blocks":[{"block":{"data":[{"kind":"Assign","lhs":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}},"pos":"test.rs:1:26: 1:27","rhs":{"kind":"Use","usevar":{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}},"kind":"Move"}}}],"terminator":{"kind":"Return","pos":"test.rs:1:29: 1:29"}},"blockid":"bb0"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}]},"name":"test/f90bd504::f::_inst3c788d91c468a39d[0]","return_ty":"ty::u16","spread_arg":null},{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}],"body":{"blocks":[{"block":{"data":[{"kind":"Assign","lhs":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}},"pos":"test.rs:1:26: 1:27","rhs":{"kind":"Use","usevar":{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}},"kind":"Move"}}}],"terminator":{"kind":"Return","pos":"test.rs:1:29: 1:29"}},"blockid":"bb0"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}]},"name":"test/f90bd504::f::_inst2efc261c2cb07b6c[0]","return_ty":"ty::u8","spread_arg":null}],"adts":[],"statics":[],"vtables":[],"traits":[],"intrinsics":[{"inst":{"args":[],"def_id":"test/f90bd504::h","kind":"Item"},"name":"test/f90bd504::h"},{"inst":{"args":[],"def_id":"test/f90bd504::g","kind":"Item"},"name":"test/f90bd504::g"},{"inst":{"args":["ty::u16"],"def_id":"test/f90bd504::f","kind":"Item"},"name":"test/f90bd504::f::_inst3c788d91c468a39d[0]"},{"inst":{"args":["ty::u8"],"def_id":"test/f90bd504::f","kind":"Item"},"name":"test/f90bd504::f::_inst2efc261c2cb07b6c[0]"}],"tys":[{"layout":{"align":2,"size":2},"name":"ty::u16","needs_drop":false,"ty":{"kind":"Uint","uintkind":{"kind":"U16"}}},{"layout":{"align":1,"size":0},"name":"ty::FnDef::91a0dcb270812297","needs_drop":false,"ty":{"defid":"test/f90bd504::f::_inst3c788d91c468a39d[0]","kind":"FnDef"}},{"layout":{"align":1,"size":1},"name":"ty::u8","needs_drop":false,"ty":{"kind":"Uint","uintkind":{"kind":"U8"}}},{"layout":{"align":1,"size":0},"name":"ty::FnDef::918d0e1293e4f0d2","needs_drop":false,"ty":{"defid":"test/f90bd504::f::_inst2efc261c2cb07b6c[0]","kind":"FnDef"}}],"lang_items":[],"roots":["test/f90bd504::g","test/f90bd504::h"],"tests":[]}
Loading