Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThays Grazia <thaystg@gmail.com>2021-12-02 19:22:41 +0300
committerGitHub <noreply@github.com>2021-12-02 19:22:41 +0300
commit5789792167571c4121ef1d397e4678ba360c77b3 (patch)
treee585bf02915062b5f46498ffe5f110a76c431aa2 /src/tests/Loader/classloader
parent252b7c22276032dc00de497a27468439b12ea511 (diff)
[mono] Fix StackTrace from a dim and Vtable offsets for static interface method (#60770)
* Fix mono_get_generic_context_from_stack_frame when it's from a dim. * Using @vargaz fix * Fixing test case source name * Fix behavior when the interface had static interface methods. * Fixing test cases.
Diffstat (limited to 'src/tests/Loader/classloader')
-rw-r--r--src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.cs190
-rw-r--r--src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.csproj11
2 files changed, 201 insertions, 0 deletions
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.cs b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.cs
new file mode 100644
index 00000000000..f32ff4725d5
--- /dev/null
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.cs
@@ -0,0 +1,190 @@
+using System;
+using System.Runtime.CompilerServices;
+
+public interface IPublisher<out TData>
+{
+ event Action<TData> OnPublish;
+}
+
+public interface TestItf1<TT>
+{
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ void TestMethod1(IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ StackFrame.Validate(Environment.StackTrace, expectedFrames);
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ void TestMethod2(IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ TestMethod3(this, publisher, expectedFrames);
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ protected static void TestMethod3(TestItf1<TT> subscriber, IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ StackFrame.Validate(Environment.StackTrace, expectedFrames);
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ void TestMethod4(IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ TestMethod3(this, publisher, expectedFrames);
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ void TestMethod5(IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ TestMethod3(this, publisher, expectedFrames);
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ void TestMethod10(IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ TestMethod3(this, publisher, expectedFrames);
+ }
+
+ void TestMethod11(IPublisher<TT> publisher, StackFrame[] expectedFrames);
+}
+
+public interface TestItf2<TT> : TestItf1<TT>
+{
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ void TestItf1<TT>.TestMethod5(IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ TestMethod3(this, publisher, expectedFrames);
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ void TestItf1<TT>.TestMethod10(IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ TestMethod3(this, publisher, expectedFrames);
+ }
+}
+
+public interface TestItf3<TT> : TestItf1<TT>
+{
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ void TestMethod6(IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ TestMethod3(this, publisher, expectedFrames);
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ void TestMethod7(IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ TestMethod8(this, publisher, expectedFrames);
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ protected static void TestMethod8(TestItf1<TT> subscriber, IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ StackFrame.Validate(Environment.StackTrace, expectedFrames);
+ }
+
+ void TestMethod9(IPublisher<TT> publisher, StackFrame[] expectedFrames);
+}
+
+public interface TestItf4<TT> : TestItf3<TT>
+{
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ void TestItf3<TT>.TestMethod9(IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ TestMethod8(this, publisher, expectedFrames);
+ }
+}
+
+public class ProgramBase<TT> : TestItf4<TT>
+{
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ public void TestMethod10(IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ TestItf1<TT>.TestMethod3(this, publisher, expectedFrames);
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ public void TestMethod11(IPublisher<TT> publisher, StackFrame[] expectedFrames)
+ {
+ TestItf1<TT>.TestMethod3(this, publisher, expectedFrames);
+ }
+}
+
+public class Program : ProgramBase<InputData>, TestItf2<InputData>
+{
+ static int Main(string[] args)
+ {
+ new Program().Start();
+ return 100;
+ }
+
+ public void Start()
+ {
+ var t1 = this as TestItf1<InputData>;
+ t1.TestMethod1(null, new[] { new StackFrame("TestItf1`1", "TestMethod1") });
+ t1.TestMethod2(null, new[] { new StackFrame("TestItf1`1", "TestMethod3"), new StackFrame("TestItf1`1", "TestMethod2") });
+ t1.TestMethod4(null, new[] { new StackFrame("TestItf1`1", "TestMethod3"), new StackFrame("Program", "TestMethod4") });
+ t1.TestMethod5(null, new[] { new StackFrame("TestItf1`1", "TestMethod3"), new StackFrame(new[] { "TestItf2`1", "TestItf1" }, "TestMethod5") });
+
+ var t3 = this as TestItf3<InputData>;
+ t3.TestMethod6(null, new[] { new StackFrame("TestItf1`1", "TestMethod3"), new StackFrame("TestItf3`1", "TestMethod6") });
+ t3.TestMethod7(null, new[] { new StackFrame("TestItf3`1", "TestMethod8"), new StackFrame("TestItf3`1", "TestMethod7") });
+ t3.TestMethod9(null, new[] { new StackFrame("TestItf3`1", "TestMethod8"), new StackFrame(new[] { "TestItf4`1", "TestItf3" }, "TestMethod9") });
+
+ t1.TestMethod10(null, new[] { new StackFrame("TestItf1`1", "TestMethod3"), new StackFrame("ProgramBase`1", "TestMethod10") });
+ t1.TestMethod11(null, new[] { new StackFrame("TestItf1`1", "TestMethod3"), new StackFrame("ProgramBase`1", "TestMethod11") });
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ public void TestMethod4(IPublisher<InputData> publisher, StackFrame[] expectedFrames)
+ {
+ TestItf1<InputData>.TestMethod3(this, publisher, expectedFrames);
+ }
+}
+
+public class InputData
+{
+ public int i;
+}
+
+public class StackFrame
+{
+ public string [] ClassName { get; set; }
+ public string MethodName { get; set; } = string.Empty;
+
+ public StackFrame(string [] className, string methodName)
+ {
+ ClassName = className;
+ MethodName = methodName;
+ }
+
+ public StackFrame(string className, string methodName)
+ {
+ ClassName = new string[] { className };
+ MethodName = methodName;
+ }
+
+ public static void Validate(string testStack, StackFrame[] expectedFrames)
+ {
+ int index = 1;
+
+ string[] lines = testStack.Split(
+ new string[] { Environment.NewLine },
+ StringSplitOptions.None
+ );
+
+ //Console.WriteLine(testStack);
+
+ foreach (var frame in expectedFrames)
+ {
+ var line = lines[index++].Trim();
+
+
+ if (!line.StartsWith($"at {frame.ClassName[0]}") || !line.Contains($".{frame.MethodName}") || (frame.ClassName.Length > 1 && !line.Contains($".{frame.ClassName[1]}")))
+ {
+ Console.WriteLine($"Expected {frame.ClassName}.{frame.MethodName} but got {line}");
+ Console.WriteLine(testStack);
+ Environment.Exit(1);
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.csproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.csproj
new file mode 100644
index 00000000000..aab61d4e449
--- /dev/null
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+ <PropertyGroup>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <OutputType>Exe</OutputType>
+ <CLRTestKind>BuildAndRun</CLRTestKind>
+ <CLRTestPriority>0</CLRTestPriority>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Include="$(MSBuildProjectName).cs" />
+ </ItemGroup>
+</Project>