From 226c15499fe829d533b4811aa5c68b15de870b04 Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Tue, 22 Jan 2019 12:25:11 +0530
Subject: [PATCH] Fix compileTime pragma applying to whole var/let section
 (#10389)

---
 compiler/semstmts.nim    | 10 ++++------
 tests/vm/tvarsection.nim | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 tests/vm/tvarsection.nim

diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index 288820d86..17f88d039 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -432,7 +432,6 @@ proc setVarType(c: PContext; v: PSym, typ: PType) =
 proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode =
   var b: PNode
   result = copyNode(n)
-  var hasCompileTime = false
   for i in countup(0, sonsLen(n)-1):
     var a = n.sons[i]
     if c.config.cmd == cmdIdeTools: suggestStmt(c, a)
@@ -556,13 +555,12 @@ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode =
         else: v.typ = tup
         b.sons[j] = newSymNode(v)
       checkNilable(c, v)
-      if sfCompileTime in v.flags: hasCompileTime = true
+      if sfCompileTime in v.flags:
+        var x = newNodeI(result.kind, v.info)
+        addSon(x, result[i])
+        vm.setupCompileTimeVar(c.module, c.graph, x)
       if v.flags * {sfGlobal, sfThread} == {sfGlobal}:
         message(c.config, v.info, hintGlobalVar)
-  if hasCompileTime:
-    vm.setupCompileTimeVar(c.module, c.graph, result)
-    # handled by the VM codegen:
-    #c.graph.recordStmt(c.graph, c.module, result)
 
 proc semConst(c: PContext, n: PNode): PNode =
   result = copyNode(n)
diff --git a/tests/vm/tvarsection.nim b/tests/vm/tvarsection.nim
new file mode 100644
index 000000000..d1c4926a0
--- /dev/null
+++ b/tests/vm/tvarsection.nim
@@ -0,0 +1,15 @@
+discard """
+  output: '''-1abc'''
+"""
+
+var
+  a {.compileTime.} = 2
+  b = -1
+  c {.compileTime.} = 3
+  d = "abc"
+
+static:
+  assert a == 2
+  assert c == 3
+
+echo b, d