Subclass TypeDefinitionCache

This implements @jonathanpepper's idea to use the linker's built-in
Resolve cache without duplicating the extension methods from java.interop.

By overriding TypeDefinitionCache, we can continue using the existing
extension methods that take TypeDefinitionCache, and this leaves open
the option to modify the extension method signatures to instead take an
IMetadataResolver as in dotnet/java-interop#842.

Author: sbomer

src/Microsoft.Android.Sdk.ILLink/BaseMarkHandler.cs

@@ -1,16 +1,18 @@
-using Mono.Linker;
 using Mono.Linker.Steps;
+using Microsoft.Android.Sdk.ILLink;
 
 namespace Mono.Linker
 {
 	public class BaseMarkHandler : IMarkHandler
 	{
 		protected LinkContext Context;
 		protected AnnotationStore Annotations => Context?.Annotations;
+		protected LinkContextMetadataResolver cache;
 
 		public virtual void Initialize (LinkContext context, MarkContext markContext)
 		{
 			Context = context;
+			cache = new LinkContextMetadataResolver (context);
 		}
 	}
 }

src/Microsoft.Android.Sdk.ILLink/LinkContextExtensions.cs

@@ -0,0 +1,20 @@
+using Java.Interop.Tools.Cecil;
+using Mono.Cecil;
+using Mono.Linker;
+
+namespace Microsoft.Android.Sdk.ILLink
+{
+	public class LinkContextMetadataResolver : TypeDefinitionCache {
+		LinkContext context;
+
+		public LinkContextMetadataResolver (LinkContext context)
+		{
+			this.context = context;
+		}
+
+		public override TypeDefinition Resolve (TypeReference typeReference)
+		{
+			return context.ResolveTypeDefinition (typeReference);
+		}
+	}
+}

src/Microsoft.Android.Sdk.ILLink/LinkContextMetadataResolver.cs

@@ -41,6 +41,9 @@
 
     <!--Other Xamarin.Android / Java.Interop files-->
     <Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil\CustomAttributeProviderRocks.cs" Link="Java.Interop\CustomAttributeProviderRocks.cs" />
+    <Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil\MethodDefinitionRocks.cs" Link="Java.Interop\MethodDefinitionRocks.cs" />
+    <Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil\TypeDefinitionCache.cs" Link="Java.Interop\TypeDefinitionCache.cs" />
+    <Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil\TypeDefinitionRocks.cs" Link="Java.Interop\TypeDefinitionRocks.cs" />
     <Compile Include="..\Xamarin.Android.Build.Tasks\Utilities\MonoAndroidHelper.Linker.cs" Link="Utilities\MonoAndroidHelper.Linker.cs" />
   </ItemGroup>
   <ItemGroup>

src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj

@@ -75,7 +75,7 @@ void ProcessMethod (MethodDefinition method)
 			if (!method.TryGetRegisterMember (out var member, out var nativeMethod, out var signature)) {
 				if (PreserveJniMarshalMethods () &&
 					method.DeclaringType.GetMarshalMethodsType () != null &&
-					Context.TryGetBaseOrInterfaceRegisterMember (method, out member, out nativeMethod, out signature)) {
+					method.TryGetBaseOrInterfaceRegisterMember (cache, out member, out nativeMethod, out signature)) {
 					preserveJniMarshalMethodOnly = true;
 				} else {
 					return;

src/Microsoft.Android.Sdk.ILLink/PreserveRegistrations.cs

@@ -18,7 +18,15 @@ namespace MonoDroid.Tuner
 {
 	public class AddKeepAlivesStep : BaseStep
 	{
-#if !NET5_LINKER
+
+#if NET5_LINKER
+		LinkContextMetadataResolver cache;
+
+		protected override void Process ()
+		{
+			cache = new LinkContextMetadataResolver (Context);
+		}
+#else   // !NET5_LINKER
 		readonly TypeDefinitionCache cache;
 
 		public AddKeepAlivesStep (TypeDefinitionCache cache)
@@ -70,11 +78,7 @@ static void AddNestedTypes (List<TypeDefinition> types, TypeDefinition type)
 
 		bool MightNeedFix (TypeDefinition type)
 		{
-#if NET5_LINKER
-			return !type.IsAbstract && Context.IsSubclassOf (type, "Java.Lang.Object");
-#else   // !NET5_LINKER
 			return !type.IsAbstract && type.IsSubclassOf ("Java.Lang.Object", cache);
-#endif  // !NET5_LINKER
 		}
 
 		MethodDefinition methodKeepAlive = null;

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/AddKeepAlivesStep.cs

@@ -11,10 +11,6 @@
 using Java.Interop;
 using Java.Interop.Tools.Cecil;
 
-#if NET5_LINKER
-using Microsoft.Android.Sdk.ILLink;
-#endif  // NET5_LINKER
-
 namespace MonoDroid.Tuner {
 
 	static class Extensions {
@@ -259,11 +255,7 @@ public static TypeDefinition GetMarshalMethodsType (this TypeDefinition type)
 			return null;
 		}
 
-#if NET5_LINKER
-		public static bool TryGetBaseOrInterfaceRegisterMember (this LinkContext context, MethodDefinition method, out string member, out string nativeMethod, out string signature)
-#else   // !NET5_LINKER
 		public static bool TryGetBaseOrInterfaceRegisterMember (this MethodDefinition method, TypeDefinitionCache cache, out string member, out string nativeMethod, out string signature)
-#endif  // !NET5_LINKER
 		{
 			var type = method.DeclaringType;
 
@@ -272,11 +264,7 @@ public static bool TryGetBaseOrInterfaceRegisterMember (this MethodDefinition me
 			if (method.IsConstructor || type == null || !type.HasNestedTypes)
 				return false;
 
-#if NET5_LINKER
-			var m = context.GetBaseDefinition (method);
-#else   // !NET5_LINKER
 			var m = method.GetBaseDefinition (cache);
-#endif  // !NET5_LINKER
 
 			while (m != null) {
 				if (m == method)
@@ -287,11 +275,7 @@ public static bool TryGetBaseOrInterfaceRegisterMember (this MethodDefinition me
 				if (m.TryGetRegisterMember (out member, out nativeMethod, out signature))
 					return true;
 
-#if NET5_LINKER
-				context.GetBaseDefinition (m);
-#else   // !NET5_LINKER
 				m = m.GetBaseDefinition (cache);
-#endif  // !NET5_LINKER
 			}
 
 			if (!method.DeclaringType.HasInterfaces || !method.IsNewSlot)
@@ -306,30 +290,19 @@ public static bool TryGetBaseOrInterfaceRegisterMember (this MethodDefinition me
 					continue;
 
 				foreach (var im in itype.Methods)
-#if NET5_LINKER
-					if (context.IsEqual (im, method))
-#else   // !NET5_LINKER
 					if (im.IsEqual (method, cache))
-#endif  // !NET5_LINKER
 						return im.TryGetRegisterMember (out member, out nativeMethod, out signature);
 				}
 
 			return false;
 		}
 
-#if NET5_LINKER
-		public static bool IsEqual (this LinkContext context, MethodDefinition m1, MethodDefinition m2)
-#else   // !NET5_LINKER
 		public static bool IsEqual (this MethodDefinition m1, MethodDefinition m2, TypeDefinitionCache cache)
-#endif  // !NET5_LINKER
 		{
 			if (m1.Name != m2.Name || m1.ReturnType.Name != m2.ReturnType.Name)
 				return false;
-#if NET5_LINKER
-			return context.AreParametersCompatibleWith (m1.Parameters, m2.Parameters);
-#else   // !NET5_LINKER
+
 			return m1.Parameters.AreParametersCompatibleWith (m2.Parameters, cache);
-#endif  // !NET5_LINKER
 		}
 
 		public static bool TryGetMarshalMethod (this MethodDefinition method, string nativeMethod, string signature, out MethodDefinition marshalMethod)

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/Extensions.cs

@@ -136,11 +136,7 @@ bool IsProductOrSdkAssembly (AssemblyDefinition assembly)
 
 		bool MightNeedFix (TypeDefinition type)
 		{
-#if NET5_LINKER
-			return !type.IsAbstract && Context.IsSubclassOf (type, "Java.Lang.Object");
-#else   // !NET5_LINKER
 			return !type.IsAbstract && type.IsSubclassOf ("Java.Lang.Object", cache);
-#endif  // !NET5_LINKER
 		}
 
 		static bool CompareTypes (TypeReference iType, TypeReference tType)
@@ -249,11 +245,7 @@ bool FixAbstractMethods (TypeDefinition type)
 
 			bool rv = false;
 			List<MethodDefinition> typeMethods = new List<MethodDefinition> (type.Methods);
-#if NET5_LINKER
-			foreach (var baseType in Context.GetBaseTypes (type))
-#else   // !NET5_LINKER
 			foreach (var baseType in type.GetBaseTypes (cache))
-#endif  // !NET5_LINKER
 				typeMethods.AddRange (baseType.Methods);
 
 			foreach (var ifaceInfo in type.Interfaces) {

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FixAbstractMethodsStep.cs

@@ -6,10 +6,6 @@
 using Mono.Linker;
 using Mono.Linker.Steps;
 
-#if NET5_LINKER
-using Microsoft.Android.Sdk.ILLink;
-#endif
-
 using Mono.Tuner;
 using Mobile.Tuner;