Share intrinsics for Expression.Property and Field (#2671)

Shares two more intrinsics, with supporting infra.
Fixed a bug in the intrinsics - passing null to the name of a property/field will throw at runtime, so no need to validate anything.

Modifies the existing tests to add warnings, since that is the only verifyable behavior for the analyzer.

3 files changed, 87 insertions, 21 deletions

diff --git a/test/Mono.Linker.Tests.Cases/Reflection/ExpressionFieldString.cs b/test/Mono.Linker.Tests.Cases/Reflection/ExpressionFieldString.cs
index 3f1396000..1a7e121dc 100644
--- a/test/Mono.Linker.Tests.Cases/Reflection/ExpressionFieldString.cs
+++ b/test/Mono.Linker.Tests.Cases/Reflection/ExpressionFieldString.cs
@@ -10,13 +10,16 @@ namespace Mono.Linker.Tests.Cases.Reflection
 	[ExpectedNoWarnings]
 	public class ExpressionFieldString
 	{
+		[ExpectedWarning ("IL2110", nameof (StaticWithDAM))]
+		[ExpectedWarning ("IL2110", "_publicFieldOnBase")]
 		[ExpectedWarning ("IL2072", nameof (Expression) + "." + nameof (Expression.Field))]
 		public static void Main ()
 		{
-			Expression.Field (Expression.Parameter (typeof (int), ""), typeof (ExpressionFieldString), "Field");
+			Expression.Field (Expression.Parameter (typeof (int), ""), typeof (ExpressionFieldString), "InstanceField");
 			Expression.Field (null, typeof (ExpressionFieldString), "StaticField");
+			Expression.Field (null, typeof (ExpressionFieldString), "StaticWithDAM"); // IL2110
 			Expression.Field (null, typeof (Derived), "_protectedFieldOnBase");
-			Expression.Field (null, typeof (Derived), "_publicFieldOnBase");
+			Expression.Field (null, typeof (Derived), "_publicFieldOnBase"); // IL2110
 			UnknownType.Test ();
 			UnknownTypeNoAnnotation.Test ();
 			UnknownString.Test ();
@@ -29,13 +32,20 @@ namespace Mono.Linker.Tests.Cases.Reflection
 		}
 
 		[Kept]
-		private int Field;
+		private int InstanceField;
 
 		[Kept]
 		static private int StaticField;
 
+		[Kept]
+		[KeptAttributeAttribute (typeof (DynamicallyAccessedMembersAttribute))]
+		[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
+		static private Type StaticWithDAM;
+
 		private int UnusedField;
 
+		public static int StaticField1 { get => StaticField; set => StaticField = value; }
+
 		[Kept]
 		static Type GetType ()
 		{
@@ -142,7 +152,6 @@ namespace Mono.Linker.Tests.Cases.Reflection
 			Expression.Field (null, typeof (Base), noValue);
 		}
 
-
 		[Kept]
 		class Base
 		{
@@ -150,7 +159,9 @@ namespace Mono.Linker.Tests.Cases.Reflection
 			protected static bool _protectedFieldOnBase;
 
 			[Kept]
-			public static bool _publicFieldOnBase;
+			[KeptAttributeAttribute (typeof (DynamicallyAccessedMembersAttribute))]
+			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
+			public static Type _publicFieldOnBase;
 		}
 
 		[Kept]
diff --git a/test/Mono.Linker.Tests.Cases/Reflection/ExpressionPropertyMethodInfo.cs b/test/Mono.Linker.Tests.Cases/Reflection/ExpressionPropertyMethodInfo.cs
index b4d9613ae..b0de477dc 100644
--- a/test/Mono.Linker.Tests.Cases/Reflection/ExpressionPropertyMethodInfo.cs
+++ b/test/Mono.Linker.Tests.Cases/Reflection/ExpressionPropertyMethodInfo.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -32,10 +33,12 @@ namespace Mono.Linker.Tests.Cases.Reflection
 		{
 			[Kept]
 			[KeptBackingField]
-			public static int StaticProperty {
+			public static int StaticPropertyExpressionAccess {
 				[Kept]
 				get;
 				[Kept]
+				[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
+				[RequiresUnreferencedCode (nameof (StaticPropertyExpressionAccess))]
 				set;
 			}
 
@@ -45,6 +48,8 @@ namespace Mono.Linker.Tests.Cases.Reflection
 				[Kept]
 				get;
 				[Kept]
+				[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
+				[RequiresUnreferencedCode (nameof (StaticPropertyViaReflection))]
 				set;
 			}
 
@@ -54,15 +59,19 @@ namespace Mono.Linker.Tests.Cases.Reflection
 				[Kept]
 				get;
 				[Kept]
+				[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
+				[RequiresUnreferencedCode (nameof (StaticPropertyViaRuntimeMethod))]
 				set;
 			}
 
 			[Kept]
 			[KeptBackingField]
-			public int InstanceProperty {
+			public int InstancePropertyExpressionAccess {
 				[Kept]
 				get;
 				[Kept]
+				[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
+				[RequiresUnreferencedCode (nameof (InstancePropertyExpressionAccess))]
 				set;
 			}
 
@@ -72,18 +81,27 @@ namespace Mono.Linker.Tests.Cases.Reflection
 				[Kept]
 				get;
 				[Kept]
+				[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
+				[RequiresUnreferencedCode (nameof (InstancePropertyViaReflection))]
 				set;
 			}
 
 			[Kept]
+			// https://github.com/dotnet/linker/issues/2669
+			[ExpectedWarning ("IL2026", nameof (StaticPropertyExpressionAccess), ProducedBy = ProducedBy.Trimmer)]
+			[ExpectedWarning ("IL2026", nameof (StaticPropertyViaReflection))]
+			[ExpectedWarning ("IL2026", nameof (StaticPropertyViaRuntimeMethod))]
+			// https://github.com/dotnet/linker/issues/2669
+			[ExpectedWarning ("IL2026", nameof (InstancePropertyExpressionAccess), ProducedBy = ProducedBy.Trimmer)]
+			[ExpectedWarning ("IL2026", nameof (InstancePropertyViaReflection))]
 			public static void Test ()
 			{
-				Expression<Func<int>> staticGetter = () => StaticProperty;
+				Expression<Func<int>> staticGetter = () => StaticPropertyExpressionAccess;
 
 				Expression.Property (null, typeof (PropertyGetter).GetMethod ("get_StaticPropertyViaReflection"));
 
 				PropertyGetter instance = new PropertyGetter ();
-				Expression<Func<PropertyGetter, int>> instanceGetter = i => i.InstanceProperty;
+				Expression<Func<PropertyGetter, int>> instanceGetter = i => i.InstancePropertyExpressionAccess;
 
 				Expression.Property (Expression.New (typeof (PropertyGetter)), typeof (PropertyGetter).GetMethod ("get_InstancePropertyViaReflection"));
 
@@ -97,8 +115,10 @@ namespace Mono.Linker.Tests.Cases.Reflection
 		{
 			[Kept]
 			[KeptBackingField]
-			public static int StaticProperty {
+			public static int StaticPropertyReflectionAccess {
 				[Kept]
+				[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
+				[RequiresUnreferencedCode (nameof (StaticPropertyReflectionAccess))]
 				get;
 				[Kept]
 				set;
@@ -108,6 +128,8 @@ namespace Mono.Linker.Tests.Cases.Reflection
 			[KeptBackingField]
 			public static int StaticPropertyViaRuntimeMethod {
 				[Kept]
+				[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
+				[RequiresUnreferencedCode (nameof (StaticPropertyViaRuntimeMethod))]
 				get;
 				[Kept]
 				set;
@@ -115,21 +137,26 @@ namespace Mono.Linker.Tests.Cases.Reflection
 
 			[Kept]
 			[KeptBackingField]
-			public int InstanceProperty {
+			public int InstancePropertyReflectionAccess {
 				[Kept]
+				[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
+				[RequiresUnreferencedCode (nameof (InstancePropertyReflectionAccess))]
 				get;
 				[Kept]
 				set;
 			}
 
 			[Kept]
+			[ExpectedWarning ("IL2026", nameof (StaticPropertyReflectionAccess))]
+			[ExpectedWarning ("IL2026", nameof (StaticPropertyViaRuntimeMethod))]
+			[ExpectedWarning ("IL2026", nameof (InstancePropertyReflectionAccess))]
 			public static void Test ()
 			{
-				Expression.Property (null, typeof (PropertySetter).GetMethod ("set_StaticProperty"));
+				Expression.Property (null, typeof (PropertySetter).GetMethod ("set_StaticPropertyReflectionAccess"));
 
 				Expression.Property (null, typeof (PropertySetter).GetRuntimeMethod ("set_StaticPropertyViaRuntimeMethod", Type.EmptyTypes));
 
-				Expression.Property (Expression.New (typeof (PropertySetter)), typeof (PropertySetter).GetMethod ("set_InstanceProperty"));
+				Expression.Property (Expression.New (typeof (PropertySetter)), typeof (PropertySetter).GetMethod ("set_InstancePropertyReflectionAccess"));
 			}
 		}
 
@@ -158,10 +185,12 @@ namespace Mono.Linker.Tests.Cases.Reflection
 		{
 			[Kept]
 			[KeptBackingField]
-			public static int StaticProperty {
+			public static int FirstStaticProperty {
 				[Kept]
 				get;
 				[Kept]
+				[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
+				[RequiresUnreferencedCode (nameof (FirstStaticProperty))]
 				set;
 			}
 
@@ -171,16 +200,20 @@ namespace Mono.Linker.Tests.Cases.Reflection
 				[Kept]
 				get;
 				[Kept]
+				[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
+				[RequiresUnreferencedCode (nameof (SecondStaticProperty))]
 				set;
 			}
 
 			[Kept]
+			[ExpectedWarning ("IL2026", nameof (FirstStaticProperty))]
+			[ExpectedWarning ("IL2026", nameof (SecondStaticProperty))]
 			public static void Test (int p)
 			{
 				MethodInfo mi;
 				switch (p) {
 				case 0:
-					mi = typeof (MultipleMethods).GetMethod ("get_StaticProperty");
+					mi = typeof (MultipleMethods).GetMethod ("get_FirstStaticProperty");
 					break;
 				case 1:
 					mi = typeof (MultipleMethods).GetMethod ("get_SecondStaticProperty");
@@ -195,7 +228,8 @@ namespace Mono.Linker.Tests.Cases.Reflection
 		}
 
 		[Kept]
-		[ExpectedWarning ("IL2103", nameof (Expression) + "." + nameof (Expression.Property))]
+		// https://github.com/dotnet/linker/issues/2670
+		[ExpectedWarning ("IL2103", nameof (Expression) + "." + nameof (Expression.Property), ProducedBy = ProducedBy.Trimmer)]
 		static void TestUnknownMethod (MethodInfo mi)
 		{
 			Expression.Property (null, mi);
diff --git a/test/Mono.Linker.Tests.Cases/Reflection/ExpressionPropertyString.cs b/test/Mono.Linker.Tests.Cases/Reflection/ExpressionPropertyString.cs
index 9f9f8591d..ff8530d5c 100644
--- a/test/Mono.Linker.Tests.Cases/Reflection/ExpressionPropertyString.cs
+++ b/test/Mono.Linker.Tests.Cases/Reflection/ExpressionPropertyString.cs
@@ -12,11 +12,14 @@ namespace Mono.Linker.Tests.Cases.Reflection
 	[ExpectedNoWarnings]
 	public class ExpressionPropertyString
 	{
+		[ExpectedWarning ("IL2026", nameof (BasicProperty))]
+		[ExpectedWarning ("IL2111", "ProtectedPropertyOnBase")]
+		[ExpectedWarning ("IL2026", "PublicPropertyOnBase")]
 		[ExpectedWarning ("IL2072", nameof (Expression) + "." + nameof (Expression.Property))]
 		public static void Main ()
 		{
-			Expression.Property (Expression.Parameter (typeof (int), ""), typeof (ExpressionPropertyString), "Property");
-			Expression.Property (null, typeof (ExpressionPropertyString), "StaticProperty");
+			Expression.Property (Expression.Parameter (typeof (int), ""), typeof (ExpressionPropertyString), nameof (BasicProperty));
+			Expression.Property (null, typeof (ExpressionPropertyString), nameof (StaticProperty));
 			Expression.Property (null, typeof (Derived), "ProtectedPropertyOnBase");
 			Expression.Property (null, typeof (Derived), "PublicPropertyOnBase");
 			UnknownType.Test ();
@@ -30,13 +33,15 @@ namespace Mono.Linker.Tests.Cases.Reflection
 		}
 
 		[Kept]
-		private int Property {
+		private int BasicProperty {
 			[Kept]
 			[ExpectBodyModified]
 			get;
 
 			[Kept]
 			[ExpectBodyModified]
+			[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
+			[RequiresUnreferencedCode (nameof (BasicProperty))]
 			set;
 		}
 
@@ -159,11 +164,27 @@ namespace Mono.Linker.Tests.Cases.Reflection
 		{
 			[Kept]
 			[KeptBackingField]
-			protected static bool ProtectedPropertyOnBase { [Kept] get; }
+			[KeptAttributeAttribute (typeof (DynamicallyAccessedMembersAttribute))]
+			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
+			protected static Type ProtectedPropertyOnBase {
+				[Kept]
+				get;
+
+				[Kept]
+				set;
+			}
 
 			[Kept]
 			[KeptBackingField]
-			public static bool PublicPropertyOnBase { [Kept] get; }
+			public static bool PublicPropertyOnBase {
+				[Kept]
+				get;
+
+				[Kept]
+				[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
+				[RequiresUnreferencedCode (nameof (PublicPropertyOnBase))]
+				set;
+			}
 		}
 
 		[Kept]