Skip to content

Commit 71a9e10

Browse files
committed
Fixed invalid 128-bit division on 32-bit target. Fixed issue rust-lang#41228.
Added test cases to cover all special-cased branches of udivmodti4.
1 parent 1dca19a commit 71a9e10

File tree

3 files changed

+51
-1
lines changed

3 files changed

+51
-1
lines changed

src/libcompiler_builtins/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ pub mod reimpls {
180180
sr = sr.wrapping_add(1);
181181

182182
// 1 <= sr <= u64::bits() - 1
183-
q = n.wrapping_shl(64u32.wrapping_sub(sr));
183+
q = n.wrapping_shl(128u32.wrapping_sub(sr));
184184
r = n.wrapping_shr(sr);
185185
} else {
186186
if d.high() == 0 {

src/test/run-pass/i128.rs

+5
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,9 @@ fn main() {
104104
assert_eq!(l.checked_sub(l), Some(0));
105105
assert_eq!(b(1u128).checked_shl(b(127)), Some(1 << 127));
106106
assert_eq!(o.checked_shl(b(128)), None);
107+
108+
// https://github.com/rust-lang/rust/issues/41228
109+
assert_eq!(b(-87559967289969187895646876466835277875_i128) /
110+
b(84285771033834995895337664386045050880_i128),
111+
-1i128);
107112
}

src/test/run-pass/u128.rs

+45
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,49 @@ fn main() {
7777
assert_eq!(o.checked_sub(b(18)), None);
7878
assert_eq!(b(1u128).checked_shl(b(127)), Some(1 << 127));
7979
assert_eq!(o.checked_shl(b(128)), None);
80+
81+
// Test cases for all udivmodti4 branches.
82+
// case "0X/0X"
83+
assert_eq!(b(0x69545bd57727c050_u128) /
84+
b(0x3283527a3350d88c_u128),
85+
2u128);
86+
// case "0X/KX"
87+
assert_eq!(b(0x0_8003c9c50b473ae6_u128) /
88+
b(0x1_283e8838c30fa8f4_u128),
89+
0u128);
90+
// case "K0/K0"
91+
assert_eq!(b(0xc43f42a207978720_u128 << 64) /
92+
b(0x098e62b74c23cf1a_u128 << 64),
93+
20u128);
94+
// case "KK/K0" for power-of-two D.
95+
assert_eq!(b(0xa9008fb6c9d81e42_0e25730562a601c8_u128) /
96+
b(1u128 << 120),
97+
169u128);
98+
// case "KK/K0" with N >= D (https://github.com/rust-lang/rust/issues/41228).
99+
assert_eq!(b(0xe4d26e59f0640328_06da5b06efe83a41_u128) /
100+
b(0x330fcb030ea4447c_u128 << 64),
101+
4u128);
102+
assert_eq!(b(3u128 << 64 | 1) /
103+
b(3u128 << 64),
104+
1u128);
105+
// case "KK/K0" with N < D.
106+
assert_eq!(b(0x6655c9fb66ca2884_e2d1dfd470158c62_u128) /
107+
b(0xb35b667cab7e355b_u128 << 64),
108+
0u128);
109+
// case "KX/0K" for power-of-two D.
110+
assert_eq!(b(0x3e49dd84feb2df59_7b2f97d93a253969_u128) /
111+
b(1u128 << 4),
112+
0x03e49dd84feb2df5_97b2f97d93a25396_u128);
113+
// case "KX/0K" in general.
114+
assert_eq!(b(0x299692b3a1dae5bd_6162e6f489d2620e_u128) /
115+
b(0x900b6f027571d6f7_u128),
116+
0x49e95f54b0442578_u128);
117+
// case "KX/KK" with N >= D.
118+
assert_eq!(b(0xc7b889180b67b07d_bc1a3c88783d35b5_u128) /
119+
b(0x1d7e69f53160b9e2_60074771e852f244_u128),
120+
6u128);
121+
// case "KX/KK" with N < D.
122+
assert_eq!(b(0x679289ac23bb334f_36144401cf882172_u128) /
123+
b(0x7b0b271b64865f05_f54a7b72746c062f_u128),
124+
0u128);
80125
}

0 commit comments

Comments
 (0)