Run System.Diagnostics.StackTrace tests with NAOT (#103151)

MichalStrehovsky · web-flow · commit 0686ce61ed1e · 2024-06-10T23:22:59.000+02:00
Also fixes some corner case issues, like whether an empty stacktrace should stringify into a newline.
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Diagnostics/StackTrace.NativeAot.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Diagnostics/StackTrace.NativeAot.cs
@@ -80,18 +80,19 @@ private void InitializeForIpAddressArray(IntPtr[] ipAddresses, int skipFrames, i
 #if !TARGET_WASM
         internal void ToString(TraceFormat traceFormat, StringBuilder builder)
         {
-            if (_stackFrames == null)
+            if (_stackFrames != null)
             {
-                return;
-            }
-
-            foreach (StackFrame frame in _stackFrames)
-            {
-                frame.AppendToStackTrace(builder);
+                foreach (StackFrame frame in _stackFrames)
+                {
+                    frame?.AppendToStackTrace(builder);
+                }
             }
 
             if (traceFormat == TraceFormat.Normal && builder.Length >= Environment.NewLine.Length)
                 builder.Length -= Environment.NewLine.Length;
+
+            if (traceFormat == TraceFormat.TrailingNewLine && builder.Length == 0)
+                builder.AppendLine();
         }
 #endif
     }
diff --git a/src/coreclr/nativeaot/System.Private.StackTraceMetadata/src/Internal/StackTraceMetadata/MethodNameFormatter.cs b/src/coreclr/nativeaot/System.Private.StackTraceMetadata/src/Internal/StackTraceMetadata/MethodNameFormatter.cs
@@ -403,9 +403,10 @@ private void EmitPointerTypeName(PointerSignatureHandle pointerSigHandle)
         /// <summary>
         /// Emit function pointer type.
         /// </summary>
-        private void EmitFunctionPointerTypeName()
+        private static void EmitFunctionPointerTypeName()
         {
-            _outputBuilder.Append("IntPtr");
+            // Function pointer types have no textual representation and we have tests making sure
+            // they show up as empty strings in stack traces, so deliberately do nothing.
         }
 
         /// <summary>
diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
@@ -172,6 +172,7 @@ private static bool GetLinqExpressionsBuiltWithIsInterpretingOnly()
         public static bool IsAsyncFileIOSupported => !IsBrowser && !IsWasi;
 
         public static bool IsLineNumbersSupported => !IsNativeAot;
+        public static bool IsILOffsetsSupported => !IsNativeAot;
 
         public static bool IsInContainer => GetIsInContainer();
         public static bool IsNotInContainer => !IsInContainer;
diff --git a/src/libraries/System.Diagnostics.StackTrace/tests/StackFrameExtensionsTests.cs b/src/libraries/System.Diagnostics.StackTrace/tests/StackFrameExtensionsTests.cs
@@ -16,21 +16,21 @@ public static IEnumerable<object[]> StackFrame_TestData()
             yield return new object[] { new StackFrame(int.MaxValue) };
         }
 
-        [Theory]
+        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotNativeAot))]
         [MemberData(nameof(StackFrame_TestData))]
         public void HasNativeImage_StackFrame_ReturnsFalse(StackFrame stackFrame)
         {
             Assert.False(stackFrame.HasNativeImage());
         }
 
-        [Theory]
+        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotNativeAot))]
         [MemberData(nameof(StackFrame_TestData))]
         public void GetNativeIP_StackFrame_ReturnsZero(StackFrame stackFrame)
         {
             Assert.Equal(IntPtr.Zero, stackFrame.GetNativeIP());
         }
 
-        [Theory]
+        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotNativeAot))]
         [MemberData(nameof(StackFrame_TestData))]
         public void GetNativeImageBase_StackFrame_ReturnsZero(StackFrame stackFrame)
         {
@@ -43,7 +43,7 @@ public static IEnumerable<object[]> HasMethod_TestData()
             yield return new object[] { new StackFrame(int.MaxValue), false };
         }
 
-        [Theory]
+        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsILOffsetsSupported))]
         [ActiveIssue("https://github.com/dotnet/runtime/issues/50957", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
         [MemberData(nameof(HasMethod_TestData))]
         public void HasILOffset_Invoke_ReturnsExpected(StackFrame stackFrame, bool expected)
@@ -59,6 +59,7 @@ public void HasILOffset_NullStackFrame_ThrowsNullReferenceException()
 
         [Theory]
         [ActiveIssue("https://github.com/dotnet/runtime/issues/50957", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/103218", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))]
         [MemberData(nameof(HasMethod_TestData))]
         public void HasMethod_Invoke_ReturnsExpected(StackFrame stackFrame, bool expected)
         {
@@ -79,6 +80,7 @@ public static IEnumerable<object[]> HasSource_TestData()
         }
 
         [Theory]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/103218", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))]
         [MemberData(nameof(HasSource_TestData))]
         public void HasSource_Invoke_ReturnsExpected(StackFrame stackFrame, bool expected)
         {
diff --git a/src/libraries/System.Diagnostics.StackTrace/tests/StackFrameTests.cs b/src/libraries/System.Diagnostics.StackTrace/tests/StackFrameTests.cs
@@ -75,6 +75,7 @@ public void SkipFrames_CallMethod_ReturnsExpected()
         [Theory]
         [InlineData(int.MinValue)]
         [InlineData(int.MaxValue)]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/103218", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))]
         public void SkipFrames_ManyFrames_HasNoMethod(int skipFrames)
         {
             var stackFrame = new StackFrame(skipFrames);
@@ -123,6 +124,7 @@ public static IEnumerable<object[]> ToString_TestData()
 
         [Theory]
         [ActiveIssue("https://github.com/mono/mono/issues/15186", TestRuntimes.Mono)]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/103156", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))]
         [MemberData(nameof(ToString_TestData))]
         public void ToString_Invoke_ReturnsExpected(StackFrame stackFrame, string expectedToString)
         {
@@ -168,7 +170,10 @@ private static void VerifyStackFrameSkipFrames(StackFrame stackFrame, bool isFil
             }
             else
             {
-                Assert.True(stackFrame.GetILOffset() >= 0, $"Expected GetILOffset() {stackFrame.GetILOffset()} for {stackFrame} to be greater or equal to zero.");
+                if (PlatformDetection.IsILOffsetsSupported)
+                {
+                    Assert.True(stackFrame.GetILOffset() >= 0, $"Expected GetILOffset() {stackFrame.GetILOffset()} for {stackFrame} to be greater or equal to zero.");
+                }
             }
 
             // GetMethod returns null for unknown frames.
diff --git a/src/libraries/System.Diagnostics.StackTrace/tests/StackTraceSymbolsTests.cs b/src/libraries/System.Diagnostics.StackTrace/tests/StackTraceSymbolsTests.cs
@@ -9,7 +9,7 @@ namespace System.Diagnostics.SymbolStore.Tests
 {
     public class StackTraceSymbolsTests
     {
-        [Fact]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.HasAssemblyFiles))]
         [ActiveIssue("https://github.com/dotnet/runtime/issues/51399", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
         public void StackTraceSymbolsDoNotLockFile()
         {
diff --git a/src/libraries/System.Diagnostics.StackTrace/tests/StackTraceTests.cs b/src/libraries/System.Diagnostics.StackTrace/tests/StackTraceTests.cs
@@ -47,7 +47,7 @@ public void MethodsToSkip_Get_ReturnsZero()
         public void Ctor_Default()
         {
             var stackTrace = new StackTrace();
-            VerifyFrames(stackTrace, false);
+            VerifyFrames(stackTrace, false, 0);
         }
 
         [Theory]
@@ -57,7 +57,7 @@ public void Ctor_Default()
         public void Ctor_FNeedFileInfo(bool fNeedFileInfo)
         {
             var stackTrace = new StackTrace(fNeedFileInfo);
-            VerifyFrames(stackTrace, fNeedFileInfo);
+            VerifyFrames(stackTrace, fNeedFileInfo, 0);
         }
 
         [Theory]
@@ -73,7 +73,7 @@ public void Ctor_SkipFrames(int skipFrames)
             Assert.Equal(emptyStackTrace.FrameCount - skipFrames, stackTrace.FrameCount);
             Assert.Equal(expectedMethods, stackTrace.GetFrames().Select(f => f.GetMethod()));
 
-            VerifyFrames(stackTrace, false);
+            VerifyFrames(stackTrace, false, skipFrames);
         }
 
         [Fact]
@@ -99,7 +99,7 @@ public void Ctor_SkipFrames_FNeedFileInfo(int skipFrames, bool fNeedFileInfo)
             Assert.Equal(emptyStackTrace.FrameCount - skipFrames, stackTrace.FrameCount);
             Assert.Equal(expectedMethods, stackTrace.GetFrames().Select(f => f.GetMethod()));
 
-            VerifyFrames(stackTrace, fNeedFileInfo);
+            VerifyFrames(stackTrace, fNeedFileInfo, skipFrames);
         }
 
         [Theory]
@@ -117,7 +117,7 @@ public void Ctor_LargeSkipFramesFNeedFileInfo_GetFramesReturnsEmpty(bool fNeedFi
         public void Ctor_ThrownException_GetFramesReturnsExpected()
         {
             var stackTrace = new StackTrace(InvokeException());
-            VerifyFrames(stackTrace, false);
+            VerifyFrames(stackTrace, false, 0);
         }
 
         [Fact]
@@ -137,7 +137,7 @@ public void Ctor_EmptyException_GetFramesReturnsEmpty()
         public void Ctor_Bool_ThrownException_GetFramesReturnsExpected(bool fNeedFileInfo)
         {
             var stackTrace = new StackTrace(InvokeException(), fNeedFileInfo);
-            VerifyFrames(stackTrace, fNeedFileInfo);
+            VerifyFrames(stackTrace, fNeedFileInfo, 0);
         }
 
         [Theory]
@@ -171,7 +171,7 @@ public void Ctor_Exception_SkipFrames(int skipFrames)
             Assert.Equal(expectedMethods, frames.Select(f => f.GetMethod()));
             if (frames != null)
             {
-                VerifyFrames(stackTrace, false);
+                VerifyFrames(stackTrace, false, skipFrames);
             }
         }
 
@@ -211,7 +211,7 @@ public void Ctor_Exception_SkipFrames_FNeedFileInfo(int skipFrames, bool fNeedFi
             Assert.Equal(expectedMethods, frames.Select(f => f.GetMethod()));
             if (frames != null)
             {
-                VerifyFrames(stackTrace, fNeedFileInfo);
+                VerifyFrames(stackTrace, fNeedFileInfo, skipFrames);
             }
         }
 
@@ -450,7 +450,7 @@ private class ClassWithConstructor
             public ClassWithConstructor() => StackTrace = new StackTrace();
         }
 
-        private static void VerifyFrames(StackTrace stackTrace, bool hasFileInfo)
+        private static void VerifyFrames(StackTrace stackTrace, bool hasFileInfo, int skippedFrames)
         {
             Assert.True(stackTrace.FrameCount > 0);
 
@@ -467,7 +467,11 @@ private static void VerifyFrames(StackTrace stackTrace, bool hasFileInfo)
                     Assert.Equal(0, stackFrame.GetFileLineNumber());
                     Assert.Equal(0, stackFrame.GetFileColumnNumber());
                 }
-                Assert.NotNull(stackFrame.GetMethod());
+
+                // On native AOT, the reflection invoke infrastructure uses compiler-generated code
+                // that doesn't have a reflection method associated. Limit the checks.
+                if (!PlatformDetection.IsNativeAot || (i + skippedFrames) == 0)
+                    Assert.NotNull(stackFrame.GetMethod());
             }
         }
     }
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
@@ -518,7 +518,6 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Data.Common\tests\System.Data.Common.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.DiagnosticSource\tests\TestWithConfigSwitches\System.Diagnostics.DiagnosticSource.Switches.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.PerformanceCounter\tests\System.Diagnostics.PerformanceCounter.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.StackTrace\tests\System.Diagnostics.StackTrace.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.TraceSource\tests\System.Diagnostics.TraceSource.Config.Tests\System.Diagnostics.TraceSource.Config.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.Tracing\tests\System.Diagnostics.Tracing.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Formats.Cbor\tests\System.Formats.Cbor.Tests.csproj" />

Original file line number	Diff line number	Diff line change
`@@ -80,18 +80,19 @@ private void InitializeForIpAddressArray(IntPtr[] ipAddresses, int skipFrames, i`
`80`	`80`	`#if !TARGET_WASM`
`81`	`81`	`internal void ToString(TraceFormat traceFormat, StringBuilder builder)`
`82`	`82`	`{`
`83`		`- if (_stackFrames == null)`
	`83`	`+ if (_stackFrames != null)`
`84`	`84`	`{`
`85`		`- return;`
`86`		`- }`
`87`		`-`
`88`		`- foreach (StackFrame frame in _stackFrames)`
`89`		`- {`
`90`		`- frame.AppendToStackTrace(builder);`
	`85`	`+ foreach (StackFrame frame in _stackFrames)`
	`86`	`+ {`
	`87`	`+ frame?.AppendToStackTrace(builder);`
	`88`	`+ }`
`91`	`89`	`}`
`92`	`90`
`93`	`91`	`if (traceFormat == TraceFormat.Normal && builder.Length >= Environment.NewLine.Length)`
`94`	`92`	`builder.Length -= Environment.NewLine.Length;`
	`93`	`+`
	`94`	`+ if (traceFormat == TraceFormat.TrailingNewLine && builder.Length == 0)`
	`95`	`+ builder.AppendLine();`
`95`	`96`	`}`
`96`	`97`	`#endif`
`97`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -403,9 +403,10 @@ private void EmitPointerTypeName(PointerSignatureHandle pointerSigHandle)`
`403`	`403`	`/// <summary>`
`404`	`404`	`/// Emit function pointer type.`
`405`	`405`	`/// </summary>`
`406`		`- private void EmitFunctionPointerTypeName()`
	`406`	`+ private static void EmitFunctionPointerTypeName()`
`407`	`407`	`{`
`408`		`- _outputBuilder.Append("IntPtr");`
	`408`	`+ // Function pointer types have no textual representation and we have tests making sure`
	`409`	`+ // they show up as empty strings in stack traces, so deliberately do nothing.`
`409`	`410`	`}`
`410`	`411`
`411`	`412`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -16,21 +16,21 @@ public static IEnumerable<object[]> StackFrame_TestData()`
`16`	`16`	`yield return new object[] { new StackFrame(int.MaxValue) };`
`17`	`17`	`}`
`18`	`18`
`19`		`- [Theory]`
	`19`	`+ [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotNativeAot))]`
`20`	`20`	`[MemberData(nameof(StackFrame_TestData))]`
`21`	`21`	`public void HasNativeImage_StackFrame_ReturnsFalse(StackFrame stackFrame)`
`22`	`22`	`{`
`23`	`23`	`Assert.False(stackFrame.HasNativeImage());`
`24`	`24`	`}`
`25`	`25`
`26`		`- [Theory]`
	`26`	`+ [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotNativeAot))]`
`27`	`27`	`[MemberData(nameof(StackFrame_TestData))]`
`28`	`28`	`public void GetNativeIP_StackFrame_ReturnsZero(StackFrame stackFrame)`
`29`	`29`	`{`
`30`	`30`	`Assert.Equal(IntPtr.Zero, stackFrame.GetNativeIP());`
`31`	`31`	`}`
`32`	`32`
`33`		`- [Theory]`
	`33`	`+ [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotNativeAot))]`
`34`	`34`	`[MemberData(nameof(StackFrame_TestData))]`
`35`	`35`	`public void GetNativeImageBase_StackFrame_ReturnsZero(StackFrame stackFrame)`
`36`	`36`	`{`
`@@ -43,7 +43,7 @@ public static IEnumerable<object[]> HasMethod_TestData()`
`43`	`43`	`yield return new object[] { new StackFrame(int.MaxValue), false };`
`44`	`44`	`}`
`45`	`45`
`46`		`- [Theory]`
	`46`	`+ [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsILOffsetsSupported))]`
`47`	`47`	`[ActiveIssue("https://github.com/dotnet/runtime/issues/50957", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]`
`48`	`48`	`[MemberData(nameof(HasMethod_TestData))]`
`49`	`49`	`public void HasILOffset_Invoke_ReturnsExpected(StackFrame stackFrame, bool expected)`
`@@ -59,6 +59,7 @@ public void HasILOffset_NullStackFrame_ThrowsNullReferenceException()`
`59`	`59`
`60`	`60`	`[Theory]`
`61`	`61`	`[ActiveIssue("https://github.com/dotnet/runtime/issues/50957", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]`
	`62`	`+ [ActiveIssue("https://github.com/dotnet/runtime/issues/103218", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))]`
`62`	`63`	`[MemberData(nameof(HasMethod_TestData))]`
`63`	`64`	`public void HasMethod_Invoke_ReturnsExpected(StackFrame stackFrame, bool expected)`
`64`	`65`	`{`
`@@ -79,6 +80,7 @@ public static IEnumerable<object[]> HasSource_TestData()`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`[Theory]`
	`83`	`+ [ActiveIssue("https://github.com/dotnet/runtime/issues/103218", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))]`
`82`	`84`	`[MemberData(nameof(HasSource_TestData))]`
`83`	`85`	`public void HasSource_Invoke_ReturnsExpected(StackFrame stackFrame, bool expected)`
`84`	`86`	`{`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ public void SkipFrames_CallMethod_ReturnsExpected()`
`75`	`75`	`[Theory]`
`76`	`76`	`[InlineData(int.MinValue)]`
`77`	`77`	`[InlineData(int.MaxValue)]`
	`78`	`+ [ActiveIssue("https://github.com/dotnet/runtime/issues/103218", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))]`
`78`	`79`	`public void SkipFrames_ManyFrames_HasNoMethod(int skipFrames)`
`79`	`80`	`{`
`80`	`81`	`var stackFrame = new StackFrame(skipFrames);`
`@@ -123,6 +124,7 @@ public static IEnumerable<object[]> ToString_TestData()`
`123`	`124`
`124`	`125`	`[Theory]`
`125`	`126`	`[ActiveIssue("https://github.com/mono/mono/issues/15186", TestRuntimes.Mono)]`
	`127`	`+ [ActiveIssue("https://github.com/dotnet/runtime/issues/103156", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))]`
`126`	`128`	`[MemberData(nameof(ToString_TestData))]`
`127`	`129`	`public void ToString_Invoke_ReturnsExpected(StackFrame stackFrame, string expectedToString)`
`128`	`130`	`{`
`@@ -168,7 +170,10 @@ private static void VerifyStackFrameSkipFrames(StackFrame stackFrame, bool isFil`
`168`	`170`	`}`
`169`	`171`	`else`
`170`	`172`	`{`
`171`		`- Assert.True(stackFrame.GetILOffset() >= 0, $"Expected GetILOffset() {stackFrame.GetILOffset()} for {stackFrame} to be greater or equal to zero.");`
	`173`	`+ if (PlatformDetection.IsILOffsetsSupported)`
	`174`	`+ {`
	`175`	`+ Assert.True(stackFrame.GetILOffset() >= 0, $"Expected GetILOffset() {stackFrame.GetILOffset()} for {stackFrame} to be greater or equal to zero.");`
	`176`	`+ }`
`172`	`177`	`}`
`173`	`178`
`174`	`179`	`// GetMethod returns null for unknown frames.`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace System.Diagnostics.SymbolStore.Tests`
`9`	`9`	`{`
`10`	`10`	`public class StackTraceSymbolsTests`
`11`	`11`	`{`
`12`		`- [Fact]`
	`12`	`+ [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.HasAssemblyFiles))]`
`13`	`13`	`[ActiveIssue("https://github.com/dotnet/runtime/issues/51399", TestPlatforms.iOS \| TestPlatforms.tvOS \| TestPlatforms.MacCatalyst)]`
`14`	`14`	`public void StackTraceSymbolsDoNotLockFile()`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void MethodsToSkip_Get_ReturnsZero()`
`47`	`47`	`public void Ctor_Default()`
`48`	`48`	`{`
`49`	`49`	`var stackTrace = new StackTrace();`
`50`		`- VerifyFrames(stackTrace, false);`
	`50`	`+ VerifyFrames(stackTrace, false, 0);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`[Theory]`
`@@ -57,7 +57,7 @@ public void Ctor_Default()`
`57`	`57`	`public void Ctor_FNeedFileInfo(bool fNeedFileInfo)`
`58`	`58`	`{`
`59`	`59`	`var stackTrace = new StackTrace(fNeedFileInfo);`
`60`		`- VerifyFrames(stackTrace, fNeedFileInfo);`
	`60`	`+ VerifyFrames(stackTrace, fNeedFileInfo, 0);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`[Theory]`
`@@ -73,7 +73,7 @@ public void Ctor_SkipFrames(int skipFrames)`
`73`	`73`	`Assert.Equal(emptyStackTrace.FrameCount - skipFrames, stackTrace.FrameCount);`
`74`	`74`	`Assert.Equal(expectedMethods, stackTrace.GetFrames().Select(f => f.GetMethod()));`
`75`	`75`
`76`		`- VerifyFrames(stackTrace, false);`
	`76`	`+ VerifyFrames(stackTrace, false, skipFrames);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`[Fact]`
`@@ -99,7 +99,7 @@ public void Ctor_SkipFrames_FNeedFileInfo(int skipFrames, bool fNeedFileInfo)`
`99`	`99`	`Assert.Equal(emptyStackTrace.FrameCount - skipFrames, stackTrace.FrameCount);`
`100`	`100`	`Assert.Equal(expectedMethods, stackTrace.GetFrames().Select(f => f.GetMethod()));`
`101`	`101`
`102`		`- VerifyFrames(stackTrace, fNeedFileInfo);`
	`102`	`+ VerifyFrames(stackTrace, fNeedFileInfo, skipFrames);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`[Theory]`
`@@ -117,7 +117,7 @@ public void Ctor_LargeSkipFramesFNeedFileInfo_GetFramesReturnsEmpty(bool fNeedFi`
`117`	`117`	`public void Ctor_ThrownException_GetFramesReturnsExpected()`
`118`	`118`	`{`
`119`	`119`	`var stackTrace = new StackTrace(InvokeException());`
`120`		`- VerifyFrames(stackTrace, false);`
	`120`	`+ VerifyFrames(stackTrace, false, 0);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`[Fact]`
`@@ -137,7 +137,7 @@ public void Ctor_EmptyException_GetFramesReturnsEmpty()`
`137`	`137`	`public void Ctor_Bool_ThrownException_GetFramesReturnsExpected(bool fNeedFileInfo)`
`138`	`138`	`{`
`139`	`139`	`var stackTrace = new StackTrace(InvokeException(), fNeedFileInfo);`
`140`		`- VerifyFrames(stackTrace, fNeedFileInfo);`
	`140`	`+ VerifyFrames(stackTrace, fNeedFileInfo, 0);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`[Theory]`
`@@ -171,7 +171,7 @@ public void Ctor_Exception_SkipFrames(int skipFrames)`
`171`	`171`	`Assert.Equal(expectedMethods, frames.Select(f => f.GetMethod()));`
`172`	`172`	`if (frames != null)`
`173`	`173`	`{`
`174`		`- VerifyFrames(stackTrace, false);`
	`174`	`+ VerifyFrames(stackTrace, false, skipFrames);`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`
`@@ -211,7 +211,7 @@ public void Ctor_Exception_SkipFrames_FNeedFileInfo(int skipFrames, bool fNeedFi`
`211`	`211`	`Assert.Equal(expectedMethods, frames.Select(f => f.GetMethod()));`
`212`	`212`	`if (frames != null)`
`213`	`213`	`{`
`214`		`- VerifyFrames(stackTrace, fNeedFileInfo);`
	`214`	`+ VerifyFrames(stackTrace, fNeedFileInfo, skipFrames);`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
`@@ -450,7 +450,7 @@ private class ClassWithConstructor`
`450`	`450`	`public ClassWithConstructor() => StackTrace = new StackTrace();`
`451`	`451`	`}`
`452`	`452`
`453`		`- private static void VerifyFrames(StackTrace stackTrace, bool hasFileInfo)`
	`453`	`+ private static void VerifyFrames(StackTrace stackTrace, bool hasFileInfo, int skippedFrames)`
`454`	`454`	`{`
`455`	`455`	`Assert.True(stackTrace.FrameCount > 0);`
`456`	`456`
`@@ -467,7 +467,11 @@ private static void VerifyFrames(StackTrace stackTrace, bool hasFileInfo)`
`467`	`467`	`Assert.Equal(0, stackFrame.GetFileLineNumber());`
`468`	`468`	`Assert.Equal(0, stackFrame.GetFileColumnNumber());`
`469`	`469`	`}`
`470`		`- Assert.NotNull(stackFrame.GetMethod());`
	`470`	`+`
	`471`	`+ // On native AOT, the reflection invoke infrastructure uses compiler-generated code`
	`472`	`+ // that doesn't have a reflection method associated. Limit the checks.`
	`473`	`+ if (!PlatformDetection.IsNativeAot \|\| (i + skippedFrames) == 0)`
	`474`	`+ Assert.NotNull(stackFrame.GetMethod());`
`471`	`475`	`}`
`472`	`476`	`}`
`473`	`477`	`}`