about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2019-08-12 16:31:55 +0300
committerEduard-Mihai Burtescu <edy.burt@gmail.com>2019-08-19 18:55:19 +0300
commitb4f217ed7b8b2fd0695c3b2278fe1b664f038607 (patch)
tree2d5065808f81828bbbb8bd4ab0202f97d1cfff08
parentd4196a76739f8ad7d27e7d227495fef7589067fd (diff)
downloadrust-b4f217ed7b8b2fd0695c3b2278fe1b664f038607.tar.gz
rust-b4f217ed7b8b2fd0695c3b2278fe1b664f038607.zip
rustc_mir: remove wrong calls to subst_from_frame_and_normalize_erasing_regions.
-rw-r--r--src/librustc_mir/interpret/cast.rs1
-rw-r--r--src/librustc_mir/interpret/traits.rs1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/librustc_mir/interpret/cast.rs b/src/librustc_mir/interpret/cast.rs
index d570b754c87..a3a237a1d3c 100644
--- a/src/librustc_mir/interpret/cast.rs
+++ b/src/librustc_mir/interpret/cast.rs
@@ -67,7 +67,6 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                 // The src operand does not matter, just its type
                 match src.layout.ty.sty {
                     ty::Closure(def_id, substs) => {
-                        let substs = self.subst_from_frame_and_normalize_erasing_regions(substs)?;
                         let instance = ty::Instance::resolve_closure(
                             *self.tcx,
                             def_id,
diff --git a/src/librustc_mir/interpret/traits.rs b/src/librustc_mir/interpret/traits.rs
index 940a7bbdcce..b32bcad0b7f 100644
--- a/src/librustc_mir/interpret/traits.rs
+++ b/src/librustc_mir/interpret/traits.rs
@@ -77,7 +77,6 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
         for (i, method) in methods.iter().enumerate() {
             if let Some((def_id, substs)) = *method {
                 // resolve for vtable: insert shims where needed
-                let substs = self.subst_from_frame_and_normalize_erasing_regions(substs)?;
                 let instance = ty::Instance::resolve_for_vtable(
                     *self.tcx,
                     self.param_env,