sanitizer_symbolizer_libbacktrace.cc, [...]: Cherry pick upstream r224308.
* sanitizer_common/sanitizer_symbolizer_libbacktrace.cc, sanitizer_common/sanitizer_symbolizer_libbacktrace.h, sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc: Cherry pick upstream r224308. From-SVN: r218778
This commit is contained in:
parent
ad52126ec3
commit
f2798565b4
4 changed files with 13 additions and 6 deletions
|
@ -1,3 +1,10 @@
|
|||
2014-12-16 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* sanitizer_common/sanitizer_symbolizer_libbacktrace.cc,
|
||||
sanitizer_common/sanitizer_symbolizer_libbacktrace.h,
|
||||
sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc: Cherry pick
|
||||
upstream r224308.
|
||||
|
||||
2014-11-21 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
PR bootstrap/63784
|
||||
|
|
|
@ -165,9 +165,9 @@ uptr LibbacktraceSymbolizer::SymbolizeCode(uptr addr, AddressInfo *frames,
|
|||
return data.n_frames;
|
||||
}
|
||||
|
||||
bool LibbacktraceSymbolizer::SymbolizeData(DataInfo *info) {
|
||||
backtrace_syminfo((backtrace_state *)state_, info->start,
|
||||
SymbolizeDataCallback, ErrorCallback, info);
|
||||
bool LibbacktraceSymbolizer::SymbolizeData(uptr addr, DataInfo *info) {
|
||||
backtrace_syminfo((backtrace_state *)state_, addr, SymbolizeDataCallback,
|
||||
ErrorCallback, info);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -185,7 +185,7 @@ uptr LibbacktraceSymbolizer::SymbolizeCode(uptr addr, AddressInfo *frames,
|
|||
return 0;
|
||||
}
|
||||
|
||||
bool LibbacktraceSymbolizer::SymbolizeData(DataInfo *info) {
|
||||
bool LibbacktraceSymbolizer::SymbolizeData(uptr addr, DataInfo *info) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ class LibbacktraceSymbolizer {
|
|||
uptr SymbolizeCode(uptr addr, AddressInfo *frames, uptr max_frames,
|
||||
const char *module_name, uptr module_offset);
|
||||
|
||||
bool SymbolizeData(DataInfo *info);
|
||||
bool SymbolizeData(uptr addr, DataInfo *info);
|
||||
|
||||
// May return NULL if demangling failed.
|
||||
static char *Demangle(const char *name, bool always_alloc = false);
|
||||
|
|
|
@ -593,7 +593,7 @@ class POSIXSymbolizer : public Symbolizer {
|
|||
// First, try to use libbacktrace symbolizer (if it's available).
|
||||
if (libbacktrace_symbolizer_ != 0) {
|
||||
mu_.CheckLocked();
|
||||
if (libbacktrace_symbolizer_->SymbolizeData(info))
|
||||
if (libbacktrace_symbolizer_->SymbolizeData(addr, info))
|
||||
return true;
|
||||
}
|
||||
const char *str = SendCommand(true, module_name, module_offset);
|
||||
|
|
Loading…
Add table
Reference in a new issue