From 6599dca857a0b597084fb18c5802d368c8a75cb2 Mon Sep 17 00:00:00 2001 From: Araq Date: Tue, 10 Jan 2012 01:01:21 +0100 Subject: [PATCH] GC: interior pointers on stack are not necessarily aligned --- lib/system/gc.nim | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/system/gc.nim b/lib/system/gc.nim index 6fa5d09b80..2f6b5d3952 100755 --- a/lib/system/gc.nim +++ b/lib/system/gc.nim @@ -559,7 +559,7 @@ proc gcMark(gch: var TGcHeap, p: pointer) {.inline.} = # the addresses are not as cells on the stack, so turn them to cells: var cell = usrToCell(p) var c = cast[TAddress](cell) - if c >% PageSize and (c and (MemAlign-1)) == 0: + if c >% PageSize: # fast check: does it look like a cell? var objStart = cast[PCell](interiorAllocatedPtr(gch.region, cell)) if objStart != nil: @@ -578,13 +578,6 @@ proc nimKeepAlive(p: PGenericSeq) {.compilerRtl, noinline.} = if isAllocatedPtr(gch.region, c): c.refcount = c.refcount or rcMarked -proc nimGCFrame(p: pointer) {.compilerRtl, noinline.} = - # 'cast' is correct here! no offset to add: - var c = cast[PCell](p) - var x = cast[TAddress](c) - if x <% PageSize and (x and (MemAlign-1)) == 0: - c.refcount = c.refcount or rcMarked - proc markThreadStacks(gch: var TGcHeap) = when hasThreadSupport and hasSharedHeap: {.error: "not fully implemented".}