Fixed Ourpalm#664

ViseEngine · Mar 24, 2022 · 9489e8d · 9489e8d
1 parent 634b289
commit 9489e8d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/ILRuntime/Runtime/Intepreter/ILIntepreter.cs b/ILRuntime/Runtime/Intepreter/ILIntepreter.cs
@@ -3375,6 +3375,10 @@ public object Run(ILMethod method, object instance, object[] p)
                                     {
                                         //Nothing to do with primitive types
                                     }
+                                    else if (objRef->ObjectType == ObjectTypes.ValueTypeObjectReference)
+                                    {
+                                        //Nothing to do with ValueTypeReference
+                                    }
                                     else
                                         throw new InvalidCastException();
                                 }

diff --git a/ILRuntime/Runtime/Intepreter/RegisterVM/ILIntepreter.Register.cs b/ILRuntime/Runtime/Intepreter/RegisterVM/ILIntepreter.Register.cs
@@ -4043,6 +4043,10 @@ public unsafe partial class ILIntepreter
                                     {
                                         //Nothing to do with primitive types
                                     }
+                                    else if (objRef->ObjectType == ObjectTypes.ValueTypeObjectReference)
+                                    {
+                                        //Nothing to do with ValueTypeReference
+                                    }
                                     else
                                         throw new InvalidCastException();
                                 }

diff --git a/TestCases/SimpleTest.cs b/TestCases/SimpleTest.cs
@@ -194,6 +194,13 @@ public static void NullableTest()
                 Console.WriteLine(val.Value.ToString());
         }
 
+        public static void NullableTest2()
+        {
+            int? val = null;
+            if (val.HasValue)
+                Console.WriteLine(val.Value.ToString());
+        }
+
         static void foo4() { }
         static Action act1 = null;
         class Test4

diff --git a/TestCases/Structs.cs b/TestCases/Structs.cs
@@ -425,5 +425,23 @@ public static void StructTest14()
             List<NestedStruct> lst = new List<NestedStruct>();
             lst.Add(new NestedStruct(new Vector3(1, 2, 3)));
         }
+
+        class EventArgs
+        {
+            public object[] args;
+        }
+        public static void StructTest15()
+        {
+            EventArgs arg = new EventArgs();
+            arg.args = new object[] { new Vector3() };
+
+            if(arg.args[0] is Vector3)
+            {
+                Vector3 a = (Vector3)arg.args[0];
+                Console.WriteLine(a.ToString());
+            }
+        }
+
+
     }
 }