From f561afae419212e6eeb33f37f834aa7e9d4b9d6f Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 3 Mar 2021 04:37:42 -0800 Subject: followup #17225: simplify code after removing gc2, generational (#17242) --- lib/system/gc2.nim | 3 +++ lib/system/mmdisp.nim | 4 +--- lib/system/sysstr.nim | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/system') diff --git a/lib/system/gc2.nim b/lib/system/gc2.nim index 09388b6e8..45d467051 100644 --- a/lib/system/gc2.nim +++ b/lib/system/gc2.nim @@ -7,6 +7,9 @@ # distribution, for details about the copyright. # +# xxx deadcode, consider removing unless something could be reused. + + # Garbage Collector # # The basic algorithm is an incremental mark diff --git a/lib/system/mmdisp.nim b/lib/system/mmdisp.nim index 8589b678d..96dc86bfd 100644 --- a/lib/system/mmdisp.nim +++ b/lib/system/mmdisp.nim @@ -68,9 +68,7 @@ else: include "system/cellsets" when not leakDetector and not useCellIds and not defined(nimV2): sysAssert(sizeof(Cell) == sizeof(FreeCell), "sizeof FreeCell") - when compileOption("gc", "v2"): - include "system/gc2" - elif defined(gcRegions): + when defined(gcRegions): # XXX due to bootstrapping reasons, we cannot use compileOption("gc", "stack") here include "system/gc_regions" elif defined(nimV2) or usesDestructors: diff --git a/lib/system/sysstr.nim b/lib/system/sysstr.nim index 06e605a7b..49fff41e9 100644 --- a/lib/system/sysstr.nim +++ b/lib/system/sysstr.nim @@ -304,7 +304,7 @@ proc setLengthSeq(seq: PGenericSeq, elemSize, elemAlign, newLen: int): PGenericS when not defined(boehmGC) and not defined(nogc) and not defined(gcMarkAndSweep) and not defined(gogc) and not defined(gcRegions): - when false: # compileOption("gc", "v2"): + when false: # deadcode: was used by `compileOption("gc", "v2")` for i in newLen..result.len-1: let len0 = gch.tempStack.len forAllChildrenAux(dataPointer(result, elemAlign, elemSize, i), -- cgit 1.4.1-2-gfad0