Fix another bug in the hash table.

davidchisnall · davidchisnall · commit a8e5f6ced073 · 2018-08-06T14:51:04.000+01:00
Clearing the secondMaps was incorrect for cases where the secondMaps
included a wrap around to the start of the table.
diff --git a/hash_table.h b/hash_table.h
@@ -394,9 +394,10 @@ static void PREFIX(_remove)(PREFIX(_table) *table, void *key)
 
 	uint32_t hash = MAP_TABLE_HASH_KEY(key);
 	PREFIX(_table_cell) baseCell = PREFIX(_table_lookup)(table, hash);
-	if (baseCell && baseCell < cell && cell - baseCell <= 32)
+	if (baseCell && baseCell != cell)
 	{
-		uint32_t jump = 1 << (cell - baseCell - 1);
+		uint32_t displacement = (cell - baseCell + table->table_size) % table->table_size;
+		uint32_t jump = 1 << (displacement - 1);
 		if ((baseCell->secondMaps & jump))
 		{
 			// If we are removing a cell stored adjacent to its base due to hash

Original file line number	Diff line number	Diff line change
`@@ -394,9 +394,10 @@ static void PREFIX(_remove)(PREFIX(_table) table, void key)`
`394`	`394`
`395`	`395`	`uint32_t hash = MAP_TABLE_HASH_KEY(key);`
`396`	`396`	`PREFIX(_table_cell) baseCell = PREFIX(_table_lookup)(table, hash);`
`397`		`- if (baseCell && baseCell < cell && cell - baseCell <= 32)`
	`397`	`+ if (baseCell && baseCell != cell)`
`398`	`398`	`{`
`399`		`- uint32_t jump = 1 << (cell - baseCell - 1);`
	`399`	`+ uint32_t displacement = (cell - baseCell + table->table_size) % table->table_size;`
	`400`	`+ uint32_t jump = 1 << (displacement - 1);`
`400`	`401`	`if ((baseCell->secondMaps & jump))`
`401`	`402`	`{`
`402`	`403`	`// If we are removing a cell stored adjacent to its base due to hash`