rustc: don't ICE when using Rvalue::Discriminant on a non-ADT.

rust-lang · Feb 8, 2018 · 4aa66db · 4aa66db
1 parent 4f93357
commit 4aa66db
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/librustc/mir/tcx.rs b/src/librustc/mir/tcx.rs
@@ -182,9 +182,8 @@ impl<'tcx> Rvalue<'tcx> {
                 if let ty::TyAdt(adt_def, _) = ty.sty {
                     adt_def.repr.discr_type().to_ty(tcx)
                 } else {
-                    // Undefined behaviour, bug for now; may want to return something for
-                    // the `discriminant` intrinsic later.
-                    bug!("Rvalue::Discriminant on Place of type {:?}", ty);
+                    // This can only be `0`, for now, so `u8` will suffice.
+                    tcx.types.u8
                 }
             }
             Rvalue::NullaryOp(NullOp::Box, t) => tcx.mk_box(t),