From ba68025ce5f48a3790ce4a4a42ffdb88f3cecfae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oscar=20Nihlg=C3=A5rd?= <oscarnihlgard@gmail.com>
Date: Mon, 21 Jan 2019 17:00:33 +0100
Subject: [PATCH] Support system.reset in vm (#10400)

(cherry picked from commit a4cdd25b19b0ec98826a01e1f57da1c2fb8920af)
---
 compiler/vm.nim     |  2 --
 compiler/vmdef.nim  |  2 +-
 compiler/vmgen.nim  |  4 +++-
 tests/vm/treset.nim | 28 ++++++++++++++++++++++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 tests/vm/treset.nim

diff --git a/compiler/vm.nim b/compiler/vm.nim
index d3e0ee3f33..691860a0b5 100644
--- a/compiler/vm.nim
+++ b/compiler/vm.nim
@@ -1201,8 +1201,6 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
       let newLen = regs[rb].intVal.int
       if regs[ra].node.isNil: stackTrace(c, tos, pc, errNilAccess)
       else: c.setLenSeq(regs[ra].node, newLen, c.debug[pc])
-    of opcReset:
-      internalError(c.config, c.debug[pc], "too implement")
     of opcNarrowS:
       decodeB(rkInt)
       let min = -(1.BiggestInt shl (rb-1))
diff --git a/compiler/vmdef.nim b/compiler/vmdef.nim
index 17f48da07b..7a2bc16072 100644
--- a/compiler/vmdef.nim
+++ b/compiler/vmdef.nim
@@ -69,7 +69,7 @@ type
     opcContainsSet, opcRepr, opcSetLenStr, opcSetLenSeq,
     opcIsNil, opcOf, opcIs,
     opcSubStr, opcParseFloat, opcConv, opcCast,
-    opcQuit, opcReset,
+    opcQuit,
     opcNarrowS, opcNarrowU,
 
     opcAddStrCh,
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index f5904f0d05..4cce1590a4 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -1063,7 +1063,9 @@ proc genMagic(c: PCtx; n: PNode; dest: var TDest; m: TMagic) =
   of mReset:
     unused(c, n, dest)
     var d = c.genx(n.sons[1])
-    c.gABC(n, opcReset, d)
+    c.gABx(n, opcLdNull, d, c.genType(n.sons[1].typ))
+    c.gABx(n, opcNodeToReg, d, d)
+    c.genAsgnPatch(n.sons[1], d)
   of mOf, mIs:
     if dest < 0: dest = c.getTemp(n.typ)
     var tmp = c.genx(n.sons[1])
diff --git a/tests/vm/treset.nim b/tests/vm/treset.nim
new file mode 100644
index 0000000000..56fe19b19a
--- /dev/null
+++ b/tests/vm/treset.nim
@@ -0,0 +1,28 @@
+static:
+  type Obj = object
+    field: int
+  var o = Obj(field: 1)
+  reset(o)
+  doAssert o.field == 0
+
+static:
+  var i = 2
+  reset(i)
+  doAssert i == 0
+
+static:
+  var i = new int
+  reset(i)
+  doAssert i.isNil
+
+static:
+  var s = @[1, 2, 3]
+  reset(s)
+  doAssert s == @[]
+
+static:
+  proc f() =
+    var i = 2
+    reset(i)
+    doAssert i == 0
+  f()
\ No newline at end of file