From b1120464e0b0cd1dc2f90e790249e78c4843bee9 Mon Sep 17 00:00:00 2001
From: Tomasz Dąbrowski <t.dabrowski@rock-hard.eu>
Date: Mon, 24 Apr 2017 23:57:39 +0200
Subject: Revert "Simplify pointer calculation in `envadjust`."

This reverts commit a1d32af91692c2b624e9c04fcd94aa958dbba626.
---
 src/vm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/vm.c')

diff --git a/src/vm.c b/src/vm.c
index 47ad9a9cc..8b14566c1 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -118,16 +118,16 @@ static inline void
 envadjust(mrb_state *mrb, mrb_value *oldbase, mrb_value *newbase)
 {
   mrb_callinfo *ci = mrb->c->cibase;
-  ptrdiff_t off;
 
   if (newbase == oldbase) return;
-  off = newbase - oldbase;
   while (ci <= mrb->c->ci) {
     struct REnv *e = ci->env;
     if (e && MRB_ENV_STACK_SHARED_P(e)) {
-      e->stack += off;
+      ptrdiff_t off = e->stack - oldbase;
+
+      e->stack = newbase + off;
     }
-    ci->stackent += off;
+    ci->stackent = newbase + (ci->stackent - oldbase);
     ci++;
   }
 }
-- 
cgit v1.2.3