replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaner way to work around the lack of delegating constructors on some versions of GCC 

llvm-svn: 192013
This commit is contained in:
Enrico Granata 2013-10-05 00:20:27 +00:00
parent 68a2610520
commit 938d1d67e8
2 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lldb/include/lldb/DataFormatters/ValueObjectPrinter.h
View File

@ -273,6 +273,15 @@ protected:
uint32_t ptr_depth,
uint32_t curr_depth);
// we should actually be using delegating constructors here
// but some versions of GCC still have trouble with those
void
Init (ValueObject* valobj,
Stream* s,
const DumpValueObjectOptions& options,
uint32_t ptr_depth,
uint32_t curr_depth);
bool
GetDynamicValueIfNeeded ();

67
lldb/source/DataFormatters/ValueObjectPrinter.cpp
View File

@ -23,48 +23,45 @@ using namespace lldb_private;
ValueObjectPrinter::ValueObjectPrinter (ValueObject* valobj,
Stream* s,
const DumpValueObjectOptions& options) :
m_orig_valobj(valobj),
m_valobj(nullptr),
m_stream(s),
options(options),
m_ptr_depth(options.m_max_ptr_depth),
m_curr_depth(0),
m_should_print(eLazyBoolCalculate),
m_is_nil(eLazyBoolCalculate),
m_is_ptr(eLazyBoolCalculate),
m_is_ref(eLazyBoolCalculate),
m_is_aggregate(eLazyBoolCalculate),
m_summary_formatter({nullptr,false}),
m_value(),
m_summary(),
m_error()
const DumpValueObjectOptions& options)
{
assert (m_orig_valobj && "cannot print a NULL ValueObject");
assert (m_stream && "cannot print to a NULL Stream");
Init(valobj,s,options,options.m_max_ptr_depth,0);
}
ValueObjectPrinter::ValueObjectPrinter (ValueObject* valobj,
Stream* s,
const DumpValueObjectOptions& options,
uint32_t ptr_depth,
uint32_t curr_depth) :
m_orig_valobj(valobj),
m_valobj(nullptr),
m_stream(s),
options(options),
m_ptr_depth(ptr_depth),
m_curr_depth(curr_depth),
m_should_print(eLazyBoolCalculate),
m_is_nil(eLazyBoolCalculate),
m_is_ptr(eLazyBoolCalculate),
m_is_ref(eLazyBoolCalculate),
m_is_aggregate(eLazyBoolCalculate),
m_summary_formatter({nullptr,false}),
m_value(),
m_summary(),
m_error()
{ }
uint32_t curr_depth)
{
Init(valobj,s,options,ptr_depth,curr_depth);
}
void
ValueObjectPrinter::Init (ValueObject* valobj,
Stream* s,
const DumpValueObjectOptions& options,
uint32_t ptr_depth,
uint32_t curr_depth)
{
m_orig_valobj = valobj;
m_valobj = nullptr;
m_stream = s;
this->options = options;
m_ptr_depth = ptr_depth;
m_curr_depth = curr_depth;
assert (m_orig_valobj && "cannot print a NULL ValueObject");
assert (m_stream && "cannot print to a NULL Stream");
m_should_print = eLazyBoolCalculate;
m_is_nil = eLazyBoolCalculate;
m_is_ptr = eLazyBoolCalculate;
m_is_ref = eLazyBoolCalculate;
m_is_aggregate = eLazyBoolCalculate;
m_summary_formatter = {nullptr,false};
m_value.assign("");
m_summary.assign("");
m_error.assign("");
}
bool
ValueObjectPrinter::PrintValueObject ()