Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Demangle when used standalone (#2256)

Browse Source
This commit is contained in:
Peter Johnson
2020-01-10 23:41:40 -08:00
committed by GitHub
parent 56765cf49a
commit 795086b4cf
4 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wpiutil/src/main/native/unix/Demangle.cpp
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2008-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -11,26 +11,26 @@
#include <cstdio>
#include "wpi/SmallString.h"
namespace wpi {
std::string Demangle(char const* mangledSymbol) {
char buffer[256];
std::string Demangle(const Twine& mangledSymbol) {
SmallString<128> buf;
size_t length;
int32_t status;
if (std::sscanf(mangledSymbol, "%*[^(]%*[(]%255[^)+]", buffer)) {
char* symbol = abi::__cxa_demangle(buffer, nullptr, &length, &status);
if (status == 0) {
return symbol;
} else {
// If the symbol couldn't be demangled, it's probably a C function,
// so just return it as-is.
return buffer;
}
char* symbol =
abi::__cxa_demangle(mangledSymbol.toNullTerminatedStringRef(buf).data(),
nullptr, &length, &status);
if (status == 0) {
std::string rv{symbol};
std::free(symbol);
return rv;
}
// If everything else failed, just return the mangled symbol
return mangledSymbol;
return mangledSymbol.str();
}
} // namespace wpi

9
wpiutil/src/main/native/unix/StackTrace.cpp
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2008-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -11,6 +11,7 @@
#include "wpi/Demangle.h"
#include "wpi/SmallString.h"
#include "wpi/StringRef.h"
#include "wpi/raw_ostream.h"
namespace wpi {
@@ -25,7 +26,11 @@ std::string GetStackTrace(int offset) {
for (int i = offset; i < stackSize; i++) {
// Only print recursive functions once in a row.
if (i == 0 || stackTrace[i] != stackTrace[i - 1]) {
trace << "\tat " << Demangle(mangledSymbols[i]) << "\n";
// extract just function name from "pathToExe(functionName+offset)"
StringRef sym{mangledSymbols[i]};
sym = sym.split('(').second;
sym = sym.split('+').first;
trace << "\tat " << Demangle(sym) << "\n";
}
}