Skip to content

Rewrite HashSet<T>'s implementation based on Dictionary<T>'s #37180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephentoub merged 9 commits into from
May 31, 2020
Merged

Rewrite HashSet<T>'s implementation based on Dictionary<T>'s #37180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
654dbed
Move HashSet to Corelib
stephentoub May 28, 2020
dd5704e
Small style cleanups in Dictionary
stephentoub May 28, 2020
199ed21
Rewrite HashSet based on Dictionary's implementation
stephentoub May 29, 2020
04f9a81
Make a corresponding cleanup change to Dictionary
stephentoub May 29, 2020
f263ca0
Use HashSet in Corelib
stephentoub May 29, 2020
b547422
Address PR feedback
stephentoub May 29, 2020
9210a2b
Clean up HashSetEqualityComparer
stephentoub May 30, 2020
e0a230a
Port Dictionary's comparer serialization test to HashSet
stephentoub May 30, 2020
80963b9
Address PR feedback
stephentoub May 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 6 additions & 21 deletions src/coreclr/src/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ private RuntimeType[] PopulateInterfaces(Filter filter)
}
else
{
List<RuntimeType?> al = new List<RuntimeType?>();
var al = new HashSet<RuntimeType>();

// Get all constraints
Type[] constraints = declaringType.GetGenericParameterConstraints();
Expand All @@ -1003,31 +1003,16 @@ private RuntimeType[] PopulateInterfaces(Filter filter)

Type[] temp = constraint.GetInterfaces();
for (int j = 0; j < temp.Length; j++)
al.Add(temp[j] as RuntimeType);
al.Add((RuntimeType)temp[j]);
}

// Remove duplicates
Dictionary<RuntimeType, RuntimeType> ht = new Dictionary<RuntimeType, RuntimeType>();
for (int i = 0; i < al.Count; i++)
// Populate list, without duplicates
foreach (RuntimeType rt in al)
{
RuntimeType constraint = al[i]!;
if (!ht.ContainsKey(constraint))
ht[constraint] = constraint;
}

RuntimeType[] interfaces = new RuntimeType[ht.Values.Count];
ht.Values.CopyTo(interfaces, 0);

// Populate link-list
for (int i = 0; i < interfaces.Length; i++)
{
if (filter.RequiresStringComparison())
if (!filter.RequiresStringComparison() || filter.Match(RuntimeTypeHandle.GetUtf8Name(rt)))
{
if (!filter.Match(RuntimeTypeHandle.GetUtf8Name(interfaces[i])))
continue;
list.Add(rt);
}

list.Add(interfaces[i]);
}
}

Expand Down
0 ...c/System/Collections/Generic/BitHelper.cs → ...c/System/Collections/Generic/BitHelper.cs
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions src/libraries/System.Collections/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,6 @@
<data name="Arg_BitArrayTypeUnsupported" xml:space="preserve">
<value>Only supported array types for CopyTo on BitArrays are Boolean[], Int32[] and Byte[].</value>
</data>
<data name="Arg_HSCapacityOverflow" xml:space="preserve">
<value>HashSet capacity is too big.</value>
</data>
<data name="Arg_HTCapacityOverflow" xml:space="preserve">
<value>Hashtable's capacity overflowed and went negative. Check load factor, capacity and the current size of the table.</value>
</data>
Expand Down
5 changes: 2 additions & 3 deletions src/libraries/System.Collections/src/System.Collections.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,11 @@
</ItemGroup>
<ItemGroup>
<Compile Include="System\Collections\BitArray.cs" />
<Compile Include="System\Collections\Generic\BitHelper.cs" />
<Compile Include="System\Collections\Generic\CollectionExtensions.cs" />
<Compile Include="$(CoreLibSharedDir)System\Collections\Generic\ICollectionDebugView.cs"
Link="Common\System\Collections\Generic\ICollectionDebugView.cs" />
<Compile Include="$(CoreLibSharedDir)System\Collections\Generic\IDictionaryDebugView.cs"
Link="Common\System\Collections\Generic\IDictionaryDebugView.cs" />
<Compile Include="System\Collections\Generic\HashSet.cs" />
<Compile Include="System\Collections\Generic\HashSetEqualityComparer.cs" />
<Compile Include="System\Collections\Generic\LinkedList.cs" />
<Compile Include="System\Collections\Generic\Queue.cs" />
<Compile Include="System\Collections\Generic\QueueDebugView.cs" />
Expand All @@ -33,6 +30,8 @@
<!-- Shared Common -->
<Compile Include="$(CoreLibSharedDir)System\Collections\HashHelpers.cs"
Link="Common\System\Collections\HashHelpers.cs" />
<Compile Include="$(CommonPath)System\Collections\Generic\BitHelper.cs"
Link="Common\System\Collections\Generic\BitHelper.cs" />
<Compile Include="$(CommonPath)System\Collections\Generic\EnumerableHelpers.cs"
Link="Common\System\Collections\Generic\EnumerableHelpers.cs" />
</ItemGroup>
Expand Down
Loading