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

fixes #6895

Browse source
This commit is contained in:
Andreas Rumpf 2018-04-11 23:26:11 +02:00
commit 4c5351a1eb
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/ast.nim
View file

@ -1679,9 +1679,9 @@ proc isImportedException*(t: PType): bool =
assert(t != nil) assert(t != nil)
if optNoCppExceptions in gGlobalOptions: if optNoCppExceptions in gGlobalOptions:
return false return false
let base = t.skipTypes({tyAlias, tyPtr, tyDistinct, tyGenericInst}) let base = t.skipTypes({tyAlias, tyPtr, tyDistinct, tyGenericInst})
if base.sym != nil and sfCompileToCpp in base.sym.flags: if base.sym != nil and sfCompileToCpp in base.sym.flags:
result = true result = true

6
compiler/semtypes.nim
View file

@ -184,6 +184,10 @@ proc semRangeAux(c: PContext, n: PNode, prev: PType): PType =
checkSonsLen(n, 3) checkSonsLen(n, 3)
result = newOrPrevType(tyRange, prev, c) result = newOrPrevType(tyRange, prev, c)
result.n = newNodeI(nkRange, n.info) result.n = newNodeI(nkRange, n.info)
# always create a 'valid' range type, but overwrite it later
# because 'semExprWithType' can raise an exception. See bug #6895.
addSonSkipIntLit(result, errorType(c))
if (n[1].kind == nkEmpty) or (n[2].kind == nkEmpty): if (n[1].kind == nkEmpty) or (n[2].kind == nkEmpty):
localError(n.info, errRangeIsEmpty) localError(n.info, errRangeIsEmpty)
@ -216,7 +220,7 @@ proc semRangeAux(c: PContext, n: PNode, prev: PType): PType =
if weakLeValue(result.n[0], result.n[1]) == impNo: if weakLeValue(result.n[0], result.n[1]) == impNo:
localError(n.info, errRangeIsEmpty) localError(n.info, errRangeIsEmpty)
addSonSkipIntLit(result, rangeT[0]) result[0] = rangeT[0]
proc semRange(c: PContext, n: PNode, prev: PType): PType = proc semRange(c: PContext, n: PNode, prev: PType): PType =
result = nil result = nil