Skip to content

Commit fe796cd

Browse files
JakobDegenJakobDegen
committed
Bless tests that broke in a trivial way due to change in deaggregation
1 parent 4cbe13a commit fe796cd

8 files changed

+18
-11
lines changed

Diff for: ‎src/test/mir-opt/const_goto_storage.match_nested_if.ConstGoto.diff

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
bb0: {
1818
StorageLive(_1); // scope 0 at $DIR/const_goto_storage.rs:3:9: 3:12
1919
- StorageLive(_2); // scope 0 at $DIR/const_goto_storage.rs:3:21: 3:23
20+
- nop; // scope 0 at $DIR/const_goto_storage.rs:3:21: 3:23
2021
- StorageLive(_3); // scope 0 at $DIR/const_goto_storage.rs:4:15: 8:10
2122
- StorageLive(_4); // scope 0 at $DIR/const_goto_storage.rs:4:18: 4:76
2223
- StorageLive(_5); // scope 0 at $DIR/const_goto_storage.rs:4:21: 4:52

Diff for: ‎src/test/mir-opt/derefer_test.main.Derefer.diff

+2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@
2525

2626
bb0: {
2727
StorageLive(_1); // scope 0 at $DIR/derefer_test.rs:3:9: 3:14
28+
Deinit(_1); // scope 0 at $DIR/derefer_test.rs:3:17: 3:24
2829
(_1.0: i32) = const 42_i32; // scope 0 at $DIR/derefer_test.rs:3:17: 3:24
2930
(_1.1: i32) = const 43_i32; // scope 0 at $DIR/derefer_test.rs:3:17: 3:24
3031
StorageLive(_2); // scope 1 at $DIR/derefer_test.rs:4:9: 4:14
3132
StorageLive(_3); // scope 1 at $DIR/derefer_test.rs:4:22: 4:28
3233
_3 = &mut _1; // scope 1 at $DIR/derefer_test.rs:4:22: 4:28
34+
Deinit(_2); // scope 1 at $DIR/derefer_test.rs:4:17: 4:29
3335
(_2.0: i32) = const 99_i32; // scope 1 at $DIR/derefer_test.rs:4:17: 4:29
3436
(_2.1: &mut (i32, i32)) = move _3; // scope 1 at $DIR/derefer_test.rs:4:17: 4:29
3537
StorageDead(_3); // scope 1 at $DIR/derefer_test.rs:4:28: 4:29

Diff for: ‎src/test/mir-opt/derefer_test_multiple.main.Derefer.diff

+4
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,27 @@
3939

4040
bb0: {
4141
StorageLive(_1); // scope 0 at $DIR/derefer_test_multiple.rs:3:9: 3:14
42+
Deinit(_1); // scope 0 at $DIR/derefer_test_multiple.rs:3:17: 3:25
4243
(_1.0: i32) = const 42_i32; // scope 0 at $DIR/derefer_test_multiple.rs:3:17: 3:25
4344
(_1.1: i32) = const 43_i32; // scope 0 at $DIR/derefer_test_multiple.rs:3:17: 3:25
4445
StorageLive(_2); // scope 1 at $DIR/derefer_test_multiple.rs:4:9: 4:14
4546
StorageLive(_3); // scope 1 at $DIR/derefer_test_multiple.rs:4:22: 4:28
4647
_3 = &mut _1; // scope 1 at $DIR/derefer_test_multiple.rs:4:22: 4:28
48+
Deinit(_2); // scope 1 at $DIR/derefer_test_multiple.rs:4:17: 4:29
4749
(_2.0: i32) = const 99_i32; // scope 1 at $DIR/derefer_test_multiple.rs:4:17: 4:29
4850
(_2.1: &mut (i32, i32)) = move _3; // scope 1 at $DIR/derefer_test_multiple.rs:4:17: 4:29
4951
StorageDead(_3); // scope 1 at $DIR/derefer_test_multiple.rs:4:28: 4:29
5052
StorageLive(_4); // scope 2 at $DIR/derefer_test_multiple.rs:5:9: 5:14
5153
StorageLive(_5); // scope 2 at $DIR/derefer_test_multiple.rs:5:22: 5:28
5254
_5 = &mut _2; // scope 2 at $DIR/derefer_test_multiple.rs:5:22: 5:28
55+
Deinit(_4); // scope 2 at $DIR/derefer_test_multiple.rs:5:17: 5:29
5356
(_4.0: i32) = const 11_i32; // scope 2 at $DIR/derefer_test_multiple.rs:5:17: 5:29
5457
(_4.1: &mut (i32, &mut (i32, i32))) = move _5; // scope 2 at $DIR/derefer_test_multiple.rs:5:17: 5:29
5558
StorageDead(_5); // scope 2 at $DIR/derefer_test_multiple.rs:5:28: 5:29
5659
StorageLive(_6); // scope 3 at $DIR/derefer_test_multiple.rs:6:9: 6:14
5760
StorageLive(_7); // scope 3 at $DIR/derefer_test_multiple.rs:6:22: 6:28
5861
_7 = &mut _4; // scope 3 at $DIR/derefer_test_multiple.rs:6:22: 6:28
62+
Deinit(_6); // scope 3 at $DIR/derefer_test_multiple.rs:6:17: 6:29
5963
(_6.0: i32) = const 13_i32; // scope 3 at $DIR/derefer_test_multiple.rs:6:17: 6:29
6064
(_6.1: &mut (i32, &mut (i32, &mut (i32, i32)))) = move _7; // scope 3 at $DIR/derefer_test_multiple.rs:6:17: 6:29
6165
StorageDead(_7); // scope 3 at $DIR/derefer_test_multiple.rs:6:28: 6:29

Diff for: ‎src/test/ui/consts/const-eval/ub-enum.32bit.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ error[E0080]: it is undefined behavior to use this value
7979
--> $DIR/ub-enum.rs:60:1
8080
|
8181
LL | const BAD_ENUM2_OPTION_PTR: Option<Enum2> = unsafe { mem::transmute(&0) };
82-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed at .<enum-tag>: encountered pointer to alloc29, but expected initialized plain (non-pointer) bytes
82+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed at .<enum-tag>: encountered pointer to alloc30, but expected initialized plain (non-pointer) bytes
8383
|
8484
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
8585
= note: the raw bytes of the constant (size: 4, align: 4) {
86-
╾─alloc29─╼ │ ╾──╼
86+
╾─alloc30─╼ │ ╾──╼
8787
}
8888

8989
error[E0080]: it is undefined behavior to use this value

Diff for: ‎src/test/ui/consts/const-eval/ub-enum.64bit.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ error[E0080]: it is undefined behavior to use this value
7979
--> $DIR/ub-enum.rs:60:1
8080
|
8181
LL | const BAD_ENUM2_OPTION_PTR: Option<Enum2> = unsafe { mem::transmute(&0) };
82-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed at .<enum-tag>: encountered pointer to alloc29, but expected initialized plain (non-pointer) bytes
82+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed at .<enum-tag>: encountered pointer to alloc30, but expected initialized plain (non-pointer) bytes
8383
|
8484
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
8585
= note: the raw bytes of the constant (size: 8, align: 8) {
86-
╾───────alloc29───────╼ │ ╾──────╼
86+
╾───────alloc30───────╼ │ ╾──────╼
8787
}
8888

8989
error[E0080]: it is undefined behavior to use this value

Diff for: ‎src/test/ui/consts/const-eval/ub-ref-ptr.32bit.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ error[E0080]: it is undefined behavior to use this value
145145
--> $DIR/ub-ref-ptr.rs:55:1
146146
|
147147
LL | const DATA_FN_PTR: fn() = unsafe { mem::transmute(&13) };
148-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered pointer to alloc41, but expected a function pointer
148+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered pointer to alloc43, but expected a function pointer
149149
|
150150
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
151151
= note: the raw bytes of the constant (size: 4, align: 4) {
152-
╾─alloc41─╼ │ ╾──╼
152+
╾─alloc43─╼ │ ╾──╼
153153
}
154154

155155
error: aborting due to 14 previous errors

Diff for: ‎src/test/ui/consts/const-eval/ub-ref-ptr.64bit.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ error[E0080]: it is undefined behavior to use this value
145145
--> $DIR/ub-ref-ptr.rs:55:1
146146
|
147147
LL | const DATA_FN_PTR: fn() = unsafe { mem::transmute(&13) };
148-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered pointer to alloc41, but expected a function pointer
148+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered pointer to alloc43, but expected a function pointer
149149
|
150150
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
151151
= note: the raw bytes of the constant (size: 8, align: 8) {
152-
╾───────alloc41───────╼ │ ╾──────╼
152+
╾───────alloc43───────╼ │ ╾──────╼
153153
}
154154

155155
error: aborting due to 14 previous errors

Diff for: ‎src/test/ui/consts/offset_from_ub.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ error[E0080]: evaluation of constant value failed
4040
--> $DIR/offset_from_ub.rs:52:14
4141
|
4242
LL | unsafe { ptr_offset_from(end_ptr, start_ptr) }
43-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ out-of-bounds offset_from: alloc18 has size 4, so pointer at offset 10 is out-of-bounds
43+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ out-of-bounds offset_from: alloc20 has size 4, so pointer at offset 10 is out-of-bounds
4444

4545
error[E0080]: evaluation of constant value failed
4646
--> $DIR/offset_from_ub.rs:61:14
4747
|
4848
LL | unsafe { ptr_offset_from(start_ptr, end_ptr) }
49-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ out-of-bounds offset_from: alloc21 has size 4, so pointer at offset 10 is out-of-bounds
49+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ out-of-bounds offset_from: alloc23 has size 4, so pointer at offset 10 is out-of-bounds
5050

5151
error[E0080]: evaluation of constant value failed
5252
--> $DIR/offset_from_ub.rs:69:14
5353
|
5454
LL | unsafe { ptr_offset_from(end_ptr, end_ptr) }
55-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ out-of-bounds offset_from: alloc24 has size 4, so pointer at offset 10 is out-of-bounds
55+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ out-of-bounds offset_from: alloc26 has size 4, so pointer at offset 10 is out-of-bounds
5656

5757
error: aborting due to 8 previous errors
5858

0 commit comments

Comments
 (0)