jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #19149 Invalid codegen when returning var tuple from a template (#20762)

Browse source 
* fix #19149 Invalid codegen when returning var tuple from a template

* fix type
This commit is contained in:
Bung 2022-11-06 18:49:34 +08:00 • committed by GitHub
commit bae0fb720a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/sigmatch.nim
View file

@ -1905,7 +1905,7 @@ proc implicitConv(kind: TNodeKind, f: PType, arg: PNode, m: TCandidate,
else: else:
result.typ = errorType(c) result.typ = errorType(c)
else: else:
result.typ = f.skipTypes({tySink}) result.typ = f.skipTypes({tySink, tyVar})
if result.typ == nil: internalError(c.graph.config, arg.info, "implicitConv") if result.typ == nil: internalError(c.graph.config, arg.info, "implicitConv")
result.add c.graph.emptyNode result.add c.graph.emptyNode
result.add arg result.add arg
@ -2164,7 +2164,8 @@ proc paramTypesMatchAux(m: var TCandidate, f, a: PType,
of isEqual: of isEqual:
inc(m.exactMatches) inc(m.exactMatches)
result = arg result = arg
if skipTypes(f, abstractVar-{tyTypeDesc}).kind == tyTuple or let ff = skipTypes(f, abstractVar-{tyTypeDesc})
if ff.kind == tyTuple or
(arg.typ != nil and skipTypes(arg.typ, abstractVar-{tyTypeDesc}).kind == tyTuple): (arg.typ != nil and skipTypes(arg.typ, abstractVar-{tyTypeDesc}).kind == tyTuple):
result = implicitConv(nkHiddenSubConv, f, arg, m, c) result = implicitConv(nkHiddenSubConv, f, arg, m, c)
of isNone: of isNone:

19
tests/template/t19149.nim Normal file
View file

@ -0,0 +1,19 @@
type Foo = tuple[active: bool, index: int]
var f: Foo
# template result type during match stage
# f:var Foo
# a:Foo
# tyVar
# tyTuple
# after change to proc
# f:Foo
# a:Foo
# tyTuple
# tyTuple
template cursor(): var Foo = f
discard cursor()