Move marking code for dense slabs into extent for consistency. (#406)

snazzy-d · Dec 2, 2024 · 229c066 · 229c066
1 parent f961950
commit 229c066
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/sdlib/d/gc/extent.d b/sdlib/d/gc/extent.d
@@ -516,6 +516,16 @@ public:
 		}
 	}
 
+	bool markDenseSlot(uint index) {
+		assert(extentClass.dense, "size class not dense!");
+		if (extentClass.supportsInlineMarking) {
+			return !slabMetadataMarks.setBitAtomic(index);
+		}
+
+		auto bmp = &outlineMarks;
+		return bmp !is null && !bmp.setBitAtomic(index);
+	}
+
 	@property
 	ref shared(Atomic!ulong) gcWord() {
 		assert(extentClass.sparse, "size class not sparse!");

diff --git a/sdlib/d/gc/scanner.d b/sdlib/d/gc/scanner.d
@@ -454,18 +454,7 @@ private:
 		}
 
 		auto ec = pd.extentClass;
-		if (ec.supportsInlineMarking) {
-			if (e.slabMetadataMarks.setBitAtomic(index)) {
-				return false;
-			}
-		} else {
-			auto bmp = &e.outlineMarks;
-			if (bmp is null || bmp.setBitAtomic(index)) {
-				return false;
-			}
-		}
-
-		return true;
+		return e.markDenseSlot(index);
 	}
 
 	static bool markSparse(PageDescriptor pd, uint index, ubyte cycle) {