about summary refs log tree commit diff
path: root/src/libcompiler_builtins
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-04-13 17:32:22 +0000
committerbors <bors@rust-lang.org>2017-04-13 17:32:22 +0000
commitea376822a17dd911244c313c5b07dffdfe3c023a (patch)
tree1057c6802616a73b772a164a706aa8b8a0a7cbca /src/libcompiler_builtins
parent43ef63d5b4279ef97ed921338a69b0d62101ca83 (diff)
parent6afb2c48d94255d73532f8b9d0dd028bf2112c12 (diff)
Auto merge of #41277 - frewsxcv:rollup, r=frewsxcv
Rollup of 3 pull requests

- Successful merges: #41240, #41250, #41266
- Failed merges:
Diffstat (limited to 'src/libcompiler_builtins')
-rw-r--r--src/libcompiler_builtins/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcompiler_builtins/lib.rs b/src/libcompiler_builtins/lib.rs
index 58aba11e439..09b3d639507 100644
--- a/src/libcompiler_builtins/lib.rs
+++ b/src/libcompiler_builtins/lib.rs
@@ -180,7 +180,7 @@ pub mod reimpls {
             sr = sr.wrapping_add(1);
 
             // 1 <= sr <= u64::bits() - 1
-            q = n.wrapping_shl(64u32.wrapping_sub(sr));
+            q = n.wrapping_shl(128u32.wrapping_sub(sr));
             r = n.wrapping_shr(sr);
         } else {
             if d.high() == 0 {