Feedback 3

Author: MichalStrehovsky

src/linker/Linker.Dataflow/ValueNode.cs

@@ -555,7 +555,7 @@ public override bool Equals (ValueNode other)
 
 		public override int GetHashCode ()
 		{
-			return HashUtils.CalcHashCode (Kind, TypeRepresented);
+			return HashCode.Combine(Kind, TypeRepresented);
 		}
 
 		protected override string NodeToString ()
@@ -589,7 +589,7 @@ public override bool Equals (ValueNode other)
 
 		public override int GetHashCode ()
 		{
-			return HashUtils.CalcHashCode (Kind, TypeRepresented);
+			return HashCode.Combine (Kind, TypeRepresented);
 		}
 
 		protected override string NodeToString ()
@@ -623,7 +623,7 @@ public override bool Equals (ValueNode other)
 
 		public override int GetHashCode ()
 		{
-			return HashUtils.CalcHashCode (Kind, Contents);
+			return HashCode.Combine (Kind, Contents);
 		}
 
 		protected override string NodeToString ()
@@ -657,7 +657,7 @@ public override bool Equals (ValueNode other)
 
 		public override int GetHashCode ()
 		{
-			return HashUtils.CalcHashCode (Kind, ParameterIndex);
+			return HashCode.Combine (Kind, ParameterIndex);
 		}
 
 		protected override string NodeToString ()
@@ -772,7 +772,7 @@ public override bool Equals (ValueNode other)
 
 		public override int GetHashCode ()
 		{
-			return HashUtils.CalcHashCode (Kind, Values);
+			return HashCode.Combine (Kind, Values);
 		}
 
 		protected override string NodeToString ()
@@ -863,7 +863,7 @@ public override bool Equals (ValueNode other)
 
 		public override int GetHashCode ()
 		{
-			return HashUtils.CalcHashCode (Kind, AssemblyIdentity, NameString);
+			return HashCode.Combine (Kind, AssemblyIdentity, NameString);
 		}
 
 		protected override string NodeToString ()
@@ -923,7 +923,7 @@ public override bool Equals (ValueNode other)
 
 		public override int GetHashCode ()
 		{
-			return HashUtils.CalcHashCode (Kind, Field, InstanceValue);
+			return HashCode.Combine (Kind, Field, InstanceValue);
 		}
 
 		protected override string NodeToString ()
@@ -947,7 +947,7 @@ public ConstIntValue (int value)
 
 		public override int GetHashCode ()
 		{
-			return HashUtils.CalcHashCode (Kind, Value);
+			return HashCode.Combine (Kind, Value);
 		}
 
 		public override bool Equals (ValueNode other)
@@ -984,7 +984,7 @@ public ArrayValue (ValueNode size)
 
 		public override int GetHashCode ()
 		{
-			return HashUtils.CalcHashCode (Kind, Size);
+			return HashCode.Combine (Kind, Size);
 		}
 
 		public override bool Equals (ValueNode other)
@@ -1087,95 +1087,12 @@ public override bool Equals (object other)
 
 	static class HashUtils
 	{
-		[MethodImpl (MethodImplOptions.AggressiveInlining)]
-		static int _rotl (this int value, int shift)
-		{
-			return (int)(((uint)value << shift) | ((uint)value >> (32 - shift)));
-		}
-
 		public static int CalcHashCodeEnumerable<T> (IEnumerable<T> list) where T : class
 		{
-			int length = list.Count ();
-
-			int hash1 = 0x449b3ad6;
-			int hash2 = (length << 3) + 0x55399219;
-
-			int index = 0;
-
-			T element1 = null;
-			T element2 = null;
-
-			foreach (T element in list) {
-				if ((index++ & 1) == 0) {
-					element1 = element;
-					continue;
-				}
-				element2 = element;
-
-				hash1 = (hash1 + _rotl (hash1, 5)) ^ element1.GetHashCode();
-				hash2 = (hash2 + _rotl (hash2, 5)) ^ element2.GetHashCode();
-			}
-
-			// If we had an odd length, we haven't included the last element yet.
-			if ((length & 1) != 0)
-				hash1 = (hash1 + _rotl (hash1, 5)) ^ element1.GetHashCode();
-
-			hash1 += _rotl (hash1, 8);
-			hash2 += _rotl (hash2, 8);
-
-			return hash1 ^ hash2;
-		}
-
-		public static int CalcHashCode<T1> (ValueNodeKind kind, T1 obj1)
-			where T1 : class
-		{
-			return CalcHashCode (kind, obj1.GetHashCode());
-		}
-
-		public static int CalcHashCode (ValueNodeKind kind, int val1)
-		{
-			return CalcHashCode (kind.GetHashCode (), val1);
-		}
-
-		public static int CalcHashCode (int hashCode1, int hashCode2)
-		{
-			int length = 2;
-
-			int hash1 = 0x449b3ad6;
-			int hash2 = (length << 3) + 0x55399219;
-
-			hash1 = (hash1 + _rotl (hash1, 5)) ^ hashCode1;
-			hash2 = (hash2 + _rotl (hash2, 5)) ^ hashCode2;
-
-			hash1 += _rotl (hash1, 8);
-			hash2 += _rotl (hash2, 8);
-
-			return hash1 ^ hash2;
-		}
-
-		public static int CalcHashCode<T1, T2> (ValueNodeKind kind, T1 obj1, T2 obj2)
-			where T1 : class
-			where T2 : class
-
-		{
-			return CalcHashCode (kind, obj1.GetHashCode(), obj2.GetHashCode());
-		}
-
-		static int CalcHashCode (ValueNodeKind kind, int hashCode1, int hashCode2)
-		{
-			int length = 3;
-
-			int hash1 = 0x449b3ad6;
-			int hash2 = (length << 3) + 0x55399219;
-
-			hash1 = (hash1 + _rotl (hash1, 5)) ^ kind.GetHashCode ();
-			hash2 = (hash2 + _rotl (hash2, 5)) ^ hashCode1;
-			hash1 = (hash1 + _rotl (hash1, 5)) ^ hashCode2;
-
-			hash1 += _rotl (hash1, 8);
-			hash2 += _rotl (hash2, 8);
-
-			return hash1 ^ hash2;
+			HashCode hashCode = new HashCode ();
+			foreach (var item in list)
+				hashCode.Add (item);
+			return hashCode.ToHashCode ();
 		}
 	}
 }

src/linker/Mono.Linker.csproj

@@ -41,6 +41,10 @@
     <Compile Remove="Linker.Steps\ResolveFromXApiStep.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\external\cecil\Mono.Cecil.csproj" />
     <ProjectReference Include="..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb.csproj" />