Core: Support "v29.2"'s isUnmanagedCallersOnly the *correct* way

SamboyCoding · Aug 31, 2024 · 11302ac · 11302ac
1 parent 6d5d326
commit 11302ac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Cpp2IL.Core/Model/Contexts/SystemTypesContext.cs b/Cpp2IL.Core/Model/Contexts/SystemTypesContext.cs
@@ -25,6 +25,7 @@ public class SystemTypesContext
     public TypeAnalysisContext SystemTypedReferenceType { get; }
     public TypeAnalysisContext SystemTypeType { get; }
     public TypeAnalysisContext SystemAttributeType { get; }
+    public TypeAnalysisContext? UnmanagedCallersOnlyAttributeType { get; }
 
     public SystemTypesContext(ApplicationAnalysisContext appContext)
     {
@@ -62,5 +63,7 @@ public SystemTypesContext(ApplicationAnalysisContext appContext)
 
         SystemExceptionType = systemAssembly.GetTypeByFullName("System.Exception")!;
         SystemAttributeType = systemAssembly.GetTypeByFullName("System.Attribute")!;
+
+        UnmanagedCallersOnlyAttributeType = systemAssembly.GetTypeByFullName("System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute");
     }
 }
diff --git a/Cpp2IL.Core/Utils/AsmResolver/AsmResolverAssemblyPopulator.cs b/Cpp2IL.Core/Utils/AsmResolver/AsmResolverAssemblyPopulator.cs
@@ -406,7 +406,16 @@ private static void CopyMethodsInType(ReferenceImporter importer, TypeAnalysisCo
             var managedMethod = new MethodDefinition(methodCtx.MethodName, (MethodAttributes)methodCtx.Attributes, signature);
 
             if (methodCtx.Definition != null)
-                managedMethod.ImplAttributes = (MethodImplAttributes)methodCtx.Definition.iflags;
+            {
+                managedMethod.ImplAttributes = (MethodImplAttributes)methodCtx.Definition.MethodImplAttributes;
+                if (methodCtx.Definition.IsUnmanagedCallersOnly && typeContext.AppContext.SystemTypes.UnmanagedCallersOnlyAttributeType != null)
+                {
+                    var unmanagedCallersOnlyType = typeContext.AppContext.SystemTypes.UnmanagedCallersOnlyAttributeType.GetExtraData<TypeDefinition>("AsmResolverType");
+                    if(unmanagedCallersOnlyType != null)
+                        managedMethod.CustomAttributes.Add(new CustomAttribute((ICustomAttributeType)importer.ImportMethod(unmanagedCallersOnlyType.GetConstructor()!), new()));
+                }
+
+            }
 
             //Add parameter definitions if we have them so we get names, defaults, out params, etc
             foreach (var parameterDefinition in parameterDefinitions)