Refactor source location interface

lib/runtime/RuntimeInterface.h

@@ -59,6 +59,12 @@ typedef struct typeart_type_info_t {
   typeart_base_type_info base_type_info;  // API dependent
 } typeart_type_info;
 
+typedef struct typeart_source_loc_t {
+  char* file;
+  char* function;
+  unsigned line;
+} typeart_source_location;
+
 /**
  * Determines the type and array element count at the given address.
  * For nested types with classes/structs, the containing type is resolved recursively, until an exact with the address
@@ -194,16 +200,25 @@ typeart_status typeart_get_return_address(const void* addr, const void** return_
  * caller.
  *
  * \param[in] addr The address.
- * \param[out] file The file where the address was created at.
- * \param[out] function The function where the address was created at.
- * \param[out] line The approximate line where the address was created at.
+ * \param[out] source_loc The file/function/line where the address was created at.
  *
  * \return One of the following status codes:
  *  - TYPEART_OK: Success.
  *  - TYPEART_UNKNOWN_ADDRESS: The given address is either not allocated, or was not recorded by the runtime.
  *  - TYPEART_ERROR: Memory could not be allocated.
  */
-typeart_status typeart_get_source_location(const void* addr, char** file, char** function, char** line);
+typeart_status typeart_get_source_location(const void* addr, typeart_source_location* source_loc);
+
+/**
+ * Free previously allocated typeart_source_location.
+ *
+ * \param[in] source_loc The file/function/line where the address was created at.
+ *
+ * \return One of the following status codes:
+ *  - TYPEART_OK: Success.
+ *  - TYPEART_ERROR: source_loc was NULL.
+ */
+typeart_status typeart_free_source_location(typeart_source_location* source_loc);
 
 /**
  * Given a type ID, this function provides information about the corresponding struct type.

lib/runtime/TypeResolution.cpp

@@ -23,6 +23,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 #include <cassert>
+#include <charconv>
 #include <cstddef>
 #include <cstdint>
 #include <utility>
@@ -331,15 +332,15 @@ inline typeart_status query_struct_layout(int type_id, typeart_struct_layout* st
 }
 
 char* string2char(std::string_view src) {
-  const void* ret_addr       = __builtin_return_address(0);
+  // const void* ret_addr       = __builtin_return_address(0);
   const size_t source_length = src.size() + 1;  // +1 for '\0'
   char* string_copy          = (char*)malloc(sizeof(char) * source_length);
 
   if (string_copy == nullptr) {
     return nullptr;
   }
 
-  typeart::RuntimeSystem::get().allocTracker.onAlloc(string_copy, TYPEART_CHAR_8, source_length, ret_addr);
+  // typeart::RuntimeSystem::get().allocTracker.onAlloc(string_copy, TYPEART_CHAR_8, source_length, ret_addr);
 
   memcpy(string_copy, src.data(), source_length);
 
@@ -398,18 +399,41 @@ typeart_status typeart_get_return_address(const void* addr, const void** return_
   return TYPEART_UNKNOWN_ADDRESS;
 }
 
-typeart_status_t typeart_get_source_location(const void* addr, char** file, char** function, char** line) {
+// typeart_status_t typeart_get_source_location(const void* addr, char** file, char** function, char** line) {
+//   using namespace typeart::detail;
+//   typeart::RTGuard guard;
+
+//   auto source_loc = typeart::SourceLocation::create(addr);
+
+//   if (source_loc) {
+//     *file     = string2char(source_loc->file);
+//     *function = string2char(source_loc->function);
+//     *line     = string2char(source_loc->line);
+
+//     if (*file == nullptr || *function == nullptr || *line == nullptr) {
+//       return TYPEART_ERROR;
+//     }
+
+//     return TYPEART_OK;
+//   }
+
+//   return TYPEART_UNKNOWN_ADDRESS;
+// }
+
+typeart_status_t typeart_get_source_location(const void* addr, typeart_source_location* source_location) {
   using namespace typeart::detail;
   typeart::RTGuard guard;
 
   auto source_loc = typeart::SourceLocation::create(addr);
 
   if (source_loc) {
-    *file     = string2char(source_loc->file);
-    *function = string2char(source_loc->function);
-    *line     = string2char(source_loc->line);
+    source_location->file     = string2char(source_loc->file);
+    source_location->function = string2char(source_loc->function);
+    source_location->line     = 0;
+    const auto& line          = source_loc->line;
+    auto [ptr, ec]            = std::from_chars(line.data(), line.data() + line.size(), source_location->line);
 
-    if (*file == nullptr || *function == nullptr || *line == nullptr) {
+    if (source_location->file == nullptr || source_location->function == nullptr || ec != std::errc{}) {
       return TYPEART_ERROR;
     }
 
@@ -419,6 +443,24 @@ typeart_status_t typeart_get_source_location(const void* addr, char** file, char
   return TYPEART_UNKNOWN_ADDRESS;
 }
 
+typeart_status_t typeart_free_source_location(typeart_source_location* source_location) {
+  using namespace typeart::detail;
+  typeart::RTGuard guard;
+
+  if (source_location == nullptr) {
+    return TYPEART_ERROR;
+  }
+
+  free(source_location->file);
+  free(source_location->function);
+
+  source_location->file     = nullptr;
+  source_location->function = nullptr;
+  source_location->line     = 0;
+
+  return TYPEART_OK;
+}
+
 const char* typeart_get_type_name(int type_id) {
   typeart::RTGuard guard;
   return typeart::RuntimeSystem::get().typeResolution.db().getTypeName(type_id).c_str();

test/runtime/46_source_location.c

@@ -37,26 +37,22 @@ int main(int argc, char** argv) {
     return 1;
   }
 
-  char* file;
-  char* func;
-  char* line;
-
-  if (typeart_get_source_location(addr, &file, &func, &line) != TYPEART_OK) {
+  typeart_source_location location;
+  if (typeart_get_source_location(addr, &location) != TYPEART_OK) {
     fprintf(stderr, "Error getting source loc\n");
     return -1;
   }
 
-  fprintf(stderr, "Loc File: %s\n", file);
-  fprintf(stderr, "Loc Function: %s\n", func);
-  fprintf(stderr, "Loc Line: %s\n", line);
+  fprintf(stderr, "Loc File: %s\n", location.file);
+  fprintf(stderr, "Loc Function: %s\n", location.function);
+  fprintf(stderr, "Loc Line: %i\n", location.line);
 
-  check_addr(file);
-  check_addr(func);
-  check_addr(line);
+  typeart_free_source_location(&location);
 
-  free(file);
-  free(line);
-  free(func);
+  if (location.file != NULL || location.function != NULL) {
+    fprintf(stderr, "Error free'ing source loc\n");
+    return -1;
+  }
 
   return 0;
 }
@@ -66,6 +62,3 @@ int main(int argc, char** argv) {
 // CHECK: Loc File:{{.*}}46_source_location.c
 // CHECK: Loc Function: main
 // CHECK: Loc Line: 3{{(3|5)}}
-// CHECK: Address check OK
-// CHECK: Address check OK
-// CHECK: Address check OK