Fixed Ourpalm#278

yaozb-gif · Sep 25, 2019 · 9cae9ff · 9cae9ff
1 parent 51353c4
commit 9cae9ff
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/ILRuntime/Runtime/Intepreter/ILIntepreter.cs b/ILRuntime/Runtime/Intepreter/ILIntepreter.cs
@@ -177,7 +177,8 @@ public object Run(ILMethod method, object instance, object[] p)
             for (int i = 0; i < method.LocalVariableCount; i++)
             {
                 var v = method.Variables[i];
-                if (v.VariableType.IsValueType && !v.VariableType.IsPrimitive)
+                bool isEnum = (v.VariableType is Mono.Cecil.TypeDefinition td) ? td.IsEnum : false;
+                if (v.VariableType.IsValueType && !v.VariableType.IsPrimitive && !isEnum)
                 {
                     var t = AppDomain.GetType(v.VariableType, method.DeclearingType, method);
                     if (t is ILType)
@@ -210,7 +211,7 @@ public object Run(ILMethod method, object instance, object[] p)
                 }
                 else
                 {
-                    if (v.VariableType.IsPrimitive)
+                    if (v.VariableType.IsPrimitive || isEnum)
                     {
                         var t = AppDomain.GetType(v.VariableType, method.DeclearingType, method);
                         var loc = Add(v1, i);

diff --git a/TestCases/EnumTest.cs b/TestCases/EnumTest.cs
@@ -226,6 +226,26 @@ public static void Test16()
                 Console.WriteLine(item);
             }
         }
+
+        public static void Test17()
+        {
+            /*Dictionary<TestEnum, int> dic = new Dictionary<TestEnum, int>();
+            dic[TestEnum.Enum2] = 123;
+            int res;
+            if (dic.TryGetValue(TestEnum.Enum2, out res))
+            {
+                Console.WriteLine(res);
+            }*/
+
+            //下面这个用例跑不过
+            Dictionary<string, TestEnum> dic2 = new Dictionary<string, TestEnum>();
+            dic2["abc"] = TestEnum.Enum1;
+            TestEnum e;
+            if (dic2.TryGetValue("abc", out e))
+            {
+                Console.WriteLine(e);
+            }
+        }
         class SystemType
         {
             public int value = 10;