[generator] Fix StackOverflow when copying DIM from package-protected interfaces.

Author: jpobst

tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs

@@ -514,5 +514,41 @@ public void CompatVirtualMethod_Interface ()
 
 			Assert.True (writer.ToString ().NormalizeLineEndings ().Contains ("catch (Java.Lang.NoSuchMethodError) { throw new Java.Lang.AbstractMethodError (__id); }".NormalizeLineEndings ()), $"was: `{writer}`");
 		}
+
+		[Test]
+		public void FixDefaultInterfaceMethodStackOverflow ()
+		{
+			// The bug was that this causes a stack overflow, but this also tests
+			// that the OverriddenInterfaceMethod is now correctly set in the interface method.
+			var xml = """
+			<api>
+			  <package name='io.grpc' jni-name='io/grpc'>
+			    <interface abstract="true" deprecated="not deprecated" final="false" name="InternalConfigurator" static="false" visibility="public" jni-signature="Lio/grpc/InternalConfigurator;">
+			      <implements name="io.grpc.Configurator" name-generic-aware="io.grpc.Configurator" jni-type="Lio/grpc/Configurator;" />
+			    </interface>
+			    <interface abstract="true" deprecated="not deprecated" final="false" name="Configurator" static="false" visibility="" jni-signature="Lio/grpc/Configurator;">
+			      <method abstract="false" deprecated="not deprecated" final="false" name="configureChannelBuilder" jni-signature="V" bridge="false" native="false" return="void" jni-return="V" static="false" synchronized="false" synthetic="false" visibility="public" />
+			    </interface>
+			  </package>
+			</api>
+			""";
+
+			var gens = ParseApiDefinition (xml);
+
+			foreach (var iface in gens.OfType<InterfaceGen> ()) {
+				generator.Context.ContextTypes.Push (iface);
+				generator.WriteType (iface, string.Empty, new GenerationInfo ("", "", "MyAssembly"));
+				generator.Context.ContextTypes.Pop ();
+			}
+
+			var klass1 = gens.Single (g => g.Name == "IInternalConfigurator");
+			var klass2 = gens.Single (g => g.Name == "IConfigurator");
+
+			Assert.AreEqual (1, klass1.Methods.Count);
+			Assert.AreEqual (1, klass2.Methods.Count);
+
+			Assert.AreNotSame (klass1.Methods [0], klass2.Methods [0]);
+			Assert.AreSame (klass1.Methods [0].OverriddenInterfaceMethod, klass2.Methods [0]);
+		}
 	}
 }

tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs

@@ -11,7 +11,7 @@ public partial interface IExtendedInterface : IJavaPeerable {
 		[global::Java.Interop.JniMethodSignature ("extendedMethod", "()V")]
 		void ExtendedMethod ();
 
-		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/interface[@name='BaseInterface']/method[@name='baseMethod' and count(parameter)=0]"
+		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/interface[@name='ExtendedInterface']/method[@name='baseMethod' and count(parameter)=0]"
 		[global::Java.Interop.JniMethodSignature ("baseMethod", "()V")]
 		void BaseMethod ();
 
@@ -46,7 +46,7 @@ public unsafe void BaseMethod ()
 		{
 			const string __id = "baseMethod.()V";
 			try {
-				_members_xamarin_test_BaseInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null);
+				_members_xamarin_test_ExtendedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null);
 			} finally {
 			}
 		}

tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs

@@ -12,7 +12,7 @@ public partial interface IExtendedInterface : IJavaObject, IJavaPeerable {
 		[Register ("extendedMethod", "()V", "GetExtendedMethodHandler:Xamarin.Test.IExtendedInterfaceInvoker, Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null")]
 		void ExtendedMethod ();
 
-		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/interface[@name='BaseInterface']/method[@name='baseMethod' and count(parameter)=0]"
+		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/interface[@name='ExtendedInterface']/method[@name='baseMethod' and count(parameter)=0]"
 		[Register ("baseMethod", "()V", "GetBaseMethodHandler:Xamarin.Test.IExtendedInterfaceInvoker, Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null")]
 		void BaseMethod ();
 
@@ -95,7 +95,7 @@ public unsafe void BaseMethod ()
 		{
 			const string __id = "baseMethod.()V";
 			try {
-				_members_xamarin_test_BaseInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null);
+				_members_xamarin_test_ExtendedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null);
 			} finally {
 			}
 		}

tools/generator/Java.Interop.Tools.Generator.ObjectModel/InterfaceGen.cs

@@ -69,8 +69,9 @@ public override void FixupAccessModifiers (CodeGenerationOptions opt)
 					var baseType = opt.SymbolTable.Lookup (implementedInterface);
 					if (baseType is InterfaceGen interfaceGen && interfaceGen.RawVisibility != "public") {
 						// Copy over "private" methods
-						interfaceGen.Methods.Where (m => !Methods.Contains (m)).ToList ().ForEach (Methods.Add);
-
+						foreach (var method in interfaceGen.Methods.ToList ())
+							if (!Methods.Any (m => m.Matches (method)))
+								Methods.Add (method.Clone (this));
 					} else {
 						break;
 					}