Avoid possible integer overflow in niche value computation

tromey · tromey · commit da7b6b4b4dcd · 2018-10-30T12:06:07.000-06:00
@eddyb pointed out in review that the niche value computation had a possible integer overflow problem, fixed here as he suggested.
diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs
@@ -1361,8 +1361,11 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
                         let niche_value = if i == dataful_variant {
                             None
                         } else {
-                            Some((i.wrapping_sub(*niche_variants.start()) as u128)
-                                 .wrapping_add(niche_start) as u64)
+                            let niche = (i as u128)
+                                .wrapping_sub(*niche_variants.start() as u128)
+                                .wrapping_add(niche_start);
+                            assert_eq!(niche as u64 as u128, niche);
+                            Some(niche as u64)
                         };
 
                         MemberDescription {
