Skip to content

fix: cross-asmdef RPC ILPP #678

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

Merged
merged 2 commits into from
Mar 30, 2021
Merged

fix: cross-asmdef RPC ILPP #678

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f453c59
fix: cross-asmdef RPC ILPP
0xFA11 Mar 30, 2021
1ba916a
Merge branch 'develop' into fix/x-asm-rpc-ilpp
0xFA11 Mar 30, 2021
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
28 changes: 16 additions & 12 deletions com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1502,14 +1502,15 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA
{
var paramTypeDef = paramType.Resolve();
var paramTypeNetworkSerialize_MethodDef = paramTypeDef.Methods.FirstOrDefault(m => m.Name == CodeGenHelpers.INetworkSerializable_NetworkSerialize_Name);
if (paramTypeNetworkSerialize_MethodDef != null)
var paramTypeNetworkSerialize_MethodRef = methodDefinition.Module.ImportReference(paramTypeNetworkSerialize_MethodDef);
if (paramTypeNetworkSerialize_MethodRef != null)
{
if (paramType.IsValueType)
{
// struct (pass by value)
instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1));
instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx));
instructions.Add(processor.Create(OpCodes.Call, paramTypeNetworkSerialize_MethodDef));
instructions.Add(processor.Create(OpCodes.Call, paramTypeNetworkSerialize_MethodRef));
}
else
{
Expand All @@ -1533,7 +1534,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA

instructions.Add(processor.Create(OpCodes.Ldarg, paramIndex + 1));
instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx));
instructions.Add(processor.Create(OpCodes.Callvirt, paramTypeNetworkSerialize_MethodDef));
instructions.Add(processor.Create(OpCodes.Callvirt, paramTypeNetworkSerialize_MethodRef));

instructions.Add(notSetInstr);
}
Expand All @@ -1548,7 +1549,8 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA
var paramElemType = paramType.GetElementType();
var paramElemTypeDef = paramElemType.Resolve();
var paramElemNetworkSerialize_MethodDef = paramElemTypeDef.Methods.FirstOrDefault(m => m.Name == CodeGenHelpers.INetworkSerializable_NetworkSerialize_Name);
if (paramElemNetworkSerialize_MethodDef != null)
var paramElemNetworkSerialize_MethodRef = methodDefinition.Module.ImportReference(paramElemNetworkSerialize_MethodDef);
if (paramElemNetworkSerialize_MethodRef != null)
{
methodDefinition.Body.Variables.Add(new VariableDefinition(typeSystem.Int32));
int arrLenLocalIndex = methodDefinition.Body.Variables.Count - 1;
Expand Down Expand Up @@ -1589,7 +1591,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA
instructions.Add(processor.Create(OpCodes.Ldloc, counterLocalIndex));
instructions.Add(processor.Create(OpCodes.Ldelema, paramElemType));
instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx));
instructions.Add(processor.Create(OpCodes.Call, paramElemNetworkSerialize_MethodDef));
instructions.Add(processor.Create(OpCodes.Call, paramElemNetworkSerialize_MethodRef));
}
else
{
Expand Down Expand Up @@ -1617,7 +1619,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA
instructions.Add(processor.Create(OpCodes.Ldloc, counterLocalIndex));
instructions.Add(processor.Create(OpCodes.Ldelem_Ref));
instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx));
instructions.Add(processor.Create(OpCodes.Callvirt, paramElemNetworkSerialize_MethodDef));
instructions.Add(processor.Create(OpCodes.Callvirt, paramElemNetworkSerialize_MethodRef));

instructions.Add(notSetInstr);
}
Expand Down Expand Up @@ -2458,14 +2460,15 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
{
var paramTypeDef = paramType.Resolve();
var paramTypeNetworkSerialize_MethodDef = paramTypeDef.Methods.FirstOrDefault(m => m.Name == CodeGenHelpers.INetworkSerializable_NetworkSerialize_Name);
if (paramTypeNetworkSerialize_MethodDef != null)
var paramTypeNetworkSerialize_MethodRef = methodDefinition.Module.ImportReference(paramTypeNetworkSerialize_MethodDef);
if (paramTypeNetworkSerialize_MethodRef != null)
{
if (paramType.IsValueType)
{
// struct (pass by value)
processor.Emit(OpCodes.Ldloca, localIndex);
processor.Emit(OpCodes.Ldarg_1);
processor.Emit(OpCodes.Call, paramTypeNetworkSerialize_MethodDef);
processor.Emit(OpCodes.Call, paramTypeNetworkSerialize_MethodRef);
}
else
{
Expand All @@ -2492,7 +2495,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
// INetworkSerializable.NetworkSerialize(serializer)
processor.Emit(OpCodes.Ldloc, localIndex);
processor.Emit(OpCodes.Ldarg_1);
processor.Emit(OpCodes.Callvirt, paramTypeNetworkSerialize_MethodDef);
processor.Emit(OpCodes.Callvirt, paramTypeNetworkSerialize_MethodRef);

processor.Append(notSetInstr);
}
Expand All @@ -2508,7 +2511,8 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
var paramElemType = paramType.GetElementType();
var paramElemTypeDef = paramElemType.Resolve();
var paramElemNetworkSerialize_MethodDef = paramElemTypeDef.Methods.FirstOrDefault(m => m.Name == CodeGenHelpers.INetworkSerializable_NetworkSerialize_Name);
if (paramElemNetworkSerialize_MethodDef != null)
var paramElemNetworkSerialize_MethodRef = methodDefinition.Module.ImportReference(paramElemNetworkSerialize_MethodDef);
if (paramElemNetworkSerialize_MethodRef != null)
{
nhandler.Body.Variables.Add(new VariableDefinition(typeSystem.Int32));
int arrLenLocalIndex = nhandler.Body.Variables.Count - 1;
Expand Down Expand Up @@ -2546,7 +2550,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
processor.Emit(OpCodes.Ldloc, counterLocalIndex);
processor.Emit(OpCodes.Ldelema, paramElemType);
processor.Emit(OpCodes.Ldarg_1);
processor.Emit(OpCodes.Call, paramElemNetworkSerialize_MethodDef);
processor.Emit(OpCodes.Call, paramElemNetworkSerialize_MethodRef);
}
else
{
Expand Down Expand Up @@ -2575,7 +2579,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
processor.Emit(OpCodes.Ldloc, counterLocalIndex);
processor.Emit(OpCodes.Ldelem_Ref);
processor.Emit(OpCodes.Ldarg_1);
processor.Emit(OpCodes.Call, paramElemNetworkSerialize_MethodDef);
processor.Emit(OpCodes.Call, paramElemNetworkSerialize_MethodRef);

processor.Append(notSetInstr);
}
Expand Down