Skip to content

fix: inject async函数的两个问题 #419

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

Open
zombieyang wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: inject async函数的两个问题 #419

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
115fbc3
fix: 用class实现的AsyncMethodBuilder,会导致IL2cpp构建错误
zombieyang Jun 14, 2024
5f54930
fix: AwaitUnsafeOnCompleted超过128个的话，生成的Call不正确
zombieyang Jul 3, 2024
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
50 changes: 32 additions & 18 deletions Source/VSProj/Src/Tools/CodeTranslator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ int addExternMethod(MethodReference callee, MethodDefinition caller)

if (callee.Name == "AwaitUnsafeOnCompleted")
{

if (!awaitUnsafeOnCompletedMethods.Any(m => ((GenericInstanceMethod)callee).GenericArguments[0] == ((GenericInstanceMethod)m).GenericArguments[0]))
{
awaitUnsafeOnCompletedMethods.Add(callee);
Expand Down Expand Up @@ -2215,24 +2214,39 @@ void addInterfaceToBridge(TypeReference itf)

void EmitRefAwaitUnsafeOnCompletedMethod()
{
MethodDefinition targetMethod = new MethodDefinition("RefAwaitUnsafeOnCompleteMethod",
Mono.Cecil.MethodAttributes.Public, assembly.MainModule.TypeSystem.Void);
var instructions = targetMethod.Body.Instructions;
var localBridge = new VariableDefinition(itfBridgeType);
targetMethod.Body.Variables.Add(localBridge);
for (int j = 0;j < awaitUnsafeOnCompletedMethods.Count;j++)
{
var localTaskAwaiter = new VariableDefinition(((GenericInstanceMethod)awaitUnsafeOnCompletedMethods[j]).GenericArguments[0]);
targetMethod.Body.Variables.Add(localTaskAwaiter);
var localAsync = new VariableDefinition(awaitUnsafeOnCompletedMethods[j].DeclaringType);
targetMethod.Body.Variables.Add(localAsync);
instructions.Add(Instruction.Create(OpCodes.Ldloca_S, localAsync));
instructions.Add(Instruction.Create(OpCodes.Ldloca_S, localTaskAwaiter));
instructions.Add(Instruction.Create(OpCodes.Ldloca_S, localBridge));
instructions.Add(Instruction.Create(OpCodes.Call, makeGenericMethod(awaitUnsafeOnCompletedMethods[j].GetElementMethod(), ((GenericInstanceMethod)awaitUnsafeOnCompletedMethods[j]).GenericArguments[0], itfBridgeType)));
int m = 0;
int rm = 0;
while (m < awaitUnsafeOnCompletedMethods.Count)
{
MethodDefinition targetMethod = new MethodDefinition("RefAwaitUnsafeOnCompleteMethod" + (rm++),
Mono.Cecil.MethodAttributes.Public, assembly.MainModule.TypeSystem.Void);
var instructions = targetMethod.Body.Instructions;

var localBridge = new VariableDefinition(itfBridgeType);
targetMethod.Body.Variables.Add(localBridge);

int j = m;
for (; j < awaitUnsafeOnCompletedMethods.Count && j - m < 128; j++)
{
var localTaskAwaiter = new VariableDefinition(((GenericInstanceMethod)awaitUnsafeOnCompletedMethods[j]).GenericArguments[0]);
targetMethod.Body.Variables.Add(localTaskAwaiter);
var localAsync = new VariableDefinition(awaitUnsafeOnCompletedMethods[j].DeclaringType);
targetMethod.Body.Variables.Add(localAsync);

if (awaitUnsafeOnCompletedMethods[j].DeclaringType.IsValueType)
instructions.Add(Instruction.Create(OpCodes.Ldloca_S, localAsync));
else
instructions.Add(Instruction.Create(OpCodes.Ldloc_S, localAsync));
instructions.Add(Instruction.Create(OpCodes.Ldloca_S, localTaskAwaiter));
instructions.Add(Instruction.Create(OpCodes.Ldloca_S, localBridge));

instructions.Add(Instruction.Create(OpCodes.Call, makeGenericMethod(awaitUnsafeOnCompletedMethods[j].GetElementMethod(), ((GenericInstanceMethod)awaitUnsafeOnCompletedMethods[j]).GenericArguments[0], itfBridgeType)));
}

m = j;
instructions.Add(Instruction.Create(OpCodes.Ret));
itfBridgeType.Methods.Add(targetMethod);
}
instructions.Add(Instruction.Create(OpCodes.Ret));
itfBridgeType.Methods.Add(targetMethod);
}

private void EmitAsyncBuilderStartMethod(IEnumerable<TypeDefinition> allTypes)
Expand Down