Auto merge of #1213 - lcnr:master, r=RalfJung

rm custom `intrinsics::discriminant_value` @RalfJung requires rust-lang/rust#69825
rust-lang · Mar 12, 2020 · 0f22d8a · 0f22d8a
2 parents 4fc8542 + 6fd3c91
commit 0f22d8a
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs
@@ -248,12 +248,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 }
             }
 
-            "discriminant_value" => {
-                let place = this.deref_operand(args[0])?;
-                let discr_val = this.read_discriminant(place.into())?.0;
-                this.write_scalar(Scalar::from_uint(discr_val, dest.layout.size), dest)?;
-            }
-
             #[rustfmt::skip]
             | "sinf32"
             | "fabsf32"