Implement requested changes

Author: ds5678

Il2CppInterop.Generator/Contexts/RewriteGlobalContext.cs

@@ -87,12 +87,11 @@ public TypeRewriteContext GetNewTypeForOriginal(TypeDefinition originalType)
 
     public TypeRewriteContext.TypeSpecifics JudgeSpecificsByOriginalType(TypeSignature typeRef)
     {
-        if (typeRef.IsPrimitive() || typeRef is PointerTypeSignature || typeRef.FullName == "System.TypedReference")
+        if (typeRef.IsPrimitive() || typeRef.IsPointerLike() || typeRef.FullName == "System.TypedReference")
             return TypeRewriteContext.TypeSpecifics.BlittableStruct;
         if (typeRef
             is CorLibTypeSignature { ElementType: ElementType.String or ElementType.Object }
             or ArrayBaseTypeSignature
-            or ByReferenceTypeSignature
             or GenericParameterSignature
             or GenericInstanceTypeSignature)
             return TypeRewriteContext.TypeSpecifics.ReferenceType;

Il2CppInterop.Generator/Extensions/AsmResolverExtensions.cs

@@ -53,6 +53,10 @@ private static Parameter GetArgument(this ILProcessor instructions, int argument
 
     public static bool IsNested(this TypeSignature type) => type.DeclaringType is not null;
 
+    public static bool IsPointerLike(this TypeSignature type) => type is PointerTypeSignature or ByReferenceTypeSignature;
+
+    public static bool IsValueTypeLike(this TypeSignature type) => type.IsValueType || type.IsPointerLike();
+
     public static bool IsSystemEnum(this GenericParameterConstraint constraint) => constraint.Constraint?.FullName is "System.Enum";
 
     public static bool IsSystemValueType(this GenericParameterConstraint constraint) => constraint.Constraint?.FullName is "System.ValueType";

Il2CppInterop.Generator/Extensions/ILGeneratorEx.cs

@@ -31,15 +31,7 @@ public static void EmitObjectStore(this ILProcessor body, TypeSignature original
             body.Add(OpCodes.Call, imports.IL2CPP_ManagedStringToIl2Cpp.Value);
             body.Add(OpCodes.Call, imports.WriteFieldWBarrier);
         }
-        else if (originalType is PointerTypeSignature)
-        {
-            Debug.Assert(newType is PointerTypeSignature);
-
-            body.AddLoadArgument(argumentIndex);
-            body.Add(OpCodes.Stobj, newType.ToTypeDefOrRef());
-            body.Add(OpCodes.Pop);
-        }
-        else if (originalType.IsValueType)
+        else if (originalType.IsValueTypeLike())
         {
             var typeSpecifics = enclosingType.AssemblyContext.GlobalContext.JudgeSpecificsByOriginalType(originalType);
             if (typeSpecifics == TypeRewriteContext.TypeSpecifics.BlittableStruct)
@@ -195,15 +187,9 @@ public static void EmitObjectToPointer(this ILProcessor body, TypeSignature orig
                 body.Add(OpCodes.Conv_I);
             }
         }
-        else if (originalType is PointerTypeSignature)
-        {
-            Debug.Assert(newType is PointerTypeSignature);
-
-            body.AddLoadArgumentAddress(argumentIndex);
-        }
-        else if (originalType.IsValueType)
+        else if (originalType.IsValueTypeLike())
         {
-            if (newType.IsValueType)
+            if (newType.IsValueTypeLike())
             {
                 if (argumentIndex == 0 && valueTypeArgument0IsAPointer)
                     body.Add(OpCodes.Ldarg_0);
@@ -310,17 +296,9 @@ public static void EmitPointerToObject(this ILProcessor body, TypeSignature orig
         {
             // do nothing
         }
-        else if (originalReturnType is PointerTypeSignature)
-        {
-            Debug.Assert(convertedReturnType is PointerTypeSignature);
-
-            body.Add(OpCodes.Ldloc, pointerVariable);
-            if (unboxValueType) body.Add(OpCodes.Call, imports.IL2CPP_il2cpp_object_unbox.Value);
-            body.Add(OpCodes.Ldobj, convertedReturnType.ToTypeDefOrRef());
-        }
-        else if (originalReturnType.IsValueType)
+        else if (originalReturnType.IsValueTypeLike())
         {
-            if (convertedReturnType.IsValueType)
+            if (convertedReturnType.IsValueTypeLike())
             {
                 body.Add(OpCodes.Ldloc, pointerVariable);
                 if (unboxValueType) body.Add(OpCodes.Call, imports.IL2CPP_il2cpp_object_unbox.Value);