Skip to content

Commit 9b4a077

Browse files
author
Ariel Ben-Yehuda
authored
Rollup merge of rust-lang#46290 - scottmcm:i128-from-compiler-builtins, r=nagisa
Update compiler-builtins and use it in the 128-bit lowering MIR test This picks up the lang item implementations from rust-lang/compiler-builtins#210 cc rust-lang#45676 @est31 @nagisa
2 parents 9d974ef + c80fee2 commit 9b4a077

File tree

3 files changed

+33
-94
lines changed

3 files changed

+33
-94
lines changed

‎src/libcompiler_builtins‎

‎src/test/mir-opt/lower_128bit_debug_test.rs‎

Lines changed: 16 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,6 @@
1111
// compile-flags: -Z lower_128bit_ops -C debug_assertions=yes
1212

1313
#![feature(i128_type)]
14-
#![feature(lang_items)]
15-
16-
#[lang="i128_div"]
17-
fn i128_div(_x: i128, _y: i128) -> i128 { 3 }
18-
#[lang="u128_div"]
19-
fn u128_div(_x: u128, _y: u128) -> u128 { 4 }
20-
#[lang="i128_rem"]
21-
fn i128_rem(_x: i128, _y: i128) -> i128 { 5 }
22-
#[lang="u128_rem"]
23-
fn u128_rem(_x: u128, _y: u128) -> u128 { 6 }
24-
25-
#[lang="i128_addo"]
26-
fn i128_addo(_x: i128, _y: i128) -> (i128, bool) { (0, false) }
27-
#[lang="u128_addo"]
28-
fn u128_addo(_x: u128, _y: u128) -> (u128, bool) { (1, false) }
29-
#[lang="i128_subo"]
30-
fn i128_subo(_x: i128, _y: i128) -> (i128, bool) { (2, false) }
31-
#[lang="u128_subo"]
32-
fn u128_subo(_x: u128, _y: u128) -> (u128, bool) { (3, false) }
33-
#[lang="i128_mulo"]
34-
fn i128_mulo(_x: i128, _y: i128) -> (i128, bool) { (4, false) }
35-
#[lang="u128_mulo"]
36-
fn u128_mulo(_x: u128, _y: u128) -> (u128, bool) { (5, false) }
37-
#[lang="i128_shlo"]
38-
fn i128_shlo(_x: i128, _y: u128) -> (i128, bool) { (6, false) }
39-
#[lang="u128_shlo"]
40-
fn u128_shlo(_x: u128, _y: u128) -> (u128, bool) { (6, false) }
41-
#[lang="i128_shro"]
42-
fn i128_shro(_x: i128, _y: u128) -> (i128, bool) { (7, false) }
43-
#[lang="u128_shro"]
44-
fn u128_shro(_x: u128, _y: u128) -> (u128, bool) { (8, false) }
4514

4615
fn test_signed(mut x: i128) -> i128 {
4716
x += 1;
@@ -66,31 +35,31 @@ fn test_unsigned(mut x: u128) -> u128 {
6635
}
6736

6837
fn main() {
69-
test_signed(-200);
70-
test_unsigned(200);
38+
assert_eq!(test_signed(-222), -1);
39+
assert_eq!(test_unsigned(200), 2);
7140
}
7241

7342
// END RUST SOURCE
7443

7544
// START rustc.test_signed.Lower128Bit.after.mir
76-
// _2 = const i128_addo(_1, const 1i128) -> bb10;
45+
// _2 = const compiler_builtins::int::addsub::rust_i128_addo(_1, const 1i128) -> bb10;
7746
// ...
7847
// _1 = move (_2.0: i128);
79-
// _3 = const i128_subo(_1, const 2i128) -> bb11;
48+
// _3 = const compiler_builtins::int::addsub::rust_i128_subo(_1, const 2i128) -> bb11;
8049
// ...
8150
// _1 = move (_3.0: i128);
82-
// _4 = const i128_mulo(_1, const 3i128) -> bb12;
51+
// _4 = const compiler_builtins::int::mul::rust_i128_mulo(_1, const 3i128) -> bb12;
8352
// ...
8453
// _1 = move (_4.0: i128);
8554
// ...
86-
// _1 = const i128_div(_1, const 4i128) -> bb13;
55+
// _1 = const compiler_builtins::int::sdiv::rust_i128_div(_1, const 4i128) -> bb13;
8756
// ...
88-
// _1 = const i128_rem(_1, const 5i128) -> bb15;
57+
// _1 = const compiler_builtins::int::sdiv::rust_i128_rem(_1, const 5i128) -> bb15;
8958
// ...
9059
// _1 = move (_13.0: i128);
9160
// ...
9261
// _17 = const 7i32 as u128 (Misc);
93-
// _14 = const i128_shro(_1, move _17) -> bb16;
62+
// _14 = const compiler_builtins::int::shift::rust_i128_shro(_1, move _17) -> bb16;
9463
// ...
9564
// _1 = move (_14.0: i128);
9665
// ...
@@ -103,30 +72,30 @@ fn main() {
10372
// assert(!move (_13.1: bool), "attempt to shift left with overflow") -> bb8;
10473
// ...
10574
// _16 = const 6i32 as u128 (Misc);
106-
// _13 = const i128_shlo(_1, move _16) -> bb14;
75+
// _13 = const compiler_builtins::int::shift::rust_i128_shlo(_1, move _16) -> bb14;
10776
// ...
10877
// assert(!move (_14.1: bool), "attempt to shift right with overflow") -> bb9;
10978
// END rustc.test_signed.Lower128Bit.after.mir
11079

11180
// START rustc.test_unsigned.Lower128Bit.after.mir
112-
// _2 = const u128_addo(_1, const 1u128) -> bb8;
81+
// _2 = const compiler_builtins::int::addsub::rust_u128_addo(_1, const 1u128) -> bb8;
11382
// ...
11483
// _1 = move (_2.0: u128);
115-
// _3 = const u128_subo(_1, const 2u128) -> bb9;
84+
// _3 = const compiler_builtins::int::addsub::rust_u128_subo(_1, const 2u128) -> bb9;
11685
// ...
11786
// _1 = move (_3.0: u128);
118-
// _4 = const u128_mulo(_1, const 3u128) -> bb10;
87+
// _4 = const compiler_builtins::int::mul::rust_u128_mulo(_1, const 3u128) -> bb10;
11988
// ...
12089
// _1 = move (_4.0: u128);
12190
// ...
122-
// _1 = const u128_div(_1, const 4u128) -> bb11;
91+
// _1 = const compiler_builtins::int::udiv::rust_u128_div(_1, const 4u128) -> bb11;
12392
// ...
124-
// _1 = const u128_rem(_1, const 5u128) -> bb13;
93+
// _1 = const compiler_builtins::int::udiv::rust_u128_rem(_1, const 5u128) -> bb13;
12594
// ...
12695
// _1 = move (_7.0: u128);
12796
// ...
12897
// _11 = const 7i32 as u128 (Misc);
129-
// _8 = const u128_shro(_1, move _11) -> bb14;
98+
// _8 = const compiler_builtins::int::shift::rust_u128_shro(_1, move _11) -> bb14;
13099
// ...
131100
// _1 = move (_8.0: u128);
132101
// ...
@@ -139,7 +108,7 @@ fn main() {
139108
// assert(!move (_7.1: bool), "attempt to shift left with overflow") -> bb6;
140109
// ...
141110
// _10 = const 6i32 as u128 (Misc);
142-
// _7 = const u128_shlo(_1, move _10) -> bb12;
111+
// _7 = const compiler_builtins::int::shift::rust_u128_shlo(_1, move _10) -> bb12;
143112
// ...
144113
// assert(!move (_8.1: bool), "attempt to shift right with overflow") -> bb7;
145114
// END rustc.test_unsigned.Lower128Bit.after.mir

‎src/test/mir-opt/lower_128bit_test.rs‎

Lines changed: 16 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,6 @@
1111
// compile-flags: -Z lower_128bit_ops -C debug_assertions=no
1212

1313
#![feature(i128_type)]
14-
#![feature(lang_items)]
15-
16-
#[lang="i128_add"]
17-
fn i128_add(_x: i128, _y: i128) -> i128 { 0 }
18-
#[lang="u128_add"]
19-
fn u128_add(_x: u128, _y: u128) -> u128 { 0 }
20-
#[lang="i128_sub"]
21-
fn i128_sub(_x: i128, _y: i128) -> i128 { 1 }
22-
#[lang="u128_sub"]
23-
fn u128_sub(_x: u128, _y: u128) -> u128 { 1 }
24-
#[lang="i128_mul"]
25-
fn i128_mul(_x: i128, _y: i128) -> i128 { 2 }
26-
#[lang="u128_mul"]
27-
fn u128_mul(_x: u128, _y: u128) -> u128 { 2 }
28-
#[lang="i128_div"]
29-
fn i128_div(_x: i128, _y: i128) -> i128 { 3 }
30-
#[lang="u128_div"]
31-
fn u128_div(_x: u128, _y: u128) -> u128 { 4 }
32-
#[lang="i128_rem"]
33-
fn i128_rem(_x: i128, _y: i128) -> i128 { 5 }
34-
#[lang="u128_rem"]
35-
fn u128_rem(_x: u128, _y: u128) -> u128 { 6 }
36-
#[lang="i128_shl"]
37-
fn i128_shl(_x: i128, _y: u32) -> i128 { 7 }
38-
#[lang="u128_shl"]
39-
fn u128_shl(_x: u128, _y: u32) -> u128 { 7 }
40-
#[lang="i128_shr"]
41-
fn i128_shr(_x: i128, _y: u32) -> i128 { 8 }
42-
#[lang="u128_shr"]
43-
fn u128_shr(_x: u128, _y: u32) -> u128 { 9 }
4414

4515
fn test_signed(mut x: i128) -> i128 {
4616
x += 1;
@@ -65,44 +35,44 @@ fn test_unsigned(mut x: u128) -> u128 {
6535
}
6636

6737
fn main() {
68-
test_signed(-200);
69-
test_unsigned(200);
38+
assert_eq!(test_signed(-222), -1);
39+
assert_eq!(test_unsigned(200), 2);
7040
}
7141

7242
// END RUST SOURCE
7343

7444
// START rustc.test_signed.Lower128Bit.after.mir
75-
// _1 = const i128_add(_1, const 1i128) -> bb7;
45+
// _1 = const compiler_builtins::int::addsub::rust_i128_add(_1, const 1i128) -> bb7;
7646
// ...
77-
// _1 = const i128_div(_1, const 4i128) -> bb8;
47+
// _1 = const compiler_builtins::int::sdiv::rust_i128_div(_1, const 4i128) -> bb8;
7848
// ...
79-
// _1 = const i128_rem(_1, const 5i128) -> bb11;
49+
// _1 = const compiler_builtins::int::sdiv::rust_i128_rem(_1, const 5i128) -> bb11;
8050
// ...
81-
// _1 = const i128_mul(_1, const 3i128) -> bb5;
51+
// _1 = const compiler_builtins::int::mul::rust_i128_mul(_1, const 3i128) -> bb5;
8252
// ...
83-
// _1 = const i128_sub(_1, const 2i128) -> bb6;
53+
// _1 = const compiler_builtins::int::addsub::rust_i128_sub(_1, const 2i128) -> bb6;
8454
// ...
8555
// _11 = const 7i32 as u32 (Misc);
86-
// _1 = const i128_shr(_1, move _11) -> bb9;
56+
// _1 = const compiler_builtins::int::shift::rust_i128_shr(_1, move _11) -> bb9;
8757
// ...
8858
// _12 = const 6i32 as u32 (Misc);
89-
// _1 = const i128_shl(_1, move _12) -> bb10;
59+
// _1 = const compiler_builtins::int::shift::rust_i128_shl(_1, move _12) -> bb10;
9060
// END rustc.test_signed.Lower128Bit.after.mir
9161

9262
// START rustc.test_unsigned.Lower128Bit.after.mir
93-
// _1 = const u128_add(_1, const 1u128) -> bb5;
63+
// _1 = const compiler_builtins::int::addsub::rust_u128_add(_1, const 1u128) -> bb5;
9464
// ...
95-
// _1 = const u128_div(_1, const 4u128) -> bb6;
65+
// _1 = const compiler_builtins::int::udiv::rust_u128_div(_1, const 4u128) -> bb6;
9666
// ...
97-
// _1 = const u128_rem(_1, const 5u128) -> bb9;
67+
// _1 = const compiler_builtins::int::udiv::rust_u128_rem(_1, const 5u128) -> bb9;
9868
// ...
99-
// _1 = const u128_mul(_1, const 3u128) -> bb3;
69+
// _1 = const compiler_builtins::int::mul::rust_u128_mul(_1, const 3u128) -> bb3;
10070
// ...
101-
// _1 = const u128_sub(_1, const 2u128) -> bb4;
71+
// _1 = const compiler_builtins::int::addsub::rust_u128_sub(_1, const 2u128) -> bb4;
10272
// ...
10373
// _5 = const 7i32 as u32 (Misc);
104-
// _1 = const u128_shr(_1, move _5) -> bb7;
74+
// _1 = const compiler_builtins::int::shift::rust_u128_shr(_1, move _5) -> bb7;
10575
// ...
10676
// _6 = const 6i32 as u32 (Misc);
107-
// _1 = const u128_shl(_1, move _6) -> bb8;
77+
// _1 = const compiler_builtins::int::shift::rust_u128_shl(_1, move _6) -> bb8;
10878
// END rustc.test_unsigned.Lower128Bit.after.mir

0 commit comments

Comments
 (0)