Propagate

Author: rolfbjarne

tools/dotnet-linker/ApplyPreserveAttributeBase.cs

@@ -1,6 +1,8 @@
 // This is copied from https://github.com/mono/linker/blob/fa9ccbdaf6907c69ef1bb117906f8f012218d57f/src/tuner/Mono.Tuner/ApplyPreserveAttributeBase.cs
 // and modified to work without a Profile class.
 
+using System.Linq;
+
 using Mono.Linker;
 using Mono.Linker.Steps;
 
@@ -263,7 +265,7 @@ bool TryApplyPreserveAttribute (TypeDefinition type)
 		List<CustomAttribute> GetPreserveAttributes (ICustomAttributeProvider provider)
 		{
 			if (!provider.HasCustomAttributes)
-				return attrs;
+				return new List<CustomAttribute> ();
 
 			return provider.CustomAttributes.Where (a => IsPreservedAttribute (provider, a)).ToList ();
 		}

tools/dotnet-linker/ApplyPreserveAttributeStep.cs

@@ -54,10 +54,10 @@ bool IApplyPreserveAttribute.PreserveType (TypeDefinition type, bool allMembers)
 			return AddDynamicDependencyAttribute (type, allMembers);
 		}
 
-		MethodDefinition GetOrCreateModuleConstructor (ModuleDefinition @module)
+		MethodDefinition GetOrCreateModuleConstructor (ModuleDefinition @module, out bool modified)
 		{
 			var moduleType = @module.GetModuleType ();
-			return abr.GetOrCreateStaticConstructor (moduleType, out var modified);
+			return abr.GetOrCreateStaticConstructor (moduleType, out modified);
 		}
 
 		bool IApplyPreserveAttribute.PreserveConditional (TypeDefinition onType, MethodDefinition forMethod)
@@ -78,7 +78,7 @@ bool IApplyPreserveAttribute.PreserveConditional (TypeDefinition onType, MethodD
 
 		bool AddDynamicDependencyAttribute (TypeDefinition type, bool allMembers)
 		{
-			var moduleConstructor = GetOrCreateModuleConstructor (type.GetModule ());
+			var moduleConstructor = GetOrCreateModuleConstructor (type.GetModule (), out var modified);
 			var members = allMembers
 				? allMemberTypes
 				: DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
@@ -89,7 +89,8 @@ bool AddDynamicDependencyAttribute (TypeDefinition type, bool allMembers)
 			}
 
 			var attrib = abr.CreateDynamicDependencyAttribute (members, type);
-			return abr.AddAttributeOnlyOnce (moduleConstructor, attrib);
+			modified |= abr.AddAttributeOnlyOnce (moduleConstructor, attrib);
+			return modified;
 		}
 
 		bool AddConditionalDynamicDependencyAttribute (TypeDefinition onType, MethodDefinition forMethod)
@@ -103,10 +104,11 @@ bool AddDynamicDependencyAttribute (IMetadataTokenProvider provider)
 			if (member is null)
 				throw ErrorHelper.CreateError (99, $"Unable to add dynamic dependency attribute to {provider.GetType ().FullName}");
 
-			var moduleConstructor = GetOrCreateModuleConstructor (member.GetModule ());
+			var moduleConstructor = GetOrCreateModuleConstructor (member.GetModule (), out var modified);
 			var signature = DocumentationComments.GetSignature (member);
 			var attrib = abr.CreateDynamicDependencyAttribute (signature, member.DeclaringType);
-			return abr.AddAttributeOnlyOnce (moduleConstructor, attrib);
+			modified |= abr.AddAttributeOnlyOnce (moduleConstructor, attrib);
+			return modified;
 		}
 	}
 }