Resolved #429

Ourpalm · Dec 16, 2020 · f516569 · f516569
1 parent 3224830
commit f516569
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/ILRuntime/Runtime/Enviorment/AppDomain.cs b/ILRuntime/Runtime/Enviorment/AppDomain.cs
@@ -82,6 +82,8 @@ public unsafe AppDomain()
             loadedAssemblies = System.AppDomain.CurrentDomain.GetAssemblies();
             var mi = typeof(System.Runtime.CompilerServices.RuntimeHelpers).GetMethod("InitializeArray");
             RegisterCLRMethodRedirection(mi, CLRRedirections.InitializeArray);
+            mi = typeof(AppDomain).GetMethod("GetCurrentStackTrace");
+            RegisterCLRMethodRedirection(mi, CLRRedirections.GetCurrentStackTrace);
             foreach (var i in typeof(System.Activator).GetMethods())
             {
                 if (i.Name == "CreateInstance" && i.IsGenericMethodDefinition)
@@ -233,6 +235,11 @@ public void LoadAssemblyFile(string path)
             }
         }
 
+        public string GetCurrentStackTrace()
+        {
+            throw new NotSupportedException("Cannot call this method from CLR side");
+        }
+
 #if USE_MDB || USE_PDB
         /// <summary>
         /// 加载Assembly 文件和PDB文件或MDB文件，从指定的路径（PDB和MDB文件按默认命名方式，并且和Assembly文件处于同一目录中

diff --git a/ILRuntime/Runtime/Enviorment/CLRRedirections.cs b/ILRuntime/Runtime/Enviorment/CLRRedirections.cs
@@ -16,6 +16,13 @@ namespace ILRuntime.Runtime.Enviorment
 {
     unsafe static class CLRRedirections
     {
+        public static StackObject* GetCurrentStackTrace(ILIntepreter intp, StackObject* esp, IList<object> mStack, CLRMethod method, bool isNewObj)
+        {
+            StackObject* ret = esp - 1 - 1;
+            intp.Free(esp - 1);
+
+            return ILIntepreter.PushObject(ret, mStack, intp.AppDomain.DebugService.GetStackTrace(intp));
+        }
         public static StackObject* CreateInstance(ILIntepreter intp, StackObject* esp, IList<object> mStack, CLRMethod method, bool isNewObj)
         {
             IType[] genericArguments = method.GenericArguments;

diff --git a/TestCases/LightTester1.cs b/TestCases/LightTester1.cs
@@ -384,6 +384,11 @@ static void UnitTest_1014Sub(ref int a)
             }
         }
 
+        public static void UnitTest_1015()
+        {
+            Console.WriteLine(ILRuntimeTest.TestMainForm._app.GetCurrentStackTrace());
+        }
+
         public class TestClass<T> where T : class, new()
         {
             public T tValue;