don't use a temp for addr [backport: 1.6] (nim-lang#19503)

* don't use a temp for addr fix nim-lang#19497 * Update compiler/ccgcalls.nim Co-authored-by: konsumlamm <[email protected]> * add a test Co-authored-by: konsumlamm <[email protected]>
PMunch · Mar 28, 2022 · 336ac6f · 336ac6f
1 parent e700082
commit 336ac6f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/compiler/ccgcalls.nim b/compiler/ccgcalls.nim
@@ -376,8 +376,8 @@ proc genParams(p: BProc, ri: PNode, typ: PType): Rope =
         if not needTmp[i - 1]:
           needTmp[i - 1] = potentialAlias(n, potentialWrites)
       getPotentialWrites(ri[i], false, potentialWrites)
-    if ri[i].kind == nkHiddenAddr:
-      # Optimization: don't use a temp, if we would only take the adress anyway
+    if ri[i].kind in {nkHiddenAddr, nkAddr}:
+      # Optimization: don't use a temp, if we would only take the address anyway
       needTmp[i - 1] = false
 
   for i in 1..<ri.len:

diff --git a/tests/arc/tarc_orc.nim b/tests/arc/tarc_orc.nim
@@ -0,0 +1,22 @@
+discard """
+  matrix: "--mm:arc; --mm:orc"
+"""
+
+block:
+  type
+    PublicKey = array[32, uint8]
+    PrivateKey = array[64, uint8]
+
+  proc ed25519_create_keypair(publicKey: ptr PublicKey; privateKey: ptr PrivateKey) =
+    publicKey[][0] = uint8(88)
+
+  type
+    KeyPair = object
+      public: PublicKey
+      private: PrivateKey
+
+  proc initKeyPair(): KeyPair =
+    ed25519_create_keypair(result.public.addr, result.private.addr)
+
+  let keys = initKeyPair()
+  doAssert keys.public[0] == 88