fix(Weaver): avoiding short instructions for methods with unknown length

MirageNet · Feb 7, 2022 · f605c46 · f605c46
1 parent eb74c4c
commit f605c46
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Assets/Mirage/Weaver/Processors/AttributeProcessor.cs b/Assets/Mirage/Weaver/Processors/AttributeProcessor.cs
@@ -176,7 +176,7 @@ static void InjectGuardParameters(MethodDefinition md, ILProcessor worker, Instr
                     VariableDefinition elementLocal = md.AddLocal(elementType);
 
                     worker.InsertBefore(top, worker.Create(OpCodes.Ldarg, index + offset));
-                    worker.InsertBefore(top, worker.Create(OpCodes.Ldloca_S, elementLocal));
+                    worker.InsertBefore(top, worker.Create(OpCodes.Ldloca, elementLocal));
                     worker.InsertBefore(top, worker.Create(OpCodes.Initobj, elementType));
                     worker.InsertBefore(top, worker.Create(OpCodes.Ldloc, elementLocal));
                     worker.InsertBefore(top, worker.Create(OpCodes.Stobj, elementType));
@@ -190,7 +190,7 @@ static void InjectGuardReturnValue(MethodDefinition md, ILProcessor worker, Inst
             if (!md.ReturnType.Is(typeof(void)))
             {
                 VariableDefinition returnLocal = md.AddLocal(md.ReturnType);
-                worker.InsertBefore(top, worker.Create(OpCodes.Ldloca_S, returnLocal));
+                worker.InsertBefore(top, worker.Create(OpCodes.Ldloca, returnLocal));
                 worker.InsertBefore(top, worker.Create(OpCodes.Initobj, md.ReturnType));
                 worker.InsertBefore(top, worker.Create(OpCodes.Ldloc, returnLocal));
             }

diff --git a/Assets/Mirage/Weaver/Processors/SyncVarProcessor.cs b/Assets/Mirage/Weaver/Processors/SyncVarProcessor.cs
@@ -425,7 +425,7 @@ void WriteCallHookEvent(ILProcessor worker, EventDefinition @event, VariableDefi
             worker.Append(worker.Create(OpCodes.Ldarg_0));
             worker.Append(worker.Create(OpCodes.Ldfld, eventField));
             // jump to nop if null
-            worker.Append(worker.Create(OpCodes.Brfalse_S, nop));
+            worker.Append(worker.Create(OpCodes.Brfalse, nop));
 
             worker.Append(worker.Create(OpCodes.Ldarg_0));
             worker.Append(worker.Create(OpCodes.Ldfld, eventField));

diff --git a/Assets/Mirage/Weaver/TypeExtensions.cs b/Assets/Mirage/Weaver/TypeExtensions.cs
@@ -253,7 +253,7 @@ public static TypeReference ConvertToGenericIfNeeded(this TypeDefinition type)
             }
         }
 
-        public static FieldReference GetField(this TypeDefinition type, string fieldName)
+        public static FieldDefinition GetField(this TypeDefinition type, string fieldName)
         {
             if (type.HasFields)
             {