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

fixes #15280 [backport:1.2] (#15281)

Browse source 
* fixes #15280 [backport:1.2]

* make tests green again

* adapt tests
This commit is contained in:
Andreas Rumpf 2020-09-09 14:20:10 +02:00 • committed by GitHub
commit 3f00a738db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 49 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/sem.nim
View file

@ -184,7 +184,7 @@ proc endsInNoReturn(n: PNode): bool =
var it = n
while it.kind in {nkStmtList, nkStmtListExpr} and it.len > 0:
it = it.lastSon
result = it.kind in nkLastBlockStmts or
result = it.kind in (nkLastBlockStmts-{nkReturnStmt}) or
it.kind in nkCallKinds and it[0].kind == nkSym and sfNoReturn in it[0].sym.flags
proc commonType*(x: PType, y: PNode): PType =