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

async: removed the 'unown' references, async never worked with --newruntime anyway and --newruntime is dead (#15374)

Browse source
This commit is contained in:
Andreas Rumpf 2020-09-20 18:01:07 +02:00 • committed by GitHub
commit 04cecdf9c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/pure/asyncmacro.nim
View file

@ -14,21 +14,20 @@ import macros, strutils, asyncfutures
template createCb(retFutureSym, iteratorNameSym, template createCb(retFutureSym, iteratorNameSym,
strName, identName, futureVarCompletions: untyped) = strName, identName, futureVarCompletions: untyped) =
bind finished bind finished
let retFutUnown = unown retFutureSym
var nameIterVar = iteratorNameSym var nameIterVar = iteratorNameSym
proc identName {.closure.} = proc identName {.closure.} =
try: try:
if not nameIterVar.finished: if not nameIterVar.finished:
var next = unown nameIterVar() var next = nameIterVar()
# Continue while the yielded future is already finished. # Continue while the yielded future is already finished.
while (not next.isNil) and next.finished: while (not next.isNil) and next.finished:
next = unown nameIterVar() next = nameIterVar()
if nameIterVar.finished: if nameIterVar.finished:
break break
if next == nil: if next == nil:
if not retFutUnown.finished: if not retFutureSym.finished:
let msg = "Async procedure ($1) yielded `nil`, are you await'ing a " & let msg = "Async procedure ($1) yielded `nil`, are you await'ing a " &
"`nil` Future?" "`nil` Future?"
raise newException(AssertionDefect, msg % strName) raise newException(AssertionDefect, msg % strName)
@ -39,12 +38,12 @@ template createCb(retFutureSym, iteratorNameSym,
{.pop.} {.pop.}
except: except:
futureVarCompletions futureVarCompletions
if retFutUnown.finished: if retFutureSym.finished:
# Take a look at tasyncexceptions for the bug which this fixes. # Take a look at tasyncexceptions for the bug which this fixes.
# That test explains it better than I can here. # That test explains it better than I can here.
raise raise
else: else:
retFutUnown.fail(getCurrentException()) retFutureSym.fail(getCurrentException())
identName() identName()
proc createFutureVarCompletions(futureVarIdents: seq[NimNode], proc createFutureVarCompletions(futureVarIdents: seq[NimNode],

7
lib/system/orc.nim
View file

@ -103,9 +103,10 @@ proc nimTraceRefDyn(q: pointer; env: pointer) {.compilerRtl, inline.} =
j.traceStack.add(head p[], cast[ptr PNimTypeV2](p[])[]) j.traceStack.add(head p[], cast[ptr PNimTypeV2](p[])[])
template orcAssert(cond, msg) = template orcAssert(cond, msg) =
if not cond: when logOrc:
cfprintf(cstderr, "[Bug!] %s\n", msg) if not cond:
quit 1 cfprintf(cstderr, "[Bug!] %s\n", msg)
quit 1
var var
roots {.threadvar.}: CellSeq roots {.threadvar.}: CellSeq