From 71bbbdbf96a7a78f8c6683fa57fd120b069ee7a1 Mon Sep 17 00:00:00 2001
From: cooldome <ariabushenko@gmail.com>
Date: Sun, 27 Dec 2020 21:05:33 +0200
Subject: [PATCH] fix #15043 (#16441) [backport:1.4]

* fix #15043

* Trigger build

(cherry picked from commit fbc8a40c7a351ff7c0f2dc0608bc8926f89d8537)
---
 compiler/lambdalifting.nim | 12 +++++++-----
 tests/arc/trepr.nim        | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/compiler/lambdalifting.nim b/compiler/lambdalifting.nim
index 2c40fe5f72..bd5258c681 100644
--- a/compiler/lambdalifting.nim
+++ b/compiler/lambdalifting.nim
@@ -238,10 +238,11 @@ proc liftingHarmful(conf: ConfigRef; owner: PSym): bool {.inline.} =
   result = conf.backend == backendJs and not isCompileTime
 
 proc createTypeBoundOpsLL(g: ModuleGraph; refType: PType; info: TLineInfo; owner: PSym) =
-  createTypeBoundOps(g, nil, refType.lastSon, info)
-  createTypeBoundOps(g, nil, refType, info)
-  if tfHasAsgn in refType.flags or optSeqDestructors in g.config.globalOptions:
-    owner.flags.incl sfInjectDestructors
+  if owner.kind != skMacro:
+    createTypeBoundOps(g, nil, refType.lastSon, info)
+    createTypeBoundOps(g, nil, refType, info)
+    if tfHasAsgn in refType.flags or optSeqDestructors in g.config.globalOptions:
+      owner.flags.incl sfInjectDestructors
 
 proc liftIterSym*(g: ModuleGraph; n: PNode; owner: PSym): PNode =
   # transforms  (iter)  to  (let env = newClosure[iter](); (iter, env))
@@ -611,7 +612,8 @@ proc rawClosureCreation(owner: PSym;
         let fieldAccess = indirectAccess(env, local, env.info)
         # add ``env.param = param``
         result.add(newAsgnStmt(fieldAccess, newSymNode(local), env.info))
-        createTypeBoundOps(d.graph, nil, fieldAccess.typ, env.info)
+        if owner.kind != skMacro:
+          createTypeBoundOps(d.graph, nil, fieldAccess.typ, env.info)
         if tfHasAsgn in fieldAccess.typ.flags or optSeqDestructors in d.graph.config.globalOptions:
           owner.flags.incl sfInjectDestructors
 
diff --git a/tests/arc/trepr.nim b/tests/arc/trepr.nim
index 9eb2ed43f2..4ff8995e42 100644
--- a/tests/arc/trepr.nim
+++ b/tests/arc/trepr.nim
@@ -68,3 +68,19 @@ proc p2 =
 
 discard repr p2
 
+
+#####################################################################
+# bug #15043
+
+import macros
+
+macro extract(): untyped =
+  result = newStmtList()
+  var x: seq[tuple[node: NimNode]]
+
+  proc test(n: NimNode) {.closure.} =
+    x.add (node: n)
+  
+  test(parseExpr("discard"))
+  
+extract()