Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复Stfld与Ldfld当对象为适配器时的异常 #655

Merged
merged 2 commits into from
Feb 10, 2022
Merged

修复Stfld与Ldfld当对象为适配器时的异常 #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21664a9
修复Stfld与Ldfld当对象为适配器时的异常
tyrant39001 Feb 8, 2022
1e2470f
修复Stfld与Ldfld当对象为适配器时的异常(包括寄存器模式)
Endures Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions ILRuntime/Runtime/Intepreter/ILIntepreter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2105,9 +2105,13 @@ public object Run(ILMethod method, object instance, object[] p)

if (obj != null)
{
ILTypeInstance instance = null;
if (obj is ILTypeInstance)
instance = obj as ILTypeInstance;
else if (obj is CrossBindingAdaptorType)
instance = (obj as CrossBindingAdaptorType).ILInstance;
if (instance != null)
{
ILTypeInstance instance = obj as ILTypeInstance;
val = esp - 1;
instance.AssignFromStack((int)ip->TokenLong, val, AppDomain, mStack);
}
Expand Down Expand Up @@ -2237,11 +2241,13 @@ public object Run(ILMethod method, object instance, object[] p)
Free(ret);
if (obj != null)
{
ILTypeInstance instance = null;
if (obj is ILTypeInstance)
{
ILTypeInstance instance = obj as ILTypeInstance;
instance = obj as ILTypeInstance;
else if (obj is CrossBindingAdaptorType)
instance = (obj as CrossBindingAdaptorType).ILInstance;
if (instance != null)
instance.PushToStack((int)ip->TokenLong, ret, this, mStack);
}
else
{
//var t = obj.GetType();
Expand Down
16 changes: 10 additions & 6 deletions ILRuntime/Runtime/Intepreter/RegisterVM/ILIntepreter.Register.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2965,11 +2965,13 @@ public unsafe partial class ILIntepreter

if (obj != null)
{
ILTypeInstance instance = null;
if (obj is ILTypeInstance)
{
ILTypeInstance instance = obj as ILTypeInstance;
instance = obj as ILTypeInstance;
else if (obj is CrossBindingAdaptorType)
instance = (obj as CrossBindingAdaptorType).ILInstance;
if (instance != null)
instance.AssignFromStack((int)ip->OperandLong, reg2, AppDomain, mStack);
}
else
{
var t = obj.GetType();
Expand Down Expand Up @@ -3068,11 +3070,13 @@ public unsafe partial class ILIntepreter
obj = RetriveObject(objRef, mStack);
if (obj != null)
{
ILTypeInstance instance = null;
if (obj is ILTypeInstance)
{
ILTypeInstance instance = obj as ILTypeInstance;
instance = obj as ILTypeInstance;
else if (obj is CrossBindingAdaptorType)
instance = (obj as CrossBindingAdaptorType).ILInstance;
if (instance != null)
instance.CopyToRegister((int)ip->OperandLong, ref info, ip->Register1);//Check #345
}
else
{
//var t = obj.GetType();
Expand Down
20 changes: 20 additions & 0 deletions TestCases/InheritanceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,26 @@ public static void InheritanceTest20()
}
}

CrossClass crossClass;
public static void InheritanceTest21()
{
var inheritanceTest = new InheritanceTest();
var dic = new Dictionary<int, CrossClass>();
dic.Add(1, new CrossClass());
dic.TryGetValue(1, out inheritanceTest.crossClass);
Console.WriteLine("InheritanceTest21:classA is " + inheritanceTest.crossClass.classA);
}

public static void InheritanceTest22()
{
var inheritanceTest = new InheritanceTest();
var dic = new Dictionary<int, CrossClass>();
dic.Add(1, new CrossClass());
dic.TryGetValue(1, out inheritanceTest.crossClass);
inheritanceTest.crossClass.classA = new ClassA();
Console.WriteLine("InheritanceTest21:classA is " + inheritanceTest.crossClass.classA);
}

class TestExplicitInterface : IDisposable
{
public bool Called { get; set; }
Expand Down