Skip to content

Commit 0ae3cd0

Browse files
committed
Update rebased compiletest expectations
1 parent c665c62 commit 0ae3cd0

File tree

4 files changed

+51
-51
lines changed

4 files changed

+51
-51
lines changed

tests/compiletests/ui/dis/panic_builtin_bounds_check.stderr

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,53 +4,53 @@ OpExtension "SPV_KHR_non_semantic_info"
44
OpMemoryModel Logical Simple
55
OpEntryPoint Fragment %2 "main"
66
OpExecutionMode %2 OriginUpperLeft
7-
%3 = OpString "/n[Rust panicked at $SYSROOT/lib/rustlib/src/rust/library/core/src/panicking.rs:276:5]/n index out of bounds: the len is %u but the index is %u/n in main()/n"
8-
%4 = OpString $SYSROOT/lib/rustlib/src/rust/library/core/src/panicking.rs"
9-
%5 = OpString "$DIR/panic_builtin_bounds_check.rs"
10-
OpDecorate %6 ArrayStride 4
11-
%7 = OpTypeVoid
12-
%8 = OpTypeFunction %7
13-
%9 = OpTypeInt 32 0
14-
%10 = OpConstant %9 4
15-
%11 = OpTypeArray %9 %10
16-
%12 = OpTypePointer Function %11
17-
%6 = OpTypeArray %9 %10
18-
%13 = OpConstant %9 0
19-
%14 = OpConstant %9 1
20-
%15 = OpConstant %9 2
21-
%16 = OpConstant %9 3
22-
%17 = OpTypeBool
23-
%18 = OpConstant %9 5
24-
%19 = OpTypePointer Function %9
25-
%2 = OpFunction %7 None %8
26-
%20 = OpLabel
27-
OpLine %5 32 4
28-
%21 = OpVariable %12 Function
29-
OpLine %5 32 23
30-
%22 = OpCompositeConstruct %6 %13 %14 %15 %16
31-
OpLine %5 27 4
32-
%23 = OpCompositeExtract %9 %22 0
33-
%24 = OpCompositeExtract %9 %22 1
34-
%25 = OpCompositeExtract %9 %22 2
35-
%26 = OpCompositeExtract %9 %22 3
36-
%27 = OpCompositeConstruct %11 %23 %24 %25 %26
37-
OpStore %21 %27
38-
%28 = OpULessThan %17 %18 %10
7+
%3 = OpString "/n[Rust panicked at $DIR/panic_builtin_bounds_check.rs:27:5]/n index out of bounds: the len is %u but the index is %u/n in main()/n"
8+
%4 = OpString "$DIR/panic_builtin_bounds_check.rs"
9+
OpDecorate %5 ArrayStride 4
10+
%6 = OpTypeVoid
11+
%7 = OpTypeFunction %6
12+
%8 = OpTypeInt 32 0
13+
%9 = OpConstant %8 4
14+
%10 = OpTypeArray %8 %9
15+
%11 = OpTypePointer Function %10
16+
%5 = OpTypeArray %8 %9
17+
%12 = OpConstant %8 0
18+
%13 = OpConstant %8 1
19+
%14 = OpConstant %8 2
20+
%15 = OpConstant %8 3
21+
%16 = OpTypeBool
22+
%17 = OpConstant %8 5
23+
%18 = OpTypePointer Function %8
24+
%2 = OpFunction %6 None %7
25+
%19 = OpLabel
26+
OpLine %4 32 4
27+
%20 = OpVariable %11 Function
28+
OpLine %4 32 23
29+
%21 = OpCompositeConstruct %5 %12 %13 %14 %15
30+
OpLine %4 32 4
31+
%22 = OpCompositeExtract %8 %21 0
32+
%23 = OpCompositeExtract %8 %21 1
33+
%24 = OpCompositeExtract %8 %21 2
34+
%25 = OpCompositeExtract %8 %21 3
35+
%26 = OpCompositeConstruct %10 %22 %23 %24 %25
36+
OpStore %20 %26
37+
OpLine %4 27 4
38+
%27 = OpULessThan %16 %17 %9
3939
OpNoLine
40-
OpSelectionMerge %29 None
41-
OpBranchConditional %28 %30 %31
40+
OpSelectionMerge %28 None
41+
OpBranchConditional %27 %29 %30
42+
%29 = OpLabel
43+
OpBranch %28
4244
%30 = OpLabel
43-
OpBranch %29
44-
%31 = OpLabel
45-
OpLine %4 276 4
46-
%32 = OpExtInst %7 %1 1 %3 %10 %18
45+
OpLine %4 27 4
46+
%31 = OpExtInst %6 %1 1 %3 %9 %17
4747
OpNoLine
4848
OpReturn
49-
%29 = OpLabel
50-
OpLine %5 27 4
51-
%33 = OpIAdd %9 %13 %18
52-
%34 = OpInBoundsAccessChain %19 %21 %33
53-
%35 = OpLoad %9 %34
49+
%28 = OpLabel
50+
OpLine %4 27 4
51+
%32 = OpIAdd %8 %12 %17
52+
%33 = OpInBoundsAccessChain %18 %20 %32
53+
%34 = OpLoad %8 %33
5454
OpNoLine
5555
OpReturn
5656
OpFunctionEnd

tests/compiletests/ui/lang/consts/nested-ref.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: `#[inline(never)]` function `nested_ref::deep_load` has been inlined
2-
--> $DIR/nested-ref.rs:12:4
2+
--> <$DIR/nested-ref.rs>:12:4
33
|
44
LL | fn deep_load(r: &'static &'static u32) -> u32 {
55
| ^^^^^^^^^
@@ -8,7 +8,7 @@ LL | fn deep_load(r: &'static &'static u32) -> u32 {
88
= note: called from `nested_ref::main`
99

1010
warning: `#[inline(never)]` function `nested_ref::deep_transpose` has been inlined
11-
--> $DIR/nested-ref.rs:19:4
11+
--> <$DIR/nested-ref.rs>:19:4
1212
|
1313
LL | fn deep_transpose(r: &'static &'static Mat2) -> Mat2 {
1414
| ^^^^^^^^^^^^^^

tests/compiletests/ui/lang/core/ref/member_ref_arg-broken.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: `#[inline(never)]` function `member_ref_arg_broken::f` has been inlined
2-
--> $DIR/member_ref_arg-broken.rs:20:4
2+
--> <$DIR/member_ref_arg-broken.rs>:20:4
33
|
44
LL | fn f(x: &u32) -> u32 {
55
| ^
@@ -8,7 +8,7 @@ LL | fn f(x: &u32) -> u32 {
88
= note: called from `member_ref_arg_broken::main`
99

1010
warning: `#[inline(never)]` function `member_ref_arg_broken::g` has been inlined
11-
--> $DIR/member_ref_arg-broken.rs:25:4
11+
--> <$DIR/member_ref_arg-broken.rs>:25:4
1212
|
1313
LL | fn g(xy: (&u32, &u32)) -> (u32, u32) {
1414
| ^
@@ -17,7 +17,7 @@ LL | fn g(xy: (&u32, &u32)) -> (u32, u32) {
1717
= note: called from `member_ref_arg_broken::main`
1818

1919
warning: `#[inline(never)]` function `member_ref_arg_broken::h` has been inlined
20-
--> $DIR/member_ref_arg-broken.rs:30:4
20+
--> <$DIR/member_ref_arg-broken.rs>:30:4
2121
|
2222
LL | fn h(xyz: (&u32, &u32, &u32)) -> (u32, u32, u32) {
2323
| ^
@@ -26,7 +26,7 @@ LL | fn h(xyz: (&u32, &u32, &u32)) -> (u32, u32, u32) {
2626
= note: called from `member_ref_arg_broken::main`
2727

2828
warning: `#[inline(never)]` function `member_ref_arg_broken::h_newtyped` has been inlined
29-
--> $DIR/member_ref_arg-broken.rs:41:4
29+
--> <$DIR/member_ref_arg-broken.rs>:41:4
3030
|
3131
LL | fn h_newtyped(xyz: ((&u32, &u32, &u32),)) -> (u32, u32, u32) {
3232
| ^^^^^^^^^^

tests/compiletests/ui/lang/core/ref/member_ref_arg.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: `#[inline(never)]` function `member_ref_arg::f` has been inlined
2-
--> $DIR/member_ref_arg.rs:14:4
2+
--> <$DIR/member_ref_arg.rs>:14:4
33
|
44
LL | fn f(x: &u32) {}
55
| ^
@@ -8,7 +8,7 @@ LL | fn f(x: &u32) {}
88
= note: called from `member_ref_arg::main`
99

1010
warning: `#[inline(never)]` function `member_ref_arg::g` has been inlined
11-
--> $DIR/member_ref_arg.rs:17:4
11+
--> <$DIR/member_ref_arg.rs>:17:4
1212
|
1313
LL | fn g(xy: (&u32, &u32)) {}
1414
| ^

0 commit comments

Comments
 (0)