From 51ecab6967a15b82f9285cd0ffd3352607dc8612 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 22 Oct 2014 23:39:15 +0200
Subject: Do not set error on recover

---
 vm/vm_debug.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vm/vm_debug.go b/vm/vm_debug.go
index 8773df087..acdeb4be9 100644
--- a/vm/vm_debug.go
+++ b/vm/vm_debug.go
@@ -82,7 +82,8 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
 				self.Endl()
 
 				ret = closure.Return(nil)
-				err = fmt.Errorf("%v", r)
+				// No error should be set. Recover is used with require
+				// Is this too error prone?
 			}
 		}()
 	}
@@ -106,7 +107,7 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
 
 		step++
 		// Get the memory location of pc
-		op := OpCode(closure.Get(pc).Uint())
+		op = OpCode(closure.Get(pc).Uint())
 
 		// XXX Leave this Println intact. Don't change this to the log system.
 		// Used for creating diffs between implementations
-- 
cgit v1.2.3