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

fixes #10934

Browse source
This commit is contained in:
Araq 2019-03-31 19:59:17 +02:00
commit cce8d3da27
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/semcall.nim
View file

@ -482,6 +482,7 @@ proc semResolvedCall(c: PContext, x: TCandidate,
result.sons[0] = newSymNode(finalCallee, getCallLineInfo(result.sons[0])) result.sons[0] = newSymNode(finalCallee, getCallLineInfo(result.sons[0]))
if containsGenericType(result.typ) or x.fauxMatch == tyUnknown: if containsGenericType(result.typ) or x.fauxMatch == tyUnknown:
result.typ = newTypeS(x.fauxMatch, c) result.typ = newTypeS(x.fauxMatch, c)
if result.typ.kind == tyError: incl result.typ.flags, tfCheckedForDestructor
return return
let gp = finalCallee.ast.sons[genericParamsPos] let gp = finalCallee.ast.sons[genericParamsPos]
if gp.kind != nkEmpty: if gp.kind != nkEmpty:

1
compiler/semtypes.nim
View file

@ -50,6 +50,7 @@ proc newOrPrevType(kind: TTypeKind, prev: PType, c: PContext): PType =
else: else:
result = prev result = prev
if result.kind == tyForward: result.kind = kind if result.kind == tyForward: result.kind = kind
#if kind == tyError: result.flags.incl tfCheckedForDestructor
proc newConstraint(c: PContext, k: TTypeKind): PType = proc newConstraint(c: PContext, k: TTypeKind): PType =
result = newTypeS(tyBuiltInTypeClass, c) result = newTypeS(tyBuiltInTypeClass, c)