diff options
| -rw-r--r-- | compiler/ccgexprs.nim | 2 | ||||
| -rw-r--r-- | compiler/jsgen.nim | 2 | ||||
| -rw-r--r-- | compiler/semstmts.nim | 9 | ||||
| -rw-r--r-- | compiler/transf.nim | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim index f26526b05..9401f89c3 100644 --- a/compiler/ccgexprs.nim +++ b/compiler/ccgexprs.nim @@ -2306,7 +2306,7 @@ proc expr(p: BProc, n: PNode, d: var TLoc) = genTypeSection(p.module, n) of nkCommentStmt, nkIteratorDef, nkIncludeStmt, nkImportStmt, nkImportExceptStmt, nkExportStmt, nkExportExceptStmt, - nkFromStmt, nkTemplateDef, nkMacroDef: + nkFromStmt, nkTemplateDef, nkMacroDef, nkStaticStmt: discard of nkPragma: genPragma(p, n) of nkPragmaBlock: expr(p, n.lastSon, d) diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim index b52c14842..ef54841ae 100644 --- a/compiler/jsgen.nim +++ b/compiler/jsgen.nim @@ -2155,7 +2155,7 @@ proc gen(p: PProc, n: PNode, r: var TCompRes) = of nkRaiseStmt: genRaiseStmt(p, n) of nkTypeSection, nkCommentStmt, nkIteratorDef, nkIncludeStmt, nkImportStmt, nkImportExceptStmt, nkExportStmt, nkExportExceptStmt, - nkFromStmt, nkTemplateDef, nkMacroDef: discard + nkFromStmt, nkTemplateDef, nkMacroDef, nkStaticStmt: discard of nkPragma: genPragma(p, n) of nkProcDef, nkFuncDef, nkMethodDef, nkConverterDef: var s = n.sons[namePos].sym diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim index 322ea1bd6..0f8e77fc9 100644 --- a/compiler/semstmts.nim +++ b/compiler/semstmts.nim @@ -573,7 +573,8 @@ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode = message(c.config, v.info, hintGlobalVar) if hasCompileTime: vm.setupCompileTimeVar(c.module, c.graph, result) - c.graph.recordStmt(c.graph, c.module, result) + # handled by the VM codegen: + #c.graph.recordStmt(c.graph, c.module, result) proc semConst(c: PContext, n: PNode): PNode = result = copyNode(n) @@ -1772,8 +1773,10 @@ proc semStaticStmt(c: PContext, n: PNode): PNode = dec c.inStaticContext n.sons[0] = a evalStaticStmt(c.module, c.graph, a, c.p.owner) - result = newNodeI(nkDiscardStmt, n.info, 1) - result.sons[0] = c.graph.emptyNode + # for incremental replays, keep the AST as required for replays: + result = n + #result = newNodeI(nkDiscardStmt, n.info, 1) + #result.sons[0] = c.graph.emptyNode proc usesResult(n: PNode): bool = # nkStmtList(expr) properly propagates the void context, diff --git a/compiler/transf.nim b/compiler/transf.nim index e71afcec1..72bcb6d71 100644 --- a/compiler/transf.nim +++ b/compiler/transf.nim @@ -863,7 +863,7 @@ proc transform(c: PTransf, n: PNode): PTransNode = # ensure that e.g. discard "some comment" gets optimized away # completely: result = PTransNode(newNode(nkCommentStmt)) - of nkCommentStmt, nkTemplateDef: + of nkCommentStmt, nkTemplateDef, nkImportStmt, nkStaticStmt: return n.PTransNode of nkConstSection: # do not replace ``const c = 3`` with ``const 3 = 3`` |