Merge pull request #648 from lahma/avoid-params-array-in-hash-code

Avoid extra allocations in YamlScalarNode GetHashCode
aaubry · Nov 15, 2021 · 0d145bd · 0d145bd
2 parents 961d6fc + d2599e8
commit 0d145bd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/YamlDotNet/Core/HashCode.cs b/YamlDotNet/Core/HashCode.cs
@@ -42,16 +42,6 @@ public static int CombineHashCodes(int h1, object? o2)
             return CombineHashCodes(h1, GetHashCode(o2));
         }
 
-        public static int CombineHashCodes(object? first, params object?[] others)
-        {
-            var hashCode = GetHashCode(first);
-            foreach (var other in others)
-            {
-                hashCode = CombineHashCodes(hashCode, other);
-            }
-            return hashCode;
-        }
-
         private static int GetHashCode(object? obj)
         {
             return obj != null ? obj.GetHashCode() : 0;

diff --git a/YamlDotNet/Core/TagName.cs b/YamlDotNet/Core/TagName.cs
@@ -23,7 +23,7 @@
 
 namespace YamlDotNet.Core
 {
-    public struct TagName : IEquatable<TagName>
+    public readonly struct TagName : IEquatable<TagName>
     {
         public static readonly TagName Empty = default;
 

diff --git a/YamlDotNet/RepresentationModel/YamlScalarNode.cs b/YamlDotNet/RepresentationModel/YamlScalarNode.cs
@@ -125,7 +125,7 @@ public override bool Equals(object? obj)
         /// </returns>
         public override int GetHashCode()
         {
-            return CombineHashCodes(Tag, Value);
+            return CombineHashCodes(Tag.GetHashCode(), Value);
         }
 
         /// <summary>