[K/N] Change getSourceInfo signature to allow returning several frames

kotlin-native/runtime/src/debug/cpp/SourceInfo.cpp

@@ -127,7 +127,8 @@ typedef struct {
   int end;
 } SymbolSourceInfoLimits;
 
-extern "C" struct SourceInfo Kotlin_getSourceInfo(void* addr) {
+extern "C" int Kotlin_getSourceInfo(void* addr, SourceInfo *result_buffer, int result_size) {
+  if (result_size == 0) return 0;
   __block SourceInfo result = { .fileName = nullptr, .lineNumber = -1, .column = -1 };
   __block bool continueUpdateResult = true;
   __block SymbolSourceInfoLimits limits = {.start = -1, .end = -1};
@@ -139,10 +140,10 @@ extern "C" struct SourceInfo Kotlin_getSourceInfo(void* addr) {
 
     CSSymbolOwnerRef symbolOwner = CSSymbolicatorGetSymbolOwnerWithAddressAtTime(symbolicator, address, kCSNow);
     if (CSIsNull(symbolOwner))
-      return result;
+      return 0;
     CSSymbolRef symbol = CSSymbolOwnerGetSymbolWithAddress(symbolOwner, address);
     if (CSIsNull(symbol))
-      return result;
+      return 0;
     SYM_LOG("Kotlin_getSourceInfo: address: (%p) {\n", addr);
     SYM_DUMP(symbol);
 
@@ -204,13 +205,14 @@ extern "C" struct SourceInfo Kotlin_getSourceInfo(void* addr) {
    });
   }
   SYM_LOG("}\n");
-  return result;
+  result_buffer[0] = result;
+  return 1;
 }
 
 #else // KONAN_CORE_SYMBOLICATION
 
-extern "C" struct SourceInfo Kotlin_getSourceInfo(void* addr) {
+extern "C" int Kotlin_getSourceInfo(void* addr, SourceInfo *result, int result_size) {
-  return (SourceInfo) { .fileName = nullptr, .lineNumber = -1, .column = -1 };
+    return 0;
 }
 
 #endif // KONAN_CORE_SYMBOLICATION

kotlin-native/runtime/src/main/cpp/SourceInfo.h

@@ -27,7 +27,9 @@ struct SourceInfo {
 extern "C" {
 #endif
 
-struct SourceInfo Kotlin_getSourceInfo(void* addr);
+// returns number of filled elements in buffer
+// there can be several frames because of inlining
+int Kotlin_getSourceInfo(void* addr, SourceInfo *result, int result_size);
 
 #ifdef __cplusplus
 } // extern "C"

kotlin-native/runtime/src/main/cpp/StackTrace.cpp

@@ -70,8 +70,8 @@ _Unwind_Reason_Code unwindCallback(struct _Unwind_Context* context, void* arg) {
 THREAD_LOCAL_VARIABLE bool disallowSourceInfo = false;
 
 #if !KONAN_NO_BACKTRACE && !USE_GCC_UNWIND
-SourceInfo getSourceInfo(void* symbol) {
+int getSourceInfo(void* symbol, SourceInfo *result, int result_len) {
-    return disallowSourceInfo ? SourceInfo{.fileName = nullptr, .lineNumber = -1, .column = -1} : Kotlin_getSourceInfo(symbol);
+    return disallowSourceInfo ? 0 : Kotlin_getSourceInfo(symbol, result, result_len);
 }
 #endif
 
@@ -137,22 +137,37 @@ KStdVector<KStdString> kotlin::GetStackTraceStrings(void* const* stackTrace, siz
 
         for (size_t index = 0; index < stackTraceSize; ++index) {
             KNativePtr address = stackTrace[index];
-            auto sourceInfo = getSourceInfo(address);
+            SourceInfo buffer[10];
+            int frames = getSourceInfo(address, buffer, std::size(buffer));
             const char* symbol = symbols[index];
-            const char* result;
+            // returned symbol starts with frame number
+            // we need to override it, because of inlining, so let's just drop first token
+            while (*symbol != '\0' && *symbol != ' ') symbol++;
+            while (*symbol == ' ') symbol++;
+            // probably, this can't happen, but let's print at least something
+            if (*symbol == '\0') symbol = symbols[index];
+            bool isSomethingPrinted = false;
             char line[1024];
-            if (sourceInfo.fileName != nullptr) {
+            for (int frame = 0; frame < frames; frame++) {
-                if (sourceInfo.lineNumber != -1) {
+                auto &sourceInfo = buffer[frame];
-                    konan::snprintf(
+                if (sourceInfo.fileName != nullptr) {
-                            line, sizeof(line) - 1, "%s (%s:%d:%d)", symbol, sourceInfo.fileName, sourceInfo.lineNumber, sourceInfo.column);
+                    const char* inline_tag = (frame == frames - 1) ? "" : "[inlined] ";
-                } else {
+                    if (sourceInfo.lineNumber != -1) {
-                    konan::snprintf(line, sizeof(line) - 1, "%s (%s:<unknown>)", symbol, sourceInfo.fileName);
+                        konan::snprintf(
+                                line, sizeof(line) - 1, "%-4zd %s %s(%s:%d:%d)", strings.size(), symbol, inline_tag,
+                                sourceInfo.fileName, sourceInfo.lineNumber, buffer[frame].column);
+                    } else {
+                        konan::snprintf(line, sizeof(line) - 1, "%-4zd %s %s(%s:<unknown>)", strings.size(), symbol, inline_tag,
+                                        sourceInfo.fileName);
+                    }
+                    isSomethingPrinted = true;
+                    strings.push_back(line);
                 }
-                result = line;
-            } else {
-                result = symbol;
             }
-            strings.push_back(result);
+            if (!isSomethingPrinted) {
+                konan::snprintf(line, sizeof(line) - 1, "%-4zd %s", strings.size(), symbol);
+                strings.push_back(line);
+            }
         }
         // Not konan::free. Used to free memory allocated in backtrace_symbols where malloc is used.
         free(symbols);

kotlin-native/runtime/src/release/cpp/SourceInfo.cpp

@@ -16,6 +16,6 @@
 
 #include "SourceInfo.h"
 
-struct SourceInfo Kotlin_getSourceInfo(void* addr) {
+int Kotlin_getSourceInfo(void* addr, SourceInfo *result, int result_size) {
-  return (SourceInfo) { .fileName = nullptr, .lineNumber = -1, .column = -1 };
+    return 0;
 }