Merge pull request #2391 from vitek-karas/FixTypeForwarders6

[release/6.0.2xx] Fix marking of nested type forwarders
dotnet · Jan 6, 2022 · 4e27b85 · 4e27b85
2 parents 0ee8afd + 0e2d10c
commit 4e27b85
Show file tree

Hide file tree

Showing 8 changed files with 184 additions and 2 deletions.
diff --git a/src/linker/Linker.Steps/MarkStep.cs b/src/linker/Linker.Steps/MarkStep.cs
@@ -1441,7 +1441,7 @@ protected override void ProcessTypeReference (TypeReference type)
 			protected override void ProcessExportedType (ExportedType exportedType)
 			{
 				markingHelpers.MarkExportedType (exportedType, assembly.MainModule, new DependencyInfo (DependencyKind.ExportedType, assembly));
-				markingHelpers.MarkForwardedScope (new TypeReference (exportedType.Namespace, exportedType.Name, assembly.MainModule, exportedType.Scope));
+				markingHelpers.MarkForwardedScope (CreateTypeReferenceForExportedTypeTarget (exportedType));
 			}
 
 			protected override void ProcessExtra ()
@@ -1454,6 +1454,18 @@ protected override void ProcessExtra ()
 					markingHelpers.MarkForwardedScope (typeReference);
 				}
 			}
+
+			TypeReference CreateTypeReferenceForExportedTypeTarget (ExportedType exportedType)
+			{
+				TypeReference? declaringTypeReference = null;
+				if (exportedType.DeclaringType != null) {
+					declaringTypeReference = CreateTypeReferenceForExportedTypeTarget (exportedType.DeclaringType);
+				}
+
+				return new TypeReference (exportedType.Namespace, exportedType.Name, assembly.MainModule, exportedType.Scope) {
+					DeclaringType = declaringTypeReference
+				};
+			}
 		}
 
 		void ProcessModuleType (AssemblyDefinition assembly)

diff --git a/test/Mono.Linker.Tests.Cases/TypeForwarding/Dependencies/ImplementationLibrary.cs b/test/Mono.Linker.Tests.Cases/TypeForwarding/Dependencies/ImplementationLibrary.cs
@@ -25,6 +25,10 @@ public class ImplementationLibraryNestedType
 			public static int PropertyOnNestedType { get; set; }
 		}
 
+		public class ForwardedNestedType
+		{
+		}
+
 		public static int someField = 42;
 
 		public string GetSomeValue ()
@@ -33,6 +37,13 @@ public string GetSomeValue ()
 		}
 	}
 
+	public class AnotherImplementationClass
+	{
+		public class ForwardedNestedType
+		{
+		}
+	}
+
 	[AttributeUsage (AttributeTargets.All)]
 	public class ImplementationLibraryAttribute : Attribute
 	{

diff --git a/test/Mono.Linker.Tests.Cases/TypeForwarding/Dependencies/NestedForwarderLibrary.il b/test/Mono.Linker.Tests.Cases/TypeForwarding/Dependencies/NestedForwarderLibrary.il
@@ -0,0 +1,31 @@
+.assembly extern mscorlib
+{
+}
+
+.assembly extern Implementation
+{
+}
+
+.assembly NestedForwarderLibrary
+{
+}
+
+.class extern forwarder Mono.Linker.Tests.Cases.TypeForwarding.Dependencies.ImplementationLibrary
+{
+  .assembly extern 'Implementation'
+}
+.class extern ForwardedNestedType
+{
+  .class extern 'Mono.Linker.Tests.Cases.TypeForwarding.Dependencies.ImplementationLibrary'
+}
+
+.class extern forwarder Mono.Linker.Tests.Cases.TypeForwarding.Dependencies.AnotherImplementationClass
+{
+  .assembly extern 'Implementation'
+}
+.class extern ForwardedNestedType
+{
+  .class extern 'Mono.Linker.Tests.Cases.TypeForwarding.Dependencies.AnotherImplementationClass'
+}
+
+.module 'NestedForwarderLibrary.dll'
diff --git a/test/Mono.Linker.Tests.Cases/TypeForwarding/Dependencies/NestedForwarderLibrary_2.il b/test/Mono.Linker.Tests.Cases/TypeForwarding/Dependencies/NestedForwarderLibrary_2.il
@@ -0,0 +1,31 @@
+.assembly extern mscorlib
+{
+}
+
+.assembly extern NestedForwarderLibrary
+{
+}
+
+.assembly NestedForwarderLibrary_2
+{
+}
+
+.class extern forwarder Mono.Linker.Tests.Cases.TypeForwarding.Dependencies.ImplementationLibrary
+{
+  .assembly extern 'NestedForwarderLibrary'
+}
+.class extern ForwardedNestedType
+{
+  .class extern 'Mono.Linker.Tests.Cases.TypeForwarding.Dependencies.ImplementationLibrary'
+}
+
+.class extern forwarder Mono.Linker.Tests.Cases.TypeForwarding.Dependencies.AnotherImplementationClass
+{
+  .assembly extern 'NestedForwarderLibrary'
+}
+.class extern ForwardedNestedType
+{
+  .class extern 'Mono.Linker.Tests.Cases.TypeForwarding.Dependencies.AnotherImplementationClass'
+}
+
+.module 'NestedForwarderLibrary_2.dll'
diff --git a/test/Mono.Linker.Tests.Cases/TypeForwarding/Dependencies/ReferenceImplementationLibrary.cs b/test/Mono.Linker.Tests.Cases/TypeForwarding/Dependencies/ReferenceImplementationLibrary.cs
@@ -27,6 +27,10 @@ public class ImplementationLibraryNestedType
 			public static int PropertyOnNestedType { get; set; }
 		}
 
+		public class ForwardedNestedType
+		{
+		}
+
 		public static int someField = 0;
 
 		public string GetSomeValue ()
@@ -35,6 +39,13 @@ public string GetSomeValue ()
 		}
 	}
 
+	public class AnotherImplementationClass
+	{
+		public class ForwardedNestedType
+		{
+		}
+	}
+
 	[AttributeUsage (AttributeTargets.All)]
 	public class ImplementationLibraryAttribute : Attribute
 	{

diff --git a/test/Mono.Linker.Tests.Cases/TypeForwarding/MultiForwardedTypesWithCopyUsed.cs b/test/Mono.Linker.Tests.Cases/TypeForwarding/MultiForwardedTypesWithCopyUsed.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using Mono.Linker.Tests.Cases.Expectations.Assertions;
+using Mono.Linker.Tests.Cases.Expectations.Metadata;
+using Mono.Linker.Tests.Cases.TypeForwarding.Dependencies;
+
+namespace Mono.Linker.Tests.Cases.TypeForwarding
+{
+	[SkipUnresolved (true)]
+
+	[SetupCompileBefore ("NestedForwarderLibrary_2.dll", new[] { "Dependencies/ReferenceImplementationLibrary.cs" }, defines: new[] { "INCLUDE_REFERENCE_IMPL" })]
+
+	// After compiling the test case we then replace the reference impl with implementation + type forwarder
+	[SetupCompileAfter ("Implementation.dll", new[] { "Dependencies/ImplementationLibrary.cs" })]
+	[SetupCompileAfter ("NestedForwarderLibrary.dll", new[] { "Dependencies/NestedForwarderLibrary.il" }, references: new[] { "Implementation.dll" })]
+	[SetupCompileAfter ("NestedForwarderLibrary_2.dll", new[] { "Dependencies/NestedForwarderLibrary_2.il" }, references: new[] { "NestedForwarderLibrary.dll" })]
+
+	[SetupLinkerAction ("copy", "test")]
+	[SetupLinkerAction ("copy", "NestedForwarderLibrary_2")]
+	[SetupLinkerAction ("copyused", "NestedForwarderLibrary")]
+	[SetupLinkerAction ("copyused", "Implementation")]
+
+	[KeptTypeInAssembly ("NestedForwarderLibrary.dll", typeof (ImplementationLibrary.ForwardedNestedType))]
+	[KeptTypeInAssembly ("NestedForwarderLibrary.dll", typeof (AnotherImplementationClass.ForwardedNestedType))]
+	[KeptTypeInAssembly ("NestedForwarderLibrary_2.dll", typeof (ImplementationLibrary.ForwardedNestedType))]
+	[KeptTypeInAssembly ("NestedForwarderLibrary_2.dll", typeof (AnotherImplementationClass.ForwardedNestedType))]
+	[KeptTypeInAssembly ("Implementation.dll", typeof (ImplementationLibrary.ForwardedNestedType))]
+	[KeptTypeInAssembly ("Implementation.dll", typeof (AnotherImplementationClass.ForwardedNestedType))]
+
+	[KeptMember (".ctor()")]
+	class MultiForwardedTypesWithCopyUsed
+	{
+		static void Main ()
+		{
+			Console.WriteLine (typeof (ImplementationLibrary.ForwardedNestedType).FullName);
+			Console.WriteLine (typeof (AnotherImplementationClass.ForwardedNestedType).FullName);
+		}
+	}
+}
diff --git a/test/Mono.Linker.Tests.Cases/TypeForwarding/MultiForwardedTypesWithLink.cs b/test/Mono.Linker.Tests.Cases/TypeForwarding/MultiForwardedTypesWithLink.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using Mono.Linker.Tests.Cases.Expectations.Assertions;
+using Mono.Linker.Tests.Cases.Expectations.Metadata;
+using Mono.Linker.Tests.Cases.TypeForwarding.Dependencies;
+
+namespace Mono.Linker.Tests.Cases.TypeForwarding
+{
+	[SkipUnresolved (true)]
+
+	[SetupCompileBefore ("NestedForwarderLibrary_2.dll", new[] { "Dependencies/ReferenceImplementationLibrary.cs" }, defines: new[] { "INCLUDE_REFERENCE_IMPL" })]
+
+	// After compiling the test case we then replace the reference impl with implementation + type forwarder
+	[SetupCompileAfter ("Implementation.dll", new[] { "Dependencies/ImplementationLibrary.cs" })]
+	[SetupCompileAfter ("NestedForwarderLibrary.dll", new[] { "Dependencies/NestedForwarderLibrary.il" }, references: new[] { "Implementation.dll" })]
+	[SetupCompileAfter ("NestedForwarderLibrary_2.dll", new[] { "Dependencies/NestedForwarderLibrary_2.il" }, references: new[] { "NestedForwarderLibrary.dll" })]
+
+	[SetupLinkerAction ("copy", "test")]
+	[SetupLinkerAction ("copy", "NestedForwarderLibrary_2")]
+	[SetupLinkerAction ("link", "NestedForwarderLibrary")]
+	[SetupLinkerAction ("link", "Implementation")]
+
+	[KeptTypeInAssembly ("NestedForwarderLibrary.dll", typeof (ImplementationLibrary.ForwardedNestedType))]
+	[KeptTypeInAssembly ("NestedForwarderLibrary.dll", typeof (AnotherImplementationClass.ForwardedNestedType))]
+	[KeptTypeInAssembly ("NestedForwarderLibrary_2.dll", typeof (ImplementationLibrary.ForwardedNestedType))]
+	[KeptTypeInAssembly ("NestedForwarderLibrary_2.dll", typeof (AnotherImplementationClass.ForwardedNestedType))]
+	[KeptTypeInAssembly ("Implementation.dll", typeof (ImplementationLibrary.ForwardedNestedType))]
+	[KeptTypeInAssembly ("Implementation.dll", typeof (AnotherImplementationClass.ForwardedNestedType))]
+
+	[KeptMember (".ctor()")]
+	class MultiForwardedTypesWithLink
+	{
+		static void Main ()
+		{
+			Console.WriteLine (typeof (ImplementationLibrary.ForwardedNestedType).FullName);
+			Console.WriteLine (typeof (AnotherImplementationClass.ForwardedNestedType).FullName);
+		}
+	}
+}
diff --git a/test/Mono.Linker.Tests/TestCasesRunner/ILCompiler.cs b/test/Mono.Linker.Tests/TestCasesRunner/ILCompiler.cs
@@ -15,16 +15,20 @@ public class ILCompiler
 		public NPath Compile (CompilerOptions options)
 		{
 			var capturedOutput = new List<string> ();
+			var capturedError = new List<string> ();
 			var process = new Process ();
 			SetupProcess (process, options);
 			process.StartInfo.RedirectStandardOutput = true;
+			process.StartInfo.RedirectStandardError = true;
 			process.OutputDataReceived += (sender, args) => capturedOutput.Add (args.Data);
+			process.ErrorDataReceived += (sender, args) => capturedError.Add (args.Data);
 			process.Start ();
 			process.BeginOutputReadLine ();
+			process.BeginErrorReadLine ();
 			process.WaitForExit ();
 
 			if (process.ExitCode != 0) {
-				Assert.Fail ($"Failed to compile IL assembly : {options.OutputPath}\n{capturedOutput.Aggregate ((buff, s) => buff + Environment.NewLine + s)}");
+				Assert.Fail ($"Failed to compile IL assembly : {options.OutputPath}\n{capturedOutput.Aggregate ((buff, s) => buff + Environment.NewLine + s)}{capturedError.Aggregate ((buff, s) => buff + Environment.NewLine + s)}");
 			}
 
 			return options.OutputPath;