Use attributes for IsDynamicCodeSupported feature switch (#99641)

sbomer · AustinWise · web-flow · commit eb864bfd57c8 · 2024-03-13T13:33:27.000-07:00
* Use attributes for IsDynamicCodeSupported feature switch

* Update src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/TypeUtils.cs

Co-authored-by: Austin Wise &lt;AustinWise@gmail.com&gt;

---------

Co-authored-by: Austin Wise &lt;AustinWise@gmail.com&gt;
diff --git a/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.xml b/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.xml
@@ -2,11 +2,6 @@
   <assembly fullname="System.Private.CoreLib">
     <type fullname="System.Runtime.CompilerServices.RuntimeFeature" feature="System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported" featurevalue="true">
       <method signature="System.Boolean get_IsDynamicCodeCompiled()" body="stub" value="true" />
-      <method signature="System.Boolean get_IsDynamicCodeSupported()" body="stub" value="true" />
-    </type>
-    <type fullname="System.Runtime.CompilerServices.RuntimeFeature" feature="System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported" featurevalue="false">
-      <method signature="System.Boolean get_IsDynamicCodeCompiled()" body="stub" value="false" />
-      <method signature="System.Boolean get_IsDynamicCodeSupported()" body="stub" value="false" />
     </type>
   </assembly>
 </linker>
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.xml b/src/coreclr/nativeaot/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.xml
@@ -1,8 +1,4 @@
 <linker>
-  <type fullname="System.Runtime.CompilerServices.RuntimeFeature">
-    <method signature="System.Boolean get_IsDynamicCodeCompiled()" body="stub" value="false" />
-    <method signature="System.Boolean get_IsDynamicCodeSupported()" body="stub" value="false" />
-  </type>
 
   <type fullname="System.Collections.Generic.Comparer`1" feature="System.Collections.Generic.DefaultComparers" featurevalue="false">
     <method signature="System.Boolean get_SupportsGenericIComparableInterfaces()" body="stub" />
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeFeature.NativeAot.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeFeature.NativeAot.cs
@@ -1,11 +1,16 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
+
 namespace System.Runtime.CompilerServices
 {
     public static partial class RuntimeFeature
     {
+        [FeatureSwitchDefinition("System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported")]
         public static bool IsDynamicCodeSupported => false;
+
+        [FeatureGuard(typeof(RequiresDynamicCodeAttribute))]
         public static bool IsDynamicCodeCompiled => false;
     }
 }
diff --git a/src/libraries/System.Linq.Expressions/src/ILLink/ILLink.Substitutions.xml b/src/libraries/System.Linq.Expressions/src/ILLink/ILLink.Substitutions.xml
@@ -1,13 +1,7 @@
 <linker>
   <assembly fullname="System.Linq.Expressions">
-    <type fullname="System.Linq.Expressions.LambdaExpression">
-      <method signature="System.Boolean get_CanCompileToIL()" feature="System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported" featurevalue="false" body="stub" value="false" />
-    </type>
     <type fullname="System.Dynamic.Utils.DelegateHelpers">
       <method signature="System.Boolean get_CanEmitObjectArrayDelegate()" feature="System.Linq.Expressions.CanEmitObjectArrayDelegate" featurevalue="false" body="stub" value="false" />
     </type>
-    <type fullname="System.Linq.Expressions.Interpreter.CallInstruction">
-      <method signature="System.Boolean get_CanCreateArbitraryDelegates()" feature="System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported" featurevalue="false" body="stub" value="false" />
-    </type>
   </assembly>
 </linker>
diff --git a/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/TypeUtils.cs b/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/TypeUtils.cs
@@ -41,10 +41,7 @@ public static Type LiftPrimitiveOrThrow(this Type type)
         {
             if (RuntimeFeature.IsDynamicCodeSupported)
             {
-#pragma warning disable IL3050
-                // Analyzer doesn't yet understand feature switches
                 return GetNullableType(type);
-#pragma warning restore IL3050
             }
             if (!type.IsValueType || IsNullableType(type))
             {
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/DelegateHelpers.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/DelegateHelpers.cs
@@ -122,13 +122,10 @@ private static System.Reflection.TypeInfo MakeNewCustomDelegate(Type[] types)
                 const MethodImplAttributes implAttributes = MethodImplAttributes.Runtime | MethodImplAttributes.Managed;
                 const MethodAttributes invokeAttributes = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.NewSlot | MethodAttributes.Virtual;
 
-#pragma warning disable IL3050
-                // Suppress analyzer warnings since they don't currently support feature flags
                 TypeBuilder builder = AssemblyGen.DefineDelegateType("Delegate" + types.Length);
                 builder.DefineConstructor(ctorAttributes, CallingConventions.Standard, delegateCtorSignature).SetImplementationFlags(implAttributes);
                 builder.DefineMethod("Invoke", invokeAttributes, returnType, parameters).SetImplementationFlags(implAttributes);
                 return builder.CreateTypeInfo();
-#pragma warning restore IL3050
             }
             else
             {
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/CallInstruction.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/CallInstruction.cs
@@ -16,6 +16,7 @@ internal abstract partial class CallInstruction : Instruction
         /// </summary>
         public abstract int ArgumentCount { get; }
 
+        [FeatureGuard(typeof(RequiresDynamicCodeAttribute))]
         private static bool CanCreateArbitraryDelegates => RuntimeFeature.IsDynamicCodeSupported;
 
         #region Construction
@@ -50,8 +51,6 @@ public static CallInstruction Create(MethodInfo info, ParameterInfo[] parameters
             if (!CanCreateArbitraryDelegates)
                 return new MethodInfoCallInstruction(info, argumentCount);
 
-            // This code should be unreachable in AOT. The analyzer currently doesn't understand feature switches
-#pragma warning disable IL3050
             if (!info.IsStatic && info.DeclaringType!.IsValueType)
             {
                 return new MethodInfoCallInstruction(info, argumentCount);
@@ -115,7 +114,6 @@ public static CallInstruction Create(MethodInfo info, ParameterInfo[] parameters
             s_cache[info] = res;
 
             return res;
-#pragma warning restore IL3050
         }
 
         private static CallInstruction GetArrayAccessor(MethodInfo info, int argumentCount)
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/LambdaExpression.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/LambdaExpression.cs
@@ -25,7 +25,7 @@ public abstract class LambdaExpression : Expression, IParameterProvider
 
         private readonly Expression _body;
 
-        // This can be flipped to false using feature switches at publishing time
+        [FeatureGuard(typeof(RequiresDynamicCodeAttribute))]
         public static bool CanCompileToIL => RuntimeFeature.IsDynamicCodeSupported;
 
         // This could be flipped to false using feature switches at publishing time
@@ -138,10 +138,7 @@ public Delegate Compile()
         {
             if (CanCompileToIL)
             {
-#pragma warning disable IL3050
-                // Analyzer doesn't yet understand feature switches
                 return Compiler.LambdaCompiler.Compile(this);
-#pragma warning restore IL3050
             }
             else
             {
@@ -221,10 +218,7 @@ internal Expression(Expression body)
         {
             if (CanCompileToIL)
             {
-#pragma warning disable IL3050
-                // Analyzer doesn't yet understand feature switches
                 return (TDelegate)(object)Compiler.LambdaCompiler.Compile(this);
-#pragma warning restore IL3050
             }
             else
             {
@@ -629,10 +623,7 @@ internal static LambdaExpression CreateLambda(Type delegateType, Expression body
                 MethodInfo create;
                 if (LambdaExpression.CanCompileToIL)
                 {
-#pragma warning disable IL3050
-                    // Analyzer doesn't yet understand feature switches
                     create = typeof(Expression<>).MakeGenericType(delegateType).GetMethod("Create", BindingFlags.Static | BindingFlags.NonPublic)!;
-#pragma warning restore IL3050
                 }
                 else
                 {
diff --git a/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSite.cs b/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSite.cs
@@ -289,10 +289,7 @@ internal T MakeUpdateDelegate()
             if (System.Linq.Expressions.LambdaExpression.CanCompileToIL
                 && target.IsGenericType && IsSimpleSignature(invoke, out Type[] args))
             {
-#pragma warning disable IL3050
-                // Analyzer doesn't yet understand feature switches
                 return MakeUpdateDelegateWhenCanCompileToIL();
-#pragma warning restore IL3050
             }
 
             s_cachedNoMatch = CreateCustomNoMatchDelegate(invoke);
diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeFeature.NonNativeAot.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeFeature.NonNativeAot.cs
@@ -1,10 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
+
 namespace System.Runtime.CompilerServices
 {
     public static partial class RuntimeFeature
     {
+        [FeatureSwitchDefinition("System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported")]
         public static bool IsDynamicCodeSupported
         {
 #if MONO
@@ -13,6 +16,7 @@ public static bool IsDynamicCodeSupported
             get;
         } = AppContext.TryGetSwitch("System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported", out bool isDynamicCodeSupported) ? isDynamicCodeSupported : true;
 
+        [FeatureGuard(typeof(RequiresDynamicCodeAttribute))]
         public static bool IsDynamicCodeCompiled
         {
 #if MONO
diff --git a/src/libraries/System.Runtime/ref/System.Runtime.cs b/src/libraries/System.Runtime/ref/System.Runtime.cs
@@ -13138,7 +13138,9 @@ public static partial class RuntimeFeature
         public const string PortablePdb = "PortablePdb";
         public const string UnmanagedSignatureCallingConvention = "UnmanagedSignatureCallingConvention";
         public const string VirtualStaticsInInterfaces = "VirtualStaticsInInterfaces";
+        [System.Diagnostics.CodeAnalysis.FeatureGuard(typeof(System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute))]
         public static bool IsDynamicCodeCompiled { get { throw null; } }
+        [System.Diagnostics.CodeAnalysis.FeatureSwitchDefinition("System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported")]
         public static bool IsDynamicCodeSupported { get { throw null; } }
         public static bool IsSupported(string feature) { throw null; }
     }
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptionsUpdateHandler.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptionsUpdateHandler.cs
@@ -28,9 +28,7 @@ public static void ClearCache(Type[]? types)
             if (RuntimeFeature.IsDynamicCodeSupported)
             {
                 // Flush the dynamic method cache
-#pragma warning disable IL3050 // The analyzer doesn't understand runtime feature conditions: https://github.com/dotnet/linker/issues/2715
                 ReflectionEmitCachingMemberAccessor.Clear();
-#pragma warning restore IL3050
             }
         }
     }
diff --git a/src/mono/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.iOS.xml b/src/mono/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.iOS.xml
@@ -3,8 +3,5 @@
     <type fullname="System.Runtime.CompilerServices.RuntimeFeature">
       <method signature="System.Boolean get_IsDynamicCodeCompiled()" body="stub" value="false" />
     </type>
-    <type fullname="System.Runtime.CompilerServices.RuntimeFeature" feature="System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported" featurevalue="false">
-        <method signature="System.Boolean get_IsDynamicCodeSupported()" body="stub" value="false" />
-    </type>
   </assembly>
 </linker>

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,16 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
	`4`	`+using System.Diagnostics.CodeAnalysis;`
	`5`	`+`
`4`	`6`	`namespace System.Runtime.CompilerServices`
`5`	`7`	`{`
`6`	`8`	`public static partial class RuntimeFeature`
`7`	`9`	`{`
	`10`	`+ [FeatureSwitchDefinition("System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported")]`
`8`	`11`	`public static bool IsDynamicCodeSupported => false;`
	`12`	`+`
	`13`	`+ [FeatureGuard(typeof(RequiresDynamicCodeAttribute))]`
`9`	`14`	`public static bool IsDynamicCodeCompiled => false;`
`10`	`15`	`}`
`11`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,7 @@ public static Type LiftPrimitiveOrThrow(this Type type)`
`41`	`41`	`{`
`42`	`42`	`if (RuntimeFeature.IsDynamicCodeSupported)`
`43`	`43`	`{`
`44`		`-#pragma warning disable IL3050`
`45`		`- // Analyzer doesn't yet understand feature switches`
`46`	`44`	`return GetNullableType(type);`
`47`		`-#pragma warning restore IL3050`
`48`	`45`	`}`
`49`	`46`	`if (!type.IsValueType \|\| IsNullableType(type))`
`50`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -122,13 +122,10 @@ private static System.Reflection.TypeInfo MakeNewCustomDelegate(Type[] types)`
`122`	`122`	`const MethodImplAttributes implAttributes = MethodImplAttributes.Runtime \| MethodImplAttributes.Managed;`
`123`	`123`	`const MethodAttributes invokeAttributes = MethodAttributes.Public \| MethodAttributes.HideBySig \| MethodAttributes.NewSlot \| MethodAttributes.Virtual;`
`124`	`124`
`125`		`-#pragma warning disable IL3050`
`126`		`- // Suppress analyzer warnings since they don't currently support feature flags`
`127`	`125`	`TypeBuilder builder = AssemblyGen.DefineDelegateType("Delegate" + types.Length);`
`128`	`126`	`builder.DefineConstructor(ctorAttributes, CallingConventions.Standard, delegateCtorSignature).SetImplementationFlags(implAttributes);`
`129`	`127`	`builder.DefineMethod("Invoke", invokeAttributes, returnType, parameters).SetImplementationFlags(implAttributes);`
`130`	`128`	`return builder.CreateTypeInfo();`
`131`		`-#pragma warning restore IL3050`
`132`	`129`	`}`
`133`	`130`	`else`
`134`	`131`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public abstract class LambdaExpression : Expression, IParameterProvider`
`25`	`25`
`26`	`26`	`private readonly Expression _body;`
`27`	`27`
`28`		`- // This can be flipped to false using feature switches at publishing time`
	`28`	`+ [FeatureGuard(typeof(RequiresDynamicCodeAttribute))]`
`29`	`29`	`public static bool CanCompileToIL => RuntimeFeature.IsDynamicCodeSupported;`
`30`	`30`
`31`	`31`	`// This could be flipped to false using feature switches at publishing time`
`@@ -138,10 +138,7 @@ public Delegate Compile()`
`138`	`138`	`{`
`139`	`139`	`if (CanCompileToIL)`
`140`	`140`	`{`
`141`		`-#pragma warning disable IL3050`
`142`		`- // Analyzer doesn't yet understand feature switches`
`143`	`141`	`return Compiler.LambdaCompiler.Compile(this);`
`144`		`-#pragma warning restore IL3050`
`145`	`142`	`}`
`146`	`143`	`else`
`147`	`144`	`{`
`@@ -221,10 +218,7 @@ internal Expression(Expression body)`
`221`	`218`	`{`
`222`	`219`	`if (CanCompileToIL)`
`223`	`220`	`{`
`224`		`-#pragma warning disable IL3050`
`225`		`- // Analyzer doesn't yet understand feature switches`
`226`	`221`	`return (TDelegate)(object)Compiler.LambdaCompiler.Compile(this);`
`227`		`-#pragma warning restore IL3050`
`228`	`222`	`}`
`229`	`223`	`else`
`230`	`224`	`{`
`@@ -629,10 +623,7 @@ internal static LambdaExpression CreateLambda(Type delegateType, Expression body`
`629`	`623`	`MethodInfo create;`
`630`	`624`	`if (LambdaExpression.CanCompileToIL)`
`631`	`625`	`{`
`632`		`-#pragma warning disable IL3050`
`633`		`- // Analyzer doesn't yet understand feature switches`
`634`	`626`	`create = typeof(Expression<>).MakeGenericType(delegateType).GetMethod("Create", BindingFlags.Static \| BindingFlags.NonPublic)!;`
`635`		`-#pragma warning restore IL3050`
`636`	`627`	`}`
`637`	`628`	`else`
`638`	`629`	`{`
Original file line number	Diff line number	Diff line change
`@@ -289,10 +289,7 @@ internal T MakeUpdateDelegate()`
`289`	`289`	`if (System.Linq.Expressions.LambdaExpression.CanCompileToIL`
`290`	`290`	`&& target.IsGenericType && IsSimpleSignature(invoke, out Type[] args))`
`291`	`291`	`{`
`292`		`-#pragma warning disable IL3050`
`293`		`- // Analyzer doesn't yet understand feature switches`
`294`	`292`	`return MakeUpdateDelegateWhenCanCompileToIL();`
`295`		`-#pragma warning restore IL3050`
`296`	`293`	`}`
`297`	`294`
`298`	`295`	`s_cachedNoMatch = CreateCustomNoMatchDelegate(invoke);`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,13 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
	`4`	`+using System.Diagnostics.CodeAnalysis;`
	`5`	`+`
`4`	`6`	`namespace System.Runtime.CompilerServices`
`5`	`7`	`{`
`6`	`8`	`public static partial class RuntimeFeature`
`7`	`9`	`{`
	`10`	`+ [FeatureSwitchDefinition("System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported")]`
`8`	`11`	`public static bool IsDynamicCodeSupported`
`9`	`12`	`{`
`10`	`13`	`#if MONO`
`@@ -13,6 +16,7 @@ public static bool IsDynamicCodeSupported`
`13`	`16`	`get;`
`14`	`17`	`} = AppContext.TryGetSwitch("System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported", out bool isDynamicCodeSupported) ? isDynamicCodeSupported : true;`
`15`	`18`
	`19`	`+ [FeatureGuard(typeof(RequiresDynamicCodeAttribute))]`
`16`	`20`	`public static bool IsDynamicCodeCompiled`
`17`	`21`	`{`
`18`	`22`	`#if MONO`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,7 @@ public static void ClearCache(Type[]? types)`
`28`	`28`	`if (RuntimeFeature.IsDynamicCodeSupported)`
`29`	`29`	`{`
`30`	`30`	`// Flush the dynamic method cache`
`31`		`-#pragma warning disable IL3050 // The analyzer doesn't understand runtime feature conditions: https://github.com/dotnet/linker/issues/2715`
`32`	`31`	`ReflectionEmitCachingMemberAccessor.Clear();`
`33`		`-#pragma warning restore IL3050`
`34`	`32`	`}`
`35`	`33`	`}`
`36`	`34`	`}`