Merge pull request #6 from js6pak/ilhelpers

Replace MonoMod.ILHelpers with InlineIL.Fody

Author: nike4613

.gitignore

@@ -232,7 +232,8 @@ ModelManifest.xml
 
 # Rider configuration files
 .idea/
-*.binlog
-*.dump
+*.binlog
+*.dump
 
-.mono/
+.mono/
+FodyWeavers.xsd

MonoMod.Backports.slnx

@@ -16,12 +16,10 @@
   <Folder Name="/src/">
     <Project Path="src/MonoMod.Backports.Shims/MonoMod.Backports.Shims.csproj" />
     <Project Path="src/MonoMod.Backports/MonoMod.Backports.csproj" />
-    <Project Path="src/MonoMod.ILHelpers/MonoMod.ILHelpers.ilproj" Type="C#" />
   </Folder>
   <Folder Name="/src/build/">
     <Project Path="src/GenApiCompatDll/GenApiCompatDll.csproj" Id="265b1234-55c4-4edd-996c-12ac77527224" />
     <Project Path="src/MonoMod.Backports.Tasks/MonoMod.Backports.Tasks.csproj" />
-    <Project Path="src/Postprocess/Postprocess.csproj" />
     <Project Path="src/ShimGen/ShimGen.csproj" />
   </Folder>
 </Solution>

src/MonoMod.Backports/Directory.Build.targets

@@ -4,7 +4,6 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 
   <Import Project="$(MSBuildThisFileDirectory)FilterTfms.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)Postprocess.targets"/>
   <Import Project="$(MSBuildThisFileDirectory)NuGet.targets"/>
 
 </Project>

src/MonoMod.Backports/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+    <InlineIL SequencePoints="True" Warnings="Errors" />
+</Weavers>

src/MonoMod.Backports/MonoMod.Backports.csproj

@@ -19,14 +19,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- Manually reference ILHelpers -->
-    <ProjectReference Include="$(MMSourcePath)MonoMod.ILHelpers\MonoMod.ILHelpers.ilproj">
-      <Aliases>ilhelpers</Aliases>
-      <CopyLocal>false</CopyLocal>
-      <Private>false</Private>
-      <Pack>false</Pack>
-    </ProjectReference>
+    <PackageReference Include="Fody" Version="6.9.2" PrivateAssets="all" />
+    <!-- https://github.com/ltrzesniewski/InlineIL.Fody/pull/35 -->
+    <PackageReference Include="js6pak.InlineIL.Fody" Version="1.10.0-js6pak.1" PrivateAssets="all" ExcludeAssets="runtime" Pack="false" />
   </ItemGroup>
 
+  <Target Name="RemoveImplicitOutOfBandAssemblies"
+          BeforeTargets="BeforeCompile"
+          AfterTargets="FindReferenceAssembliesForReferences">
+    <ItemGroup>
+      <ReferencePathWithRefAssemblies Remove="@(ReferencePathWithRefAssemblies)" Condition="%(Filename) == 'System.Runtime.CompilerServices.Unsafe'" />
+    </ItemGroup>
+  </Target>
+
 </Project>
 

src/MonoMod.Backports/MonoMod/ILHelpers.cs

@@ -0,0 +1,46 @@
+using InlineIL;
+using System.Runtime.CompilerServices;
+using static InlineIL.IL;
+using static InlineIL.IL.Emit;
+
+namespace MonoMod
+{
+    internal static class ILHelpers
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static ref T ObjectAsRef<T>(object? obj)
+        {
+            DeclareLocals(init: false, [
+                new LocalVar("pin", typeof(object)).Pinned(),
+#if !NETCOREAPP
+                new LocalVar("refPtr", typeof(T).MakePointerType().MakePointerType()),
+                new LocalVar("finalRef", typeof(T).MakeByRefType()),
+#endif
+            ]);
+
+            // pin obj
+            Ldarg(nameof(obj));
+            Stloc("pin");
+
+#if NETCOREAPP
+            // return ref *Unsafe.BitCast<object, T*>(pin);
+            Ldloc("pin");
+            Conv_U();
+#else
+            // see docs/RuntimeIssueNotes.md - "`fixed` on strings in old Mono" for why this is necessary
+            // T* ptr = *(T**)(&pin);
+            Ldloca("pin");
+            Conv_U();
+            Stloc("refPtr");
+            Ldloc("refPtr");
+            Ldind_I();
+            // return Unsafe.AsRef<T>(ptr);
+            // see the comments inside that function for why don't just immediately ret
+            Stloc("finalRef");
+            Ldloc("finalRef");
+#endif
+
+            return ref ReturnRef<T>();
+        }
+    }
+}

src/MonoMod.Backports/Postprocess.targets

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Runtime.CompilerServices;
+
 namespace System.Buffers
 {
     internal sealed partial class ArrayMemoryPool<T> : MemoryPool<T>

src/MonoMod.Backports/SRCS.Unsafe.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using System.Buffers.Text;
+using System.Runtime.CompilerServices;
 
 //
 // This code is copied almost verbatim from the same-named file in CoreRT with mechanical changes to Span-ify it.