Core: Fix byref types not being handled

SamboyCoding · Jan 11, 2024 · 688f307 · 688f307
1 parent 84f5a0a
commit 688f307
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/Cpp2IL.Core/Utils/Il2CppTypeToContext.cs b/Cpp2IL.Core/Utils/Il2CppTypeToContext.cs
@@ -44,7 +44,15 @@ private static TypeAnalysisContext GetPrimitive(this SystemTypesContext context,
             return context.AppContext.SystemTypes.GetPrimitive(type.Type);
 
         if (type.Type is Il2CppTypeEnum.IL2CPP_TYPE_CLASS or Il2CppTypeEnum.IL2CPP_TYPE_VALUETYPE)
-            return context.AppContext.ResolveContextForType(type.AsClass()) ?? throw new($"Could not resolve type context for type {type.AsClass().FullName}");
+        {
+            var typeDefContext = context.AppContext.ResolveContextForType(type.AsClass()) ?? throw new($"Could not resolve type context for type {type.AsClass().FullName}");
+
+            if (type.Byref == 1)
+                // Byref types need to be wrapped
+                return typeDefContext.MakeByReferenceType();
+
+            return typeDefContext;
+        }
 
         if (type.Type is Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST)
             return new GenericInstanceTypeAnalysisContext(type, context);