ci: run mir-opt tests on PR CI also as 32-bit (for EMIT_MIR_FOR_EACH_BIT_WIDTH).
#70989
tests: don't use only-64bit in mir-opt tests.
- Loading branch information
commit e0084922aa78472ddcd71121c470e25b38dc6ff8
There are no files selected for viewing
This file contains hidden or 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 file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| - // MIR for `main` before Inline | ||
| + // MIR for `main` after Inline | ||
|
|
||
| fn main() -> () { | ||
| let mut _0: (); // return place in scope 0 at $DIR/inline-into-box-place.rs:7:11: 7:11 | ||
| let _1: std::boxed::Box<std::vec::Vec<u32>> as UserTypeProjection { base: UserType(0), projs: [] }; // in scope 0 at $DIR/inline-into-box-place.rs:8:9: 8:11 | ||
| let mut _2: std::boxed::Box<std::vec::Vec<u32>>; // in scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43 | ||
| let mut _3: (); // in scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43 | ||
| + let mut _4: &mut std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43 | ||
| scope 1 { | ||
| debug _x => _1; // in scope 1 at $DIR/inline-into-box-place.rs:8:9: 8:11 | ||
| } | ||
| + scope 2 { | ||
| + } | ||
|
|
||
| bb0: { | ||
| StorageLive(_1); // bb0[0]: scope 0 at $DIR/inline-into-box-place.rs:8:9: 8:11 | ||
| StorageLive(_2); // bb0[1]: scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43 | ||
| _2 = Box(std::vec::Vec<u32>); // bb0[2]: scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43 | ||
| - (*_2) = const std::vec::Vec::<u32>::new() -> [return: bb2, unwind: bb4]; // bb0[3]: scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43 | ||
| + _4 = &mut (*_2); // bb0[3]: scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43 | ||
| + ((*_4).0: alloc::raw_vec::RawVec<u32>) = const ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }: alloc::raw_vec::RawVec::<u32>; // bb0[4]: scope 2 at $SRC_DIR/liballoc/vec.rs:LL:COL | ||
| // ty::Const | ||
| - // + ty: fn() -> std::vec::Vec<u32> {std::vec::Vec::<u32>::new} | ||
| - // + val: Value(Scalar(<ZST>)) | ||
| + // + ty: alloc::raw_vec::RawVec<u32> | ||
| + // + val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) | ||
| // mir::Constant | ||
| - // + span: $DIR/inline-into-box-place.rs:8:33: 8:41 | ||
| - // + user_ty: UserType(1) | ||
| - // + literal: Const { ty: fn() -> std::vec::Vec<u32> {std::vec::Vec::<u32>::new}, val: Value(Scalar(<ZST>)) } | ||
| + // + span: $SRC_DIR/liballoc/vec.rs:LL:COL | ||
| + // + user_ty: UserType(0) | ||
| + // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) } | ||
| + ((*_4).1: usize) = const 0usize; // bb0[5]: scope 2 at $SRC_DIR/liballoc/vec.rs:LL:COL | ||
| + // ty::Const | ||
| + // + ty: usize | ||
| + // + val: Value(Scalar(0x00000000)) | ||
| + // mir::Constant | ||
| + // + span: $SRC_DIR/liballoc/vec.rs:LL:COL | ||
| + // + literal: Const { ty: usize, val: Value(Scalar(0x00000000)) } | ||
| + _1 = move _2; // bb0[6]: scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43 | ||
| + StorageDead(_2); // bb0[7]: scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43 | ||
| + _0 = (); // bb0[8]: scope 0 at $DIR/inline-into-box-place.rs:7:11: 9:2 | ||
| + drop(_1) -> [return: bb2, unwind: bb1]; // bb0[9]: scope 0 at $DIR/inline-into-box-place.rs:9:1: 9:2 | ||
| } | ||
|
|
||
| bb1 (cleanup): { | ||
| resume; // bb1[0]: scope 0 at $DIR/inline-into-box-place.rs:7:1: 9:2 | ||
| } | ||
|
|
||
| bb2: { | ||
| - _1 = move _2; // bb2[0]: scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43 | ||
| - StorageDead(_2); // bb2[1]: scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43 | ||
| - _0 = (); // bb2[2]: scope 0 at $DIR/inline-into-box-place.rs:7:11: 9:2 | ||
| - drop(_1) -> [return: bb3, unwind: bb1]; // bb2[3]: scope 0 at $DIR/inline-into-box-place.rs:9:1: 9:2 | ||
| - } | ||
| - | ||
| - bb3: { | ||
| - StorageDead(_1); // bb3[0]: scope 0 at $DIR/inline-into-box-place.rs:9:1: 9:2 | ||
| - return; // bb3[1]: scope 0 at $DIR/inline-into-box-place.rs:9:2: 9:2 | ||
| - } | ||
| - | ||
| - bb4 (cleanup): { | ||
| - _3 = const alloc::alloc::box_free::<std::vec::Vec<u32>>(move (_2.0: std::ptr::Unique<std::vec::Vec<u32>>)) -> bb1; // bb4[0]: scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43 | ||
| - // ty::Const | ||
| - // + ty: unsafe fn(std::ptr::Unique<std::vec::Vec<u32>>) {alloc::alloc::box_free::<std::vec::Vec<u32>>} | ||
| - // + val: Value(Scalar(<ZST>)) | ||
| - // mir::Constant | ||
| - // + span: $DIR/inline-into-box-place.rs:8:42: 8:43 | ||
| - // + literal: Const { ty: unsafe fn(std::ptr::Unique<std::vec::Vec<u32>>) {alloc::alloc::box_free::<std::vec::Vec<u32>>}, val: Value(Scalar(<ZST>)) } | ||
| + StorageDead(_1); // bb2[0]: scope 0 at $DIR/inline-into-box-place.rs:9:1: 9:2 | ||
| + return; // bb2[1]: scope 0 at $DIR/inline-into-box-place.rs:9:2: 9:2 | ||
| } | ||
| } | ||
|
|
File renamed without changes.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this already implemented somewhere in a prior PR?
Can we also avoid shouting and use the same snake-case as is used for other compiletest options?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The annotation is from #69916 which was copying the style of the old
mir-opttests.I've only added it here to get rid of the stray
only-64bit(all othermir-opttests that have platform differences use// EMIT_MIR_FOR_EACH_BIT_WIDTHalready)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, okay, then fine by me. I would like to see the shouting removed though, seems odd :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I agree, I think the
compiletestprecedent should be stronger than the oldmir-opttesting (which #70721 already removed). Maybe someone from @rust-lang/wg-mir-opt wants to play around with this.(The implementation is also ad-hoc, it doesn't use the standard
compiletestdirectives, we'd want to fix that too).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also is there documentation somewhere on the mir-opt format? I checked rustc-dev-guide, did not find anything.