Fixed #293

Ourpalm · Apr 1, 2020 · edd9852 · edd9852
1 parent 70bfd54
commit edd9852
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/ILRuntime/Runtime/Stack/StackObject.cs b/ILRuntime/Runtime/Stack/StackObject.cs
@@ -189,7 +189,8 @@ public unsafe static void Initialized(ref StackObject esp, int idx, Type t, ITyp
         public unsafe static void Initialized(StackObject* esp, IType type)
         {
             var t = type.TypeForCLR;
-            if (type.IsPrimitive || type.IsEnum)
+
+            if (type.IsPrimitive)
             {
                 if (t == typeof(int) || t == typeof(uint) || t == typeof(short) || t == typeof(ushort) || t == typeof(byte) || t == typeof(sbyte) || t == typeof(char) || t == typeof(bool))
                 {
@@ -218,6 +219,12 @@ public unsafe static void Initialized(StackObject* esp, IType type)
                 else
                     throw new NotImplementedException();
             }
+            else if (type.IsEnum)
+            {
+                esp->ObjectType = ObjectTypes.Integer;
+                esp->Value = 0;
+                esp->ValueLow = 0;
+            }
             else
             {
                 *esp = Null;

diff --git a/TestCases/Structs.cs b/TestCases/Structs.cs
@@ -184,5 +184,16 @@ public static void StructTest4()
         {
             Console.WriteLine(Number.minValue.val);
         }
+
+        struct EnumTestStruct
+        {
+            public ILRuntimeTest.TestFramework.TestCLREnum value;
+        }
+
+        public static void StructTest5()
+        {
+            EnumTestStruct val = new EnumTestStruct();
+            Console.WriteLine(val.value);
+        }
     }
 }