Clean up IL2020/IL2021

dotnet · Aug 6, 2020 · f36f95c · f36f95c
1 parent 9c53c5a
commit f36f95c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/src/linker/Linker.Steps/LinkAttributesStep.cs b/src/linker/Linker.Steps/LinkAttributesStep.cs
@@ -121,7 +121,10 @@ List<CustomAttributeArgument> ProcessAttributeArguments (MethodDefinition attrib
 				object argValue;
 				TypeDefinition parameterType = attributeConstructor.Parameters[i].ParameterType.Resolve ();
 				if (!TryConvertValue (arguments[i], parameterType, out argValue)) {
-					Context.LogWarning ($"Invalid argument value '{arguments[i]}' for attribute '{attributeConstructor.DeclaringType.GetDisplayName ()}'", 2054, _xmlDocumentLocation);
+					Context.LogWarning (
+						$"Invalid argument value '{arguments[i]}' for parameter type '{parameterType.GetDisplayName ()}' of attribute '{attributeConstructor.DeclaringType.GetDisplayName ()}'",
+						2054,
+						_xmlDocumentLocation);
 					return null;
 				}
 

diff --git a/test/ILLink.Tasks.Tests/ILLink.Tasks.Tests.cs b/test/ILLink.Tasks.Tests/ILLink.Tasks.Tests.cs
@@ -305,8 +305,8 @@ public void TestWarn (string warnArg, WarnVersion expectedVersion)
 #nullable enable
 		[Theory]
 		[InlineData (true, null, null, new uint[] { }, new uint[] { })]
-		[InlineData (false, "IL1001,IL####,IL2000,IL2021,IL2022", null,
-			new uint[] { 2021, 2022 }, new uint[] { })]
+		[InlineData (false, "IL1001,IL####,IL2000,IL2054,IL2022", null,
+			new uint[] { 2054, 2022 }, new uint[] { })]
 		[InlineData (false, "IL2023,IL6000;IL5042 IL2040", "IL4000,IL4001;IL4002 IL4003",
 			new uint[] { 2023, 2040, 5042, 6000 }, new uint[] { 4000, 4001, 4002, 4003 })]
 		[InlineData (false, "IL3000;IL3000;ABCD", "IL2005 il3000 IL2005",

diff --git a/test/Mono.Linker.Tests.Cases/LinkAttributes/LinkAttributeErrorCases.cs b/test/Mono.Linker.Tests.Cases/LinkAttributes/LinkAttributeErrorCases.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Mono.Linker.Tests.Cases.Expectations.Assertions;
@@ -28,14 +28,6 @@ public static void Main ()
 
 		}
 
-		public class AttributeWithDoubleNumberParameterAttribute : Attribute
-		{
-			public AttributeWithDoubleNumberParameterAttribute (double doubleParameter)
-			{
-			}
-		}
-
-
 		public enum AttributeEnum
 		{
 			None

diff --git a/test/Mono.Linker.Tests.Cases/LinkAttributes/LinkAttributeErrorCases.xml b/test/Mono.Linker.Tests.Cases/LinkAttributes/LinkAttributeErrorCases.xml
@@ -9,26 +9,21 @@
       <!-- IL2031 -->
       <attribute fullname="NonExistentAttribute"/>
 
-      <!-- IL2020 -->
-      <attribute fullname="Mono.Linker.Tests.Cases.LinkAttributes.LinkAttributeErrorCases/AttributeWithDoubleNumberParameterAttribute">
-        <argument>3.14</argument>
+      <!-- IL2022 -->
+      <attribute fullname="Mono.Linker.Tests.Cases.LinkAttributes.LinkAttributeErrorCases/AttributeWithNoParametersAttribute">
+        <argument>ExtraArgumentValue</argument>
       </attribute>
 
-      <!-- IL2021 -->
+      <!-- IL2054 -->
       <attribute fullname="Mono.Linker.Tests.Cases.LinkAttributes.LinkAttributeErrorCases/AttributeWithEnumParameterAttribute">
         <argument>NonExistentEnumValue</argument>
       </attribute>
 
-      <!-- IL2021 -->
+      <!-- IL2054 -->
       <attribute fullname="Mono.Linker.Tests.Cases.LinkAttributes.LinkAttributeErrorCases/AttributeWithIntParameterAttribute">
         <argument>NotANumber</argument>
       </attribute>
 
-      <!-- IL2022 -->
-      <attribute fullname="Mono.Linker.Tests.Cases.LinkAttributes.LinkAttributeErrorCases/AttributeWithNoParametersAttribute">
-        <argument>ExtraArgumentValue</argument>
-      </attribute>
-
       <!-- IL2023 -->
       <method name="GetTypeMethod">
         <return>