From 69eaaadc28e027fd749c2f6e500daa48f8c2aba3 Mon Sep 17 00:00:00 2001
From: Vytautas Astrauskas <astrauv@amazon.com>
Date: Mon, 20 Apr 2020 11:53:19 -0700
Subject: [PATCH] Fix merge error.

---
 src/machine.rs | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/machine.rs b/src/machine.rs
index 4032a399e3eb..3853f6559959 100644
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -545,20 +545,6 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
         ecx.active_thread_stack_mut()
     }
 
-    #[inline(always)]
-    fn stack<'a>(
-        ecx: &'a InterpCx<'mir, 'tcx, Self>,
-    ) -> &'a [Frame<'mir, 'tcx, Self::PointerTag, Self::FrameExtra>] {
-        &ecx.machine.stack
-    }
-
-    #[inline(always)]
-    fn stack_mut<'a>(
-        ecx: &'a mut InterpCx<'mir, 'tcx, Self>,
-    ) -> &'a mut Vec<Frame<'mir, 'tcx, Self::PointerTag, Self::FrameExtra>> {
-        &mut ecx.machine.stack
-    }
-
     #[inline(always)]
     fn after_stack_push(ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx> {
         if ecx.memory.extra.stacked_borrows.is_some() {