Skip to content

Commit

Permalink
Try to fix build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremy-rifkin committed Feb 27, 2024
1 parent 3c7a677 commit d17fe33
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/symbols/symbols_with_addr2line.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,8 @@ namespace addr2line {
// TODO: Refactor better
std::vector<stacktrace_frame> trace(frames.size(), null_frame);
for(std::size_t i = 0; i < frames.size(); i++) {
trace[i].address = frames[i].raw_address;
trace[i].raw_address = frames[i].raw_address;
trace[i].object_address = frames[i].object_address;
// Set what is known for now, and resolutions from addr2line should overwrite
trace[i].filename = frames[i].object_path;
}
Expand Down
4 changes: 2 additions & 2 deletions src/symbols/symbols_with_libbacktrace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace detail {
namespace libbacktrace {
int full_callback(void* data, std::uintptr_t address, const char* file, int line, const char* symbol) {
stacktrace_frame& frame = *static_cast<stacktrace_frame*>(data);
frame.address = address;
frame.raw_address = address;
frame.line = line;
frame.filename = file ? file : "";
frame.symbol = symbol ? symbol : "";
Expand All @@ -31,7 +31,7 @@ namespace libbacktrace {

void syminfo_callback(void* data, std::uintptr_t address, const char* symbol, std::uintptr_t, std::uintptr_t) {
stacktrace_frame& frame = *static_cast<stacktrace_frame*>(data);
frame.address = address;
frame.raw_address = address;
frame.line = 0;
frame.filename = "";
frame.symbol = symbol ? symbol : "";
Expand Down

0 comments on commit d17fe33

Please sign in to comment.