Non-generic sort

dotnet · Dec 13, 2022 · 37fe7e9 · 37fe7e9
1 parent 8d4661a
commit 37fe7e9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/EnumInfo.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/EnumInfo.cs
@@ -33,11 +33,7 @@ public EnumInfo(Type underlyingType, TUnderlyingValue[] values, string[] names,
             base(underlyingType, names, isFlags)
         {
             Debug.Assert(values.Length == names.Length);
-
-            if (!Enum.AreSorted(values))
-            {
-                Array.Sort(keys: (Array)values, items: names); // using non-generic overload to avoid generic expansion for every underlying enum type
-            }
+            Debug.Assert(Enum.AreSorted(values));
 
             Values = values;
             ValuesAreSequentialFromZero = Enum.AreSequentialFromZero(values);

diff --git a/...em.Private.Reflection.Execution/src/Internal/Reflection/Execution/NativeFormatEnumInfo.cs b/...em.Private.Reflection.Execution/src/Internal/Reflection/Execution/NativeFormatEnumInfo.cs
@@ -13,8 +13,8 @@ namespace Internal.Reflection.Execution
 {
     static class NativeFormatEnumInfo
     {
-        public static EnumInfo<TUnderlyingValue> Create<TUnderlyingValue>(RuntimeTypeHandle typeHandle, MetadataReader reader, TypeDefinitionHandle typeDefHandle)
-            where TUnderlyingValue : struct, INumber<TUnderlyingValue>
+        private static void GetEnumValuesAndNames(MetadataReader reader, TypeDefinitionHandle typeDefHandle,
+            out object[] sortedBoxedValues, out string[] sortedNames, out bool isFlags)
         {
             TypeDefinition typeDef = reader.GetTypeDefinition(typeDefHandle);
 
@@ -30,8 +30,8 @@ public static EnumInfo<TUnderlyingValue> Create<TUnderlyingValue>(RuntimeTypeHan
                 }
             }
 
-            string[] names = new string[staticFieldCount];
-            TUnderlyingValue[] values = new TUnderlyingValue[staticFieldCount];
+            var names = new string[staticFieldCount];
+            var boxedValues = new object[staticFieldCount]; // TODO: Avoid boxing the values
 
             int i = 0;
             foreach (FieldHandle fieldHandle in typeDef.Fields)
@@ -40,17 +40,34 @@ public static EnumInfo<TUnderlyingValue> Create<TUnderlyingValue>(RuntimeTypeHan
                 if (0 != (field.Flags & FieldAttributes.Static))
                 {
                     names[i] = field.Name.GetString(reader);
-                    values[i] = (TUnderlyingValue)field.DefaultValue.ParseConstantNumericValue(reader);
+                    boxedValues[i] = field.DefaultValue.ParseConstantNumericValue(reader);
                     i++;
                 }
             }
 
-            bool isFlags = false;
+            // Using object overload to avoid generic expansion for every underlying enum type
+            // TODO: Sort the values in the aot compiler
+            Array.Sort<object, string>(boxedValues, names);
+
+            sortedBoxedValues = boxedValues;
+            sortedNames = names;
+
+            isFlags = false;
             foreach (CustomAttributeHandle cah in typeDef.CustomAttributes)
             {
                 if (cah.IsCustomAttributeOfType(reader, "System", "FlagsAttribute"))
                     isFlags = true;
             }
+        }
+
+        public static EnumInfo<TUnderlyingValue> Create<TUnderlyingValue>(RuntimeTypeHandle typeHandle, MetadataReader reader, TypeDefinitionHandle typeDefHandle)
+            where TUnderlyingValue : struct, INumber<TUnderlyingValue>
+        {
+            GetEnumValuesAndNames(reader, typeDefHandle, out object[] boxedValues, out string[] names, out bool isFlags);
+
+            var values = new TUnderlyingValue[boxedValues.Length];
+            for (int i = 0; i < boxedValues.Length; i++)
+                values[i] = (TUnderlyingValue)boxedValues[i];
 
             return new EnumInfo<TUnderlyingValue>(RuntimeAugments.GetEnumUnderlyingType(typeHandle), values, names, isFlags);
         }

diff --git a/src/libraries/System.Private.CoreLib/src/System/Enum.EnumInfo.cs b/src/libraries/System.Private.CoreLib/src/System/Enum.EnumInfo.cs
@@ -22,10 +22,7 @@ public EnumInfo(bool hasFlagsAttribute, TUnderlyingValue[] values, string[] name
                 Values = values;
                 Names = names;
 
-                if (!AreSorted(values))
-                {
-                    Array.Sort(keys: values, items: names);
-                }
+                Array.Sort(keys: values, items: names);
 
                 ValuesAreSequentialFromZero = AreSequentialFromZero(values);
             }