Optimize property group Clear

Author: exyi

src/Framework/Framework/Controls/DotvvmControlProperties.cs

@@ -312,75 +312,77 @@ private readonly int CountPropertyGroupOutlined(ushort groupId)
 
         public void ClearPropertyGroup(ushort groupId)
         {
-            switch (state)
+            if (state == TableState.Empty)
+                return;
+            else if (state == TableState.Dictinary)
             {
-                case TableState.Empty:
-                    return;
-                case TableState.Array8:
-                case TableState.Array16:
-                {
-                    var bitmap = Impl.FindGroupBitmap(this.keys!, groupId);
-                    int index = 0;
-                    if (bitmap == 0)
-                        return;
-                    OwnKeys();
-                    OwnValues();
-                    do
-                    {
-                        int bit = BitOperations.TrailingZeroCount(bitmap);
-                        bitmap >>= (bit + 1);
-                        index += bit;
-                        Debug.Assert(keys![index].IsInPropertyGroup(groupId), $"Key {keys[index]} at index {index} is not in property group {groupId}");
-                        keys![index] = default;
-                        valuesAsArray[index] = null;
-                        index++;
-                    } while (bitmap != 0);
-                    CheckInvariant();
-                    return;
-                }
-                case TableState.Dictinary:
-                {
-                    var dict = this.valuesAsDictionary;
-                    // we want to avoid allocating the list if there is only one property
-                    DotvvmPropertyId toRemove = default;
-                    List<DotvvmPropertyId>? toRemoveRest = null;
+                ClearPropertyGroupOutlined(groupId);
+                return;
+            }
+            
+            Debug.Assert(state is TableState.Array16 or TableState.Array8);
+            var bitmap = Impl.FindGroupBitmap(this.keys!, groupId);
+            if (bitmap == 0)
+                return;
 
-                    foreach (var (p, _) in dict)
-                    {
-                        if (p.IsInPropertyGroup(groupId))
-                        {
-                            if (toRemove.Id == 0)
-                                toRemove = p;
-                            else
-                            {
-                                toRemoveRest ??= new List<DotvvmPropertyId>();
-                                toRemoveRest.Add(p);
-                            }
-                        }
-                    }
+            OwnKeys();
+            OwnValues();
 
-                    if (toRemove.Id != 0)
-                    {
-                        if (!ownsValues)
-                        {
-                            CloneValues();
-                            dict = this.valuesAsDictionary;
-                        }
+            int index = 0;
+            var values = Impl.UnsafeArrayReference(this.valuesAsArray);
+            var keys = Impl.UnsafeArrayReference(this.keys!);
+            do
+            {
+                int bit = BitOperations.TrailingZeroCount(bitmap);
+                bitmap >>= (bit + 1);
+                index += bit;
+                Debug.Assert(this.keys![index].IsInPropertyGroup(groupId), $"Key {this.keys[index]} at index {index} is not in property group {groupId}");
+                Unsafe.Add(ref keys, index) = default;
+                Unsafe.Add(ref values, index) = null;
+                index++;
+            } while (bitmap != 0);
+            CheckInvariant();
+        }
 
-                        dict.Remove(toRemove);
-                    }
+        private void ClearPropertyGroupOutlined(ushort groupId)
+        {
+            var dict = this.valuesAsDictionary;
+            // we want to avoid allocating the list if there is only one property
+            DotvvmPropertyId toRemove = default;
+            List<DotvvmPropertyId>? toRemoveRest = null;
 
-                    if (toRemoveRest is {})
+            foreach (var (p, _) in dict)
+            {
+                if (p.IsInPropertyGroup(groupId))
+                {
+                    if (toRemove.Id == 0)
+                        toRemove = p;
+                    else
                     {
-                        Debug.Assert(ownsValues);
-                        foreach (var p in toRemoveRest)
-                            dict.Remove(p);
+                        toRemoveRest ??= new List<DotvvmPropertyId>();
+                        toRemoveRest.Add(p);
                     }
-                    CheckInvariant();
-                    return;
                 }
             }
-            Impl.Fail();
+
+            if (toRemove.Id != 0)
+            {
+                if (!ownsValues)
+                {
+                    CloneValues();
+                    dict = this.valuesAsDictionary;
+                }
+
+                dict.Remove(toRemove);
+            }
+
+            if (toRemoveRest is {})
+            {
+                Debug.Assert(ownsValues);
+                foreach (var p in toRemoveRest)
+                    dict.Remove(p);
+            }
+            CheckInvariant();
         }
 
         [MethodImpl(Inline)]
@@ -396,9 +398,9 @@ public readonly bool TryGet(DotvvmPropertyId p, out object? value)
                 if (index >= 0)
                 {
 #if NET6_0_OR_GREATER
-                    value = Unsafe.Add(ref MemoryMarshal.GetArrayDataReference(valuesAsArray), index);
+                    value = Unsafe.Add(ref MemoryMarshal.GetArrayDataReference(valuesAsArrayUnsafe), index);
 #else
-                    value = valuesAsArray[index];
+                    value = valuesAsArrayUnsafe![index];
 #endif
                     return true;
                 }
@@ -422,7 +424,12 @@ private readonly bool TryGetOutlined(DotvvmPropertyId p, out object? value)
                     var index = Impl.FindSlot16(this.keys!, p);
                     if (index >= 0)
                     {
-                        value = valuesAsArray[index];
+
+#if NET6_0_OR_GREATER
+                        value = Unsafe.Add(ref MemoryMarshal.GetArrayDataReference(valuesAsArrayUnsafe), index);
+#else
+                        value = valuesAsArrayUnsafe![index];
+#endif
                         return true;
                     }
                     else
@@ -463,7 +470,7 @@ private readonly bool TryGetOutlined(DotvvmPropertyId p, out object? value)
         public void Set(DotvvmPropertyId p, object? value)
         {
             CheckInvariant();
-            if (p.MemberId == 0) ThrowZeroPropertyId();
+            if (p.MemberId == 0) { ThrowZeroPropertyId(); return; }
 
             if (state == TableState.Array8)
             {

src/Framework/Framework/Controls/PropertyImmutableHashtable.cs

@@ -277,6 +277,7 @@ public static int FindSlotOrFree8(DotvvmPropertyId[] keys, DotvvmPropertyId p, o
         public static int FindSlotOrFree16(DotvvmPropertyId[] keys, DotvvmPropertyId p, out bool exists) =>
             FindSlotOrFree16(ref UnsafeArrayReference(keys), p, out exists);
 
+        [MethodImpl(Inline)]
         public static ushort FindGroupBitmap(ref DotvvmPropertyId keys, int length, ushort groupId)
         {
             Debug.Assert(length is AdhocTableSize or AdhocLargeTableSize);
@@ -312,6 +313,7 @@ public static ushort FindGroupBitmap(ref DotvvmPropertyId keys, int length, usho
             return bitmap;
         }
 
+        [MethodImpl(Inline)]
         public static ushort FindGroupBitmap(DotvvmPropertyId[] keys, ushort groupId)
         {
             return FindGroupBitmap(ref UnsafeArrayReference(keys), keys.Length, groupId);

src/Framework/Framework/Utils/BoxingUtils.cs

@@ -26,6 +26,7 @@ public static object Box(int v)
         }
         public static object? Box(int? v) => v.HasValue ? Box(v.GetValueOrDefault()) : null;
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static object? BoxGeneric<T>(T v)
         {
             if (typeof(T).IsValueType)