AOT: fix enum usage (#1760)

sebastienros · Jan 25, 2024 · da39b1d · da39b1d
1 parent 60cbc25
commit da39b1d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Jint/Native/JsNumber.cs b/Jint/Native/JsNumber.cs
@@ -88,7 +88,7 @@ internal override bool ToBoolean()
 
     internal static JsNumber Create(object value)
     {
-        var underlyingType = System.Type.GetTypeCode(Enum.GetUnderlyingType(value.GetType()));
+        var underlyingType = System.Type.GetTypeCode(value.GetType());
         return underlyingType switch
         {
             TypeCode.Int64 => Create(Convert.ToInt64(value, CultureInfo.InvariantCulture)),

diff --git a/Jint/Runtime/Interop/TypeReference.cs b/Jint/Runtime/Interop/TypeReference.cs
@@ -298,8 +298,11 @@ private static ReflectionAccessor ResolveMemberAccessor(Engine engine, Type type
             {
                 var memberNameComparer = typeResolver.MemberNameComparer;
                 var typeResolverMemberNameCreator = typeResolver.MemberNameCreator;
-
+#if NET7_0_OR_GREATER
+                var enumValues = type.GetEnumValuesAsUnderlyingType();
+#else
                 var enumValues = Enum.GetValues(type);
+#endif
                 var enumNames = Enum.GetNames(type);
 
                 for (var i = 0; i < enumValues.Length; i++)