Fix abort-current-continuation's denv restoration bug

#1227

Author: shirok

src/vm.c

@@ -3191,8 +3191,10 @@ ScmObj Scm_VMAbortCurrentContinuation(ScmObj promptTag, ScmObj args)
     SCM_ASSERT(pd->dummy == SCM_VM_INSN(SCM_VM_RET));
     ScmObj targetHandlers = pd->dynamicHandlers;
 
-    /* Discard continuation up to abortTo frame. */
+    /* Discard continuation, and reinstate abortTo frame and its
+       dynamic environment. */
     CONT = abortTo;
+    DENV = abortTo->denv;
 
     ScmObj currentHandlers = get_dynamic_handlers(vm);
     if (targetHandlers != currentHandlers && SCM_PAIRP(currentHandlers)) {

tests/continuation.scm

@@ -505,6 +505,23 @@
                  (^[] (car 1))))
           tag list)))
 
+;; https://github.com/shirok/Gauche/issues/1227
+(let ([tag1 (make-continuation-prompt-tag 'tag)])
+  (test* "abort-current-continuation (wrong number of arguments)"
+         (test-error <error> #/wrong number of arguments/)
+         (let ([r '()])
+           (call-with-continuation-prompt
+            (^[]
+              (dynamic-wind
+                (^[] (push! r 'before))
+                (^[]
+                  (guard (e [else (push! r 'guard)])
+                    (push! r 'body)
+                    (abort-current-continuation tag1 'one 'two)))
+                (^[] (push! r 'after))))
+            tag1
+            (^[x] (push! r x))))))
+
 ;;-----------------------------------------------------------------------
 ;; Parameterizations
 ;;