Fix missing line numbers in CaptureMessage stacktraces in IL2CPP builds

package-dev/Runtime/SentryInitialization.cs

@@ -16,6 +16,7 @@
 
 using System;
 using Sentry.Extensibility;
+using AOT;
 #if UNITY_2020_3_OR_NEWER
 using System.Buffers;
 using System.Runtime.InteropServices;
@@ -142,6 +143,7 @@ private Il2CppMethods _il2CppMethods
             = new Il2CppMethods(
                 Il2CppGcHandleGetTargetShim,
                 Il2CppNativeStackTraceShim,
+                Il2CppNativeStackTraceCurrentThreadShim,
                 il2cpp_free);
 
 #pragma warning disable 8632
@@ -210,6 +212,72 @@ void SwapHexByte(IntPtr buffer, Int32 offset1, Int32 offset2)
         [DllImport("__Internal")]
         private static extern void il2cpp_free(IntPtr ptr);
 
+        [StructLayout(LayoutKind.Sequential)]
+        private struct Il2CppStackFrameInfo
+        {
+            public IntPtr method;
+            public IntPtr raw_ip;
+
+            public int sourceCodeLineNumber;
+            public int ilOffset;
+
+            public IntPtr filePath;
+        }
+
+        private static void Il2CppNativeStackTraceCurrentThreadShim(out IntPtr addresses, out int numFrames, out string? imageUUID, out string? imageName)
+        {
+            // Currently there is no obvious way to obtain image UUID and name
+            var uuidBuffer = IntPtr.Zero;
+            var imageNameBuffer = IntPtr.Zero;
+
+            numFrames = il2cpp_current_thread_get_stack_depth();
+
+            var frames = new IntPtr[numFrames];
+
+            for(int i = 0; i < numFrames; ++i)
+            {
+                IntPtr farameInfoPtr = IntPtr.Zero;
+                try
+                {
+                    farameInfoPtr = Marshal.AllocHGlobal(Marshal.SizeOf<Il2CppStackFrameInfo>());
+
+                    // Is it reliable to query current stack trace here?
+                    var res = il2cpp_current_thread_get_frame_at(i, farameInfoPtr);
+                    if(res)
+                    {
+                        Il2CppStackFrameInfo frameInfo = Marshal.PtrToStructure<Il2CppStackFrameInfo>(farameInfoPtr);
+                        frames[i] = frameInfo.raw_ip;
+                    }
+                }
+                finally
+                {
+                    Marshal.FreeHGlobal(farameInfoPtr);
+                }
+            }
+
+            int size = Marshal.SizeOf(typeof(IntPtr)) * numFrames;
+            addresses = Marshal.AllocHGlobal(size);
+
+            Marshal.Copy(frames, 0, addresses, numFrames);
+
+            try
+            {
+                imageUUID = SanitizeDebugId(uuidBuffer);
+                imageName = (imageNameBuffer == IntPtr.Zero) ? null : Marshal.PtrToStringAnsi(imageNameBuffer);
+            }
+            finally
+            {
+                il2cpp_free(uuidBuffer);
+                il2cpp_free(imageNameBuffer);
+            }
+        }
+
+        [DllImport("__Internal")]
+        private static extern int il2cpp_current_thread_get_stack_depth();
+
+        [DllImport("__Internal")]
+        private static extern bool il2cpp_current_thread_get_frame_at(int offset, IntPtr frame);
+
 #if UNITY_2021_3_OR_NEWER
         private static void Il2CppNativeStackTraceShim(IntPtr exc, out IntPtr addresses, out int numFrames, out string? imageUUID, out string? imageName)
         {

samples/unity-of-bugs/Assets/Scripts/NativeSupport/CppPlugin.cpp

@@ -1,3 +1,6 @@
+#include "il2cpp-api.h"
+#include "il2cpp-config.h"
+#include "os/Image.h"
 #include <exception>
 #include <iostream>
 #include <string>

src/Sentry.Unity/ISentryUnityInfo.cs

@@ -19,15 +19,18 @@ public class Il2CppMethods
         public Il2CppMethods(
             Il2CppGcHandleGetTarget il2CppGcHandleGetTarget,
             Il2CppNativeStackTrace il2CppNativeStackTrace,
+            Il2CppNativeStackTraceCurrentThread il2CppNativeStackTraceCurrentThread,
             Il2CppFree il2CppFree)
         {
             Il2CppGcHandleGetTarget = il2CppGcHandleGetTarget;
             Il2CppNativeStackTrace = il2CppNativeStackTrace;
+            Il2CppNativeStackTraceCurrentThread = il2CppNativeStackTraceCurrentThread;
             Il2CppFree = il2CppFree;
         }
 
         public Il2CppGcHandleGetTarget Il2CppGcHandleGetTarget { get; }
         public Il2CppNativeStackTrace Il2CppNativeStackTrace { get; }
+        public Il2CppNativeStackTraceCurrentThread Il2CppNativeStackTraceCurrentThread { get; }
         public Il2CppFree Il2CppFree { get; }
     }
 
@@ -38,5 +41,11 @@ public delegate void Il2CppNativeStackTrace(
         out int numFrames,
         out string? imageUUID,
         out string? imageName);
+
+    public delegate void Il2CppNativeStackTraceCurrentThread(
+        out IntPtr addresses,
+        out int numFrames,
+        out string? imageUUID,
+        out string? imageName);
     public delegate void Il2CppFree(IntPtr ptr);
 }