fix nim-lang#14340

timotheecour · Dec 18, 2020 · 124059e · 124059e
1 parent 868c31e
commit 124059e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim
@@ -3089,7 +3089,8 @@ proc genBracedInit(p: BProc, n: PNode; isConst: bool; optionalType: PType): Rope
       else:
         result = genConstSeq(p, n, typ, isConst)
     of tyProc:
-      if typ.callConv == ccClosure and n.len > 1 and n[1].kind == nkNilLit:
+      if typ.callConv == ccClosure and n.kind == nkClosure and n.len > 1 and n[1].kind == nkNilLit:
+        # refs bug #14340
         # Conversion: nimcall -> closure.
         # this hack fixes issue that nkNilLit is expanded to {NIM_NIL,NIM_NIL}
         # this behaviour is needed since closure_var = nil must be

diff --git a/tests/vm/tvmmisc.nim b/tests/vm/tvmmisc.nim
@@ -306,6 +306,15 @@ block: # bug #8007
   const d = @[Cost(kind: Fixed, cost: 999), Cost(kind: Dynamic, handler: foo)]
   doAssert $d == "@[(kind: Fixed, cost: 999), (kind: Dynamic, handler: ...)]"
 
+block: # bug #14340
+  proc opl3EnvelopeCalcSin0() = discard
+  type EnvelopeSinfunc = proc()
+  # const EnvelopeCalcSin0 = opl3EnvelopeCalcSin0 # ok
+  const EnvelopeCalcSin0: EnvelopeSinfunc = opl3EnvelopeCalcSin0 # was bug
+  const envelopeSin = [EnvelopeCalcSin0]
+  var a = 0
+  envelopeSin[a]()
+
 block: # VM wrong register free causes errors in unrelated code
   block: # bug #15597
     #[