From 46d785aa40e1c097c4f6eceab3947e9ea807be27 Mon Sep 17 00:00:00 2001
From: narimiran <narimiran@disroot.org>
Date: Sat, 25 Apr 2020 15:44:38 +0200
Subject: [PATCH] correctly backport 613ea6e

---
 compiler/transf.nim                 | 17 +++++++++++++----
 tests/destructor/tgcdestructors.nim |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/compiler/transf.nim b/compiler/transf.nim
index b95733a37e..6f7aeef0dd 100644
--- a/compiler/transf.nim
+++ b/compiler/transf.nim
@@ -573,10 +573,19 @@ proc putArgInto(arg: PNode, formal: PType): TPutArgInto =
   case arg.kind
   of nkEmpty..nkNilLit:
     result = paDirectMapping
-  of nkPar, nkTupleConstr, nkCurly, nkBracket:
-    result = paFastAsgn
-    for i in 0 ..< len(arg):
-      if putArgInto(arg.sons[i], formal) != paDirectMapping: return
+  of nkDotExpr, nkDerefExpr, nkHiddenDeref, nkAddr, nkHiddenAddr:
+    result = putArgInto(arg[0], formal)
+  of nkCurly, nkBracket:
+    for i in 0..<arg.len:
+      if putArgInto(arg[i], formal) != paDirectMapping:
+        return paFastAsgn
+    result = paDirectMapping
+  of nkPar, nkTupleConstr, nkObjConstr:
+    for i in 0..<arg.len:
+      let a = if arg[i].kind == nkExprColonExpr: arg[i][1]
+              else: arg[0]
+      if putArgInto(a, formal) != paDirectMapping:
+        return paFastAsgn
     result = paDirectMapping
   else:
     if skipTypes(formal, abstractInst).kind in {tyVar, tyLent}: result = paVarAsgn
diff --git a/tests/destructor/tgcdestructors.nim b/tests/destructor/tgcdestructors.nim
index 7eb865915c..4cd9cd9d4d 100644
--- a/tests/destructor/tgcdestructors.nim
+++ b/tests/destructor/tgcdestructors.nim
@@ -10,7 +10,7 @@ a: @[4, 2, 3]
 0
 30
 true
-41 41'''
+40 40'''
 """
 
 import allocators