From f1fc9a8f7e374ceb112a5413fc4962cd157e40fc Mon Sep 17 00:00:00 2001
From: Chris Fallin <chris@cfallin.org>
Date: Sat, 8 May 2021 19:04:16 -0700
Subject: [PATCH] Fix related to move handling

---
 src/ion/mod.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/ion/mod.rs b/src/ion/mod.rs
index 1a75c03..08ebf32 100644
--- a/src/ion/mod.rs
+++ b/src/ion/mod.rs
@@ -1316,7 +1316,7 @@ impl<'a, F: Function> Env<'a, F> {
                                 VRegIndex::new(dst.vreg()),
                                 CodeRange {
                                     from: pos,
-                                    to: pos.next(),
+                                    to: pos.next().next(),
                                 },
                                 &mut num_ranges,
                             );
@@ -3851,11 +3851,7 @@ impl<'a, F: Function> Env<'a, F> {
                 } else {
                     (vreg, range.from.inst().next())
                 };
-                let move_src_end = if range.to.pos() == InstPosition::Before {
-                    (vreg, range.to.inst())
-                } else {
-                    (vreg, range.to.inst().next())
-                };
+                let move_src_end = (vreg, range.to.inst().next());
                 log::debug!(
                     "vreg {:?} range {:?}: looking for program-move sources from {:?} to {:?}",
                     vreg,