Skip to content

Compile fixes with strict warnings check #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compile fixes with strict warnings check #353

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 60 additions & 30 deletions backward.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,17 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <exception>
#include <fstream>
#include <iomanip>
#include <iostream>
#include <iterator>
#include <limits>
#include <new>
#include <sstream>
#include <streambuf>
#include <string>
#include <vector>
#include <exception>
#include <iterator>

#if defined(BACKWARD_SYSTEM_LINUX)

Expand Down Expand Up @@ -121,6 +121,18 @@
//
// Note that only one of the define should be set to 1 at a time.
//
#ifndef BACKWARD_HAS_UNWIND
#define BACKWARD_HAS_UNWIND 0
#endif

#ifndef BACKWARD_HAS_LIBUNWIND
#define BACKWARD_HAS_LIBUNWIND 0
#endif

#ifndef BACKWARD_HAS_BACKTRACE
#define BACKWARD_HAS_BACKTRACE 0
#endif

#if BACKWARD_HAS_UNWIND == 1
#elif BACKWARD_HAS_LIBUNWIND == 1
#elif BACKWARD_HAS_BACKTRACE == 1
Expand Down Expand Up @@ -184,6 +196,23 @@
//
// Note that only one of the define should be set to 1 at a time.
//

#ifndef BACKWARD_HAS_DW
#define BACKWARD_HAS_DW 0
#endif

#ifndef BACKWARD_HAS_BFD
#define BACKWARD_HAS_BFD 0
#endif

#ifndef BACKWARD_HAS_DWARF
#define BACKWARD_HAS_DWARF 0
#endif

#ifndef BACKWARD_HAS_BACKTRACE_SYMBOL
#define BACKWARD_HAS_BACKTRACE_SYMBOL 0
#endif

#if BACKWARD_HAS_DW == 1
#elif BACKWARD_HAS_BFD == 1
#elif BACKWARD_HAS_DWARF == 1
Expand Down Expand Up @@ -218,9 +247,9 @@
#include <asm/ptrace.h>
#endif
#include <signal.h>
#include <sys/stat.h>
#include <syscall.h>
#include <unistd.h>
#include <sys/stat.h>
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#include <dlfcn.h>
Expand Down Expand Up @@ -424,6 +453,7 @@ using std::move;
} // namespace backward
#else // NOT BACKWARD_ATLEAST_CXX11
#define nullptr NULL
#define constexpr const
#define override
#include <map>
namespace backward {
Expand All @@ -442,7 +472,7 @@ namespace details {
#if defined(BACKWARD_SYSTEM_WINDOWS)
const char kBackwardPathDelimiter[] = ";";
#else
const char kBackwardPathDelimiter[] = ":";
constexpr char kBackwardPathDelimiter[] = ":";
#endif
} // namespace details
} // namespace backward
Expand Down Expand Up @@ -518,7 +548,7 @@ template <typename R, typename T, R (*F)(T)> struct deleter {
};

template <typename T> struct default_delete {
void operator()(T &ptr) const { delete ptr; }
void operator()(const T &ptr) const { delete ptr; }
};

template <typename T, typename Deleter = deleter<void, void *, &::free> >
Expand Down Expand Up @@ -933,7 +963,7 @@ class StackTraceImpl<system_tag::current_tag> : public StackTraceImplHolder {
// the rest

if (context()) {
ucontext_t *uctx = reinterpret_cast<ucontext_t *>(context());
ucontext_t *uctx = static_cast<ucontext_t *>(context());
#ifdef REG_RIP // x86_64
if (uctx->uc_mcontext.gregs[REG_RIP] ==
reinterpret_cast<greg_t>(error_addr())) {
Expand Down Expand Up @@ -1083,14 +1113,14 @@ class StackTraceImpl<system_tag::current_tag> : public StackTraceImplHolder {
return size();
}

size_t load_from(void *addr, size_t depth = 32, void *context = nullptr,
size_t load_from(const void *addr, size_t depth = 32, void *context = nullptr,
void *error_addr = nullptr) {
load_here(depth + 8, context, error_addr);

for (size_t i = 0; i < _stacktrace.size(); ++i) {
if (_stacktrace[i] == addr) {
skip_n_firsts(i);
_stacktrace[i] = (void *)((uintptr_t)_stacktrace[i]);
_stacktrace[i] = reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(_stacktrace[i]));
break;
}
}
Expand Down Expand Up @@ -1821,7 +1851,7 @@ class TraceResolverLinuxImpl<trace_resolver_tag::libdw>
_dwfl_cb.reset(new Dwfl_Callbacks);
_dwfl_cb->find_elf = &dwfl_linux_proc_find_elf;
_dwfl_cb->find_debuginfo = &dwfl_standard_find_debuginfo;
_dwfl_cb->debuginfo_path = 0;
_dwfl_cb->debuginfo_path = nullptr;

_dwfl_handle.reset(dwfl_begin(_dwfl_cb.get()));
_dwfl_handle_initialized = true;
Expand All @@ -1833,7 +1863,7 @@ class TraceResolverLinuxImpl<trace_resolver_tag::libdw>
// ...from the current process.
dwfl_report_begin(_dwfl_handle.get());
int r = dwfl_linux_proc_report(_dwfl_handle.get(), getpid());
dwfl_report_end(_dwfl_handle.get(), NULL, NULL);
dwfl_report_end(_dwfl_handle.get(), nullptr, nullptr);
if (r < 0) {
return trace;
}
Expand All @@ -1850,7 +1880,7 @@ class TraceResolverLinuxImpl<trace_resolver_tag::libdw>
if (mod) {
// now that we found it, lets get the name of it, this will be the
// full path to the running binary or one of the loaded library.
const char *module_name = dwfl_module_info(mod, 0, 0, 0, 0, 0, 0, 0);
const char *module_name = dwfl_module_info(mod, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
if (module_name) {
trace.object_filename = module_name;
}
Expand Down Expand Up @@ -1939,7 +1969,7 @@ class TraceResolverLinuxImpl<trace_resolver_tag::libdw>
Dwarf_Line *srcloc = dwarf_getsrc_die(cudie, trace_addr - mod_bias);

if (srcloc) {
const char *srcfile = dwarf_linesrc(srcloc, 0, 0);
const char *srcfile = dwarf_linesrc(srcloc, nullptr, nullptr);
if (srcfile) {
trace.source.filename = srcfile;
}
Expand Down Expand Up @@ -1971,9 +2001,9 @@ class TraceResolverLinuxImpl<trace_resolver_tag::libdw>
// defined here because in C++98, template function cannot take locally
// defined types... grrr.
struct inliners_search_cb {
void operator()(Dwarf_Die *die) {
void operator()(Dwarf_Die *die) const {
const char *name;
switch (dwarf_tag(die)) {
const char *name;
case DW_TAG_subprogram:
if ((name = dwarf_diename(die))) {
trace.source.function = name;
Expand Down Expand Up @@ -2039,7 +2069,7 @@ class TraceResolverLinuxImpl<trace_resolver_tag::libdw>
static Dwarf_Die *find_fundie_by_pc(Dwarf_Die *parent_die, Dwarf_Addr pc,
Dwarf_Die *result) {
if (dwarf_child(parent_die, result) != 0) {
return 0;
return nullptr;
}

Dwarf_Die *die = result;
Expand Down Expand Up @@ -2067,7 +2097,7 @@ class TraceResolverLinuxImpl<trace_resolver_tag::libdw>
}
}
} while (dwarf_siblingof(die, result) == 0);
return 0;
return nullptr;
}

template <typename CB>
Expand Down Expand Up @@ -2109,23 +2139,23 @@ class TraceResolverLinuxImpl<trace_resolver_tag::libdw>
dwarf_formudata(dwarf_attr(die, DW_AT_call_file, &attr_mem), &file_idx);

if (file_idx == 0) {
return 0;
return nullptr;
}

Dwarf_Die die_mem;
Dwarf_Die *cudie = dwarf_diecu(die, &die_mem, 0, 0);
Dwarf_Die *cudie = dwarf_diecu(die, &die_mem, nullptr, nullptr);
if (!cudie) {
return 0;
return nullptr;
}

Dwarf_Files *files = 0;
Dwarf_Files *files = nullptr;
size_t nfiles;
dwarf_getsrcfiles(cudie, &files, &nfiles);
if (!files) {
return 0;
return nullptr;
}

return dwarf_filesrc(files, file_idx, 0, 0);
return dwarf_filesrc(files, file_idx, nullptr, nullptr);
}
};
#endif // BACKWARD_HAS_DW == 1
Expand Down Expand Up @@ -3777,7 +3807,7 @@ class SourceFile {
// but look, I will reuse it two times!
// What a good boy am I.
struct isspace {
bool operator()(char c) { return std::isspace(c); }
bool operator()(char c) const { return std::isspace(c); }
};

bool started = false;
Expand Down Expand Up @@ -3808,14 +3838,14 @@ class SourceFile {
// there is no find_if_not in C++98, lets do something crappy to
// workaround.
struct not_isspace {
bool operator()(char c) { return !std::isspace(c); }
bool operator()(char c) const { return !std::isspace(c); }
};
// and define this one here because C++98 is not happy with local defined
// struct passed to template functions, fuuuu.
struct not_isempty {
bool operator()(const lines_t::value_type &p) {
return !(std::find_if(p.second.begin(), p.second.end(), not_isspace()) ==
p.second.end());
bool operator()(const lines_t::value_type &p) const {
return std::find_if(p.second.begin(), p.second.end(), not_isspace()) !=
p.second.end();
}
};

Expand Down Expand Up @@ -4105,7 +4135,7 @@ class Printer {
}
}

void print_header(std::ostream &os, size_t thread_id) {
static void print_header(std::ostream &os, size_t thread_id) {
os << "Stack trace (most recent call last)";
if (thread_id) {
os << " in thread " << thread_id;
Expand Down Expand Up @@ -4177,7 +4207,7 @@ class Printer {

void print_source_loc(std::ostream &os, const char *indent,
const ResolvedTrace::SourceLoc &source_loc,
void *addr = nullptr) {
const void *addr = nullptr) const {
os << indent << "Source \"" << source_loc.filename << "\", line "
<< source_loc.line << ", in " << source_loc.function;

Expand Down Expand Up @@ -4221,7 +4251,7 @@ class SignalHandling {
: _loaded(false) {
bool success = true;

const size_t stack_size = 1024 * 1024 * 8;
constexpr size_t stack_size = 1024 * 1024 * 8;
_stack_content.reset(static_cast<char *>(malloc(stack_size)));
if (_stack_content) {
stack_t ss;
Expand Down