Expose RuntimeFeature.IsDynamicCodeSupported/Compiled

Fixes #29258
jkotas · Dec 8, 2018 · 6b52764 · 6b52764
1 parent 1baa54e
commit 6b52764
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/System.Runtime/ref/System.Runtime.cs b/src/System.Runtime/ref/System.Runtime.cs
@@ -128,7 +128,6 @@ public void End() { }
         [System.CLSCompliantAttribute(false)]
         public System.TypedReference GetNextArg(System.RuntimeTypeHandle rth) { throw null; }
         public System.RuntimeTypeHandle GetNextArgType() { throw null; }
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
         public int GetRemainingCount() { throw null; }
     }
     public partial class ArgumentException : System.SystemException
@@ -6756,6 +6755,8 @@ public static partial class RuntimeFeature
         public const string DefaultImplementationsOfInterfaces = "DefaultImplementationsOfInterfaces";
 #endif
         public const string PortablePdb = "PortablePdb";
+        public static bool IsDynamicCodeCompiled { get { throw null; } }
+        public static bool IsDynamicCodeSupported { get { throw null; } }
         public static bool IsSupported(string feature) { throw null; }
     }
     public static partial class RuntimeHelpers

diff --git a/src/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeFeatureTests.netcoreapp.cs b/src/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeFeatureTests.netcoreapp.cs
@@ -15,5 +15,24 @@ public static void PortablePdb()
         {
             Assert.True(RuntimeFeature.IsSupported("PortablePdb"));
         }
+
+        [Fact]
+        public static void DynamicCode()
+        {
+            Assert.Equal(RuntimeFeature.IsDynamicCodeSupported, RuntimeFeature.IsSupported("IsDynamicCodeSupported"));
+            Assert.Equal(RuntimeFeature.IsDynamicCodeCompiled, RuntimeFeature.IsSupported("IsDynamicCodeCompiled"));
+
+            if (RuntimeFeature.IsDynamicCodeCompiled)
+            {
+                Assert.True(RuntimeFeature.IsDynamicCodeSupported);
+            }
+        }
+
+        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotNetNative))]
+        public static void DynamicCode_Jit()
+        {
+            Assert.True(RuntimeFeature.IsDynamicCodeSupported);
+            Assert.True(RuntimeFeature.IsDynamicCodeCompiled);
+        }
     }
 }