Skip to content

Commit

Permalink
fixes #15511 (#15524)
Browse files Browse the repository at this point in the history
  • Loading branch information
Araq authored Oct 8, 2020
1 parent cfba237 commit 538a57a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
4 changes: 3 additions & 1 deletion compiler/injectdestructors.nim
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,9 @@ proc passCopyToSink(n: PNode; c: var Con; s: var Scope): PNode =
"if possible, rearrange your program's control flow to prevent it") % $n)
else:
if c.graph.config.selectedGC in {gcArc, gcOrc}:
assert(not containsGarbageCollectedRef(n.typ))
assert(not containsManagedMemory(n.typ))
if n.typ.skipTypes(abstractInst).kind in {tyOpenArray, tyVarargs}:
localError(c.graph.config, n.info, "cannot create an implicit openArray copy to be passed to a sink parameter")
result.add newTree(nkAsgn, tmp, p(n, c, s, normal))
# Since we know somebody will take over the produced copy, there is
# no need to destroy it.
Expand Down
7 changes: 7 additions & 0 deletions compiler/types.nim
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,13 @@ proc containsGarbageCollectedRef*(typ: PType): bool =
# things that are garbage-collected)
result = searchTypeFor(typ, isGCRef)

proc isManagedMemory(t: PType): bool =
result = t.kind in GcTypeKinds or
(t.kind == tyProc and t.callConv == ccClosure)

proc containsManagedMemory*(typ: PType): bool =
result = searchTypeFor(typ, isManagedMemory)

proc isTyRef(t: PType): bool =
result = t.kind == tyRef or (t.kind == tyProc and t.callConv == ccClosure)

Expand Down

0 comments on commit 538a57a

Please sign in to comment.