mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-04-19 22:10:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

applies to reference types

Browse Source
This commit is contained in:
ringabout
2025-12-23 22:53:31 +08:00
parent 110e2a50be
commit 7fc4a55819
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/isolation_check.nim
View File

@@ -165,7 +165,7 @@ proc containsVariable(n: PNode): bool =
proc checkIsolate*(conf: ConfigRef, n: PNode): bool =
if conf.selectedGC notin {gcArc, gcAtomicArc, gcOrc} and
containsGarbageCollectedRef(n.typ):
containsGarbageCollectedRefRecursive(n.typ):
message(conf, n.info, warnGcIsolated, "'$#' containing garbage-collected types cannot be isolated in refc" % [$n.typ])
if types.containsTyRef(n.typ):
# XXX Maybe require that 'n.typ' is acyclic. This is not much

33
compiler/types.nim
View File

@@ -252,32 +252,32 @@ proc iterOverType(t: PType, iter: TTypeIter, closure: RootRef): bool =
result = iterOverTypeAux(marker, t, iter, closure)
proc searchTypeForAux(t: PType, predicate: TTypePredicate,
marker: var IntSet): bool
marker: var IntSet; recursive: bool = false): bool
proc searchTypeNodeForAux(n: PNode, p: TTypePredicate,
marker: var IntSet): bool =
marker: var IntSet; recursive: bool = false): bool =
result = false
case n.kind
of nkRecList:
for i in 0..<n.len:
result = searchTypeNodeForAux(n[i], p, marker)
result = searchTypeNodeForAux(n[i], p, marker, recursive)
if result: return
of nkRecCase:
assert(n[0].kind == nkSym)
result = searchTypeNodeForAux(n[0], p, marker)
result = searchTypeNodeForAux(n[0], p, marker, recursive)
if result: return
for i in 1..<n.len:
case n[i].kind
of nkOfBranch, nkElse:
result = searchTypeNodeForAux(lastSon(n[i]), p, marker)
result = searchTypeNodeForAux(lastSon(n[i]), p, marker, recursive)
if result: return
else: discard
of nkSym:
result = searchTypeForAux(n.sym.typ, p, marker)
result = searchTypeForAux(n.sym.typ, p, marker, recursive)
else: discard
proc searchTypeForAux(t: PType, predicate: TTypePredicate,
marker: var IntSet): bool =
marker: var IntSet; recursive: bool = false): bool =
# iterates over VALUE types!
result = false
if t == nil: return
@@ -287,20 +287,23 @@ proc searchTypeForAux(t: PType, predicate: TTypePredicate,
case t.kind
of tyObject:
if t.baseClass != nil:
result = searchTypeForAux(t.baseClass.skipTypes(skipPtrs), predicate, marker)
if not result: result = searchTypeNodeForAux(t.n, predicate, marker)
result = searchTypeForAux(t.baseClass.skipTypes(skipPtrs), predicate, marker, recursive)
if not result: result = searchTypeNodeForAux(t.n, predicate, marker, recursive)
of tyGenericInst, tyDistinct, tyAlias, tySink:
result = searchTypeForAux(skipModifier(t), predicate, marker)
result = searchTypeForAux(skipModifier(t), predicate, marker, recursive)
of tyArray, tySet, tyTuple:
for a in t.kids:
result = searchTypeForAux(a, predicate, marker)
result = searchTypeForAux(a, predicate, marker, recursive)
if result: return
of tyRef, tyPtr, tyUncheckedArray, tyOpenArray, tyVarargs:
if recursive:
result = searchTypeForAux(t.elementType, predicate, marker, recursive)
else:
discard
proc searchTypeFor*(t: PType, predicate: TTypePredicate): bool =
var marker = initIntSet()
result = searchTypeForAux(t, predicate, marker)
result = searchTypeForAux(t, predicate, marker, recursive = false)
proc isObjectPredicate(t: PType): bool =
result = t.kind == tyObject
@@ -364,6 +367,12 @@ proc containsGarbageCollectedRef*(typ: PType): bool =
# things that are garbage-collected)
result = searchTypeFor(typ, isGCRef)
proc containsGarbageCollectedRefRecursive*(typ: PType): bool =
# returns true if typ contains a reference, sequence or string (all the
# things that are garbage-collected). It checks recursively
var marker = initIntSet()
result = searchTypeForAux(typ, isGCRef, marker, recursive = true)
proc isManagedMemory(t: PType): bool =
result = t.kind in GcTypeKinds or
(t.kind == tyProc and t.callConv == ccClosure)