Fix interface trimming order (#114509)

github-actions[bot] · sbomer · agocke · web-flow · commit ccf556df5602 · 2025-07-10T17:57:00.000-07:00
Co-authored-by: Sven Boemer &lt;sbomer@gmail.com&gt;
Co-authored-by: Andy Gocke &lt;angocke@microsoft.com&gt;
diff --git a/src/tools/illink/src/linker/Linker.Steps/MarkStep.cs b/src/tools/illink/src/linker/Linker.Steps/MarkStep.cs
@@ -417,8 +417,8 @@ bool ProcessPrimaryQueue ()
 
 			while (!QueueIsEmpty ()) {
 				ProcessQueue ();
-				ProcessInterfaceMethods ();
 				ProcessMarkedTypesWithInterfaces ();
+				ProcessInterfaceMethods ();
 				ProcessDynamicCastableImplementationInterfaces ();
 				ProcessPendingBodies ();
 				DoAdditionalProcessing ();
diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/Attributes/OnlyKeepUsed/MethodWithUnmanagedConstraint.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/Attributes/OnlyKeepUsed/MethodWithUnmanagedConstraint.cs
@@ -6,6 +6,11 @@ namespace Mono.Linker.Tests.Cases.Attributes.OnlyKeepUsed
 {
 	[SetupCSharpCompilerToUse ("csc")]
 	[SetupLinkerArgument ("--used-attrs-only", "true")]
+
+	// Necessary to allow trimming the attribute instance from types in CoreLib.
+	[SetupLinkerTrimMode ("link")]
+	// When we allow trimming CoreLib, some well-known types expected by ILVerify are removed.
+	[SkipILVerify]
 	public class MethodWithUnmanagedConstraint
 	{
 		public static void Main ()

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,11 @@ namespace Mono.Linker.Tests.Cases.Attributes.OnlyKeepUsed`
`6`	`6`	`{`
`7`	`7`	`[SetupCSharpCompilerToUse ("csc")]`
`8`	`8`	`[SetupLinkerArgument ("--used-attrs-only", "true")]`
	`9`	`+`
	`10`	`+ // Necessary to allow trimming the attribute instance from types in CoreLib.`
	`11`	`+ [SetupLinkerTrimMode ("link")]`
	`12`	`+ // When we allow trimming CoreLib, some well-known types expected by ILVerify are removed.`
	`13`	`+ [SkipILVerify]`
`9`	`14`	`public class MethodWithUnmanagedConstraint`
`10`	`15`	`{`
`11`	`16`	`public static void Main ()`