about summary refs log tree commit diff
path: root/src/librustc_trans/intrinsic.rs
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2017-09-23 01:54:45 +0300
committerEduard-Mihai Burtescu <edy.burt@gmail.com>2017-11-19 02:14:32 +0200
commit018323ffc2c38669f594b8f7025a3440ae529d2a (patch)
tree0852579792f5b3fe532e99333e5e46983ffb1402 /src/librustc_trans/intrinsic.rs
parentb28f668e267d6b463439e776c335f45508f5c1ad (diff)
downloadrust-018323ffc2c38669f594b8f7025a3440ae529d2a.tar.gz
rust-018323ffc2c38669f594b8f7025a3440ae529d2a.zip
rustc: collapse the remains of Layout into Variants (enums vs everything else).
Diffstat (limited to 'src/librustc_trans/intrinsic.rs')
-rw-r--r--src/librustc_trans/intrinsic.rs7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/librustc_trans/intrinsic.rs b/src/librustc_trans/intrinsic.rs
index 45d2f7c69e9..d982fa192b3 100644
--- a/src/librustc_trans/intrinsic.rs
+++ b/src/librustc_trans/intrinsic.rs
@@ -394,12 +394,7 @@ pub fn trans_intrinsic_call<'a, 'tcx>(bcx: &Builder<'a, 'tcx>,
         },
 
         "discriminant_value" => {
-            match substs.type_at(0).sty {
-                ty::TyAdt(adt, ..) if adt.is_enum() => {
-                    args[0].deref(bcx.ccx).trans_get_discr(bcx, ret_ty)
-                }
-                _ => C_null(llret_ty)
-            }
+            args[0].deref(bcx.ccx).trans_get_discr(bcx, ret_ty)
         }
 
         "align_offset" => {