Fixed #314

Ourpalm · Apr 1, 2020 · 000ba1c · 000ba1c
1 parent 5a30a15
commit 000ba1c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/ILRuntime/Runtime/Intepreter/ILIntepreter.cs b/ILRuntime/Runtime/Intepreter/ILIntepreter.cs
@@ -3119,13 +3119,10 @@ public object Run(ILMethod method, object instance, object[] p)
                                                 default:
                                                     throw new NotImplementedException();
                                             }
-
-                                            Free(esp - 1);
-                                            esp--;
                                         }
                                         else
                                         {
-                                            PushNull(esp);
+                                            //PushNull(esp);
                                             switch (objRef->ObjectType)
                                             {
                                                 case ObjectTypes.StaticFieldReference:
@@ -3161,9 +3158,10 @@ public object Run(ILMethod method, object instance, object[] p)
                                         }
                                         else if(type.IsPrimitive)
                                             StackObject.Initialized(objRef, type);
-                                        Free(esp - 1);
-                                        esp--;
                                     }
+
+                                    Free(esp - 1);
+                                    esp--;
                                 }
                                 break;
                             case OpCodeEnum.Isinst:

diff --git a/TestCases/InheritanceTest.cs b/TestCases/InheritanceTest.cs
@@ -201,6 +201,30 @@ public static void InheritanceTest12()
             }
         }
 
+        public static void InheritanceTest13()
+        {
+            new TestClass().TestMethod();
+        }
+
+        public interface IData { }
+
+        public class Data : IData { }
+
+        public abstract class Test<T> where T : class, IData
+        {
+            public T Data { get; protected set; }
+
+            public void TestMethod()
+            {
+                Data = null;//此处赋值为null会出现异常, 非null不会发生异常
+                Console.WriteLine(Data);
+            }
+        }
+
+        public class TestClass : Test<Data>
+        {
+        }
+
         class TestCls5 : TestClass2
         {
             public override float AbMethod2(int arg1)