Merge pull request #149 from cspencer51/fix_initialize

Hackerpilot · web-flow · commit 4dcbcb99ecba · 2019-07-15T17:07:24.000-07:00
Register allocated memory with GC during initialization.
diff --git a/src/containers/openhashset.d b/src/containers/openhashset.d
@@ -277,7 +277,9 @@ private:
 	void initialize(size_t nodeCount)
 	{
 		nodes = (cast (Node*) allocator.allocate(nodeCount * Node.sizeof))[0 .. nodeCount];
-		nodes[] = Node.init;
+		static if (useGC)
+			GC.addRange(nodes.ptr, nodes.length * Node.sizeof, typeid(typeof(nodes)));
+        nodes[] = Node.init;
 		_length = 0;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,9 @@ private:`
`277`	`277`	`void initialize(size_t nodeCount)`
`278`	`278`	`{`
`279`	`279`	`nodes = (cast (Node) allocator.allocate(nodeCount Node.sizeof))[0 .. nodeCount];`
`280`		`- nodes[] = Node.init;`
	`280`	`+ static if (useGC)`
	`281`	`+ GC.addRange(nodes.ptr, nodes.length * Node.sizeof, typeid(typeof(nodes)));`
	`282`	`+ nodes[] = Node.init;`
`281`	`283`	`_length = 0;`
`282`	`284`	`}`
`283`	`285`