Fixed a bug with saving delegates

Ourpalm · Mar 7, 2017 · 7512746 · 7512746
1 parent a36831f
commit 7512746
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/ILRuntime/CLR/Utils/Extensions.cs b/ILRuntime/CLR/Utils/Extensions.cs
@@ -151,7 +151,7 @@ public static object CheckCLRTypes(this Type pt, Runtime.Enviorment.AppDomain do
             }
             else if (obj is ILTypeInstance)
             {
-                if (obj is IDelegateAdapter)
+                if (obj is IDelegateAdapter && pt != typeof(ILTypeInstance))
                 {
                     return ((IDelegateAdapter)obj).Delegate;
                 }

diff --git a/ILRuntime/Runtime/Intepreter/DelegateAdapter.cs b/ILRuntime/Runtime/Intepreter/DelegateAdapter.cs
@@ -552,6 +552,7 @@ protected DelegateAdapter(Enviorment.AppDomain appdomain, ILTypeInstance instanc
             this.appdomain = appdomain;
             this.instance = instance;
             this.method = method;
+            CLRInstance = this;
         }
 
         public override bool IsValueType

diff --git a/TestCases/DelegateTest.cs b/TestCases/DelegateTest.cs
@@ -124,6 +124,17 @@ public static void DelegateTest11()
             ILRuntimeTest.TestFramework.BaseClassTest.DoTest();
         }
 
+        public static void DelegateTest12()
+        {
+            testDele += IntTest3;
+            Dictionary<int, TestDelegate> dic = new Dictionary<int, TestDelegate>();
+            dic[0] = testDele;
+            dic[1] = IntTest3;
+            Console.WriteLine(dic[0](1000));
+            Console.WriteLine(dic[1](1000));
+
+        }
+
         static void CallBack(ILRuntimeTest.TestFramework.BaseClassTest a)
         {
             a.testField = true;