*** This commit represents a complete reformatting of the LLDB source code

*** to conform to clang-format’s LLVM style.  This kind of mass change has
*** two obvious implications:

Firstly, merging this particular commit into a downstream fork may be a huge
effort.  Alternatively, it may be worth merging all changes up to this commit,
performing the same reformatting operation locally, and then discarding the
merge for this particular commit.  The commands used to accomplish this
reformatting were as follows (with current working directory as the root of
the repository):

    find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} +
    find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ;

The version of clang-format used was 3.9.0, and autopep8 was 1.2.4.

Secondly, “blame” style tools will generally point to this commit instead of
a meaningful prior commit.  There are alternatives available that will attempt
to look through this change and find the appropriate prior commit.  YMMV.

llvm-svn: 280751
This commit is contained in:
Kate Stone
2016-09-06 20:57:50 +00:00
parent d5aa733769
commit b9c1b51e45
2780 changed files with 556690 additions and 597060 deletions

View File

@@ -20,167 +20,148 @@ using namespace lldb;
using namespace lldb_private;
using namespace lldb_private::formatters;
namespace
{
namespace {
class JavaArraySyntheticFrontEnd : public SyntheticChildrenFrontEnd
{
class JavaArraySyntheticFrontEnd : public SyntheticChildrenFrontEnd {
public:
JavaArraySyntheticFrontEnd(lldb::ValueObjectSP valobj_sp) :
SyntheticChildrenFrontEnd(*valobj_sp)
{
if (valobj_sp)
Update();
}
JavaArraySyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
: SyntheticChildrenFrontEnd(*valobj_sp) {
if (valobj_sp)
Update();
}
size_t
CalculateNumChildren() override
{
ValueObjectSP valobj = GetDereferencedValueObject();
if (!valobj)
return 0;
size_t CalculateNumChildren() override {
ValueObjectSP valobj = GetDereferencedValueObject();
if (!valobj)
return 0;
CompilerType type = valobj->GetCompilerType();
uint32_t size = JavaASTContext::CalculateArraySize(type, *valobj);
if (size == UINT32_MAX)
return 0;
return size;
}
CompilerType type = valobj->GetCompilerType();
uint32_t size = JavaASTContext::CalculateArraySize(type, *valobj);
if (size == UINT32_MAX)
return 0;
return size;
}
lldb::ValueObjectSP
GetChildAtIndex(size_t idx) override
{
ValueObjectSP valobj = GetDereferencedValueObject();
if (!valobj)
return nullptr;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
ValueObjectSP valobj = GetDereferencedValueObject();
if (!valobj)
return nullptr;
ProcessSP process_sp = valobj->GetProcessSP();
if (!process_sp)
return nullptr;
ProcessSP process_sp = valobj->GetProcessSP();
if (!process_sp)
return nullptr;
CompilerType type = valobj->GetCompilerType();
CompilerType element_type = type.GetArrayElementType();
lldb::addr_t address = valobj->GetAddressOf() + JavaASTContext::CalculateArrayElementOffset(type, idx);
CompilerType type = valobj->GetCompilerType();
CompilerType element_type = type.GetArrayElementType();
lldb::addr_t address =
valobj->GetAddressOf() +
JavaASTContext::CalculateArrayElementOffset(type, idx);
Error error;
size_t byte_size = element_type.GetByteSize(nullptr);
DataBufferSP buffer_sp(new DataBufferHeap(byte_size, 0));
size_t bytes_read = process_sp->ReadMemory(address, buffer_sp->GetBytes(), byte_size, error);
if (error.Fail() || byte_size != bytes_read)
return nullptr;
Error error;
size_t byte_size = element_type.GetByteSize(nullptr);
DataBufferSP buffer_sp(new DataBufferHeap(byte_size, 0));
size_t bytes_read = process_sp->ReadMemory(address, buffer_sp->GetBytes(),
byte_size, error);
if (error.Fail() || byte_size != bytes_read)
return nullptr;
StreamString name;
name.Printf("[%" PRIu64 "]", (uint64_t)idx);
DataExtractor data(buffer_sp, process_sp->GetByteOrder(), process_sp->GetAddressByteSize());
return CreateValueObjectFromData(name.GetData(), data, valobj->GetExecutionContextRef(),
element_type);
}
StreamString name;
name.Printf("[%" PRIu64 "]", (uint64_t)idx);
DataExtractor data(buffer_sp, process_sp->GetByteOrder(),
process_sp->GetAddressByteSize());
return CreateValueObjectFromData(
name.GetData(), data, valobj->GetExecutionContextRef(), element_type);
}
bool
Update() override
{
return false;
}
bool Update() override { return false; }
bool
MightHaveChildren() override
{
return true;
}
bool MightHaveChildren() override { return true; }
size_t
GetIndexOfChildWithName(const ConstString &name) override
{
return ExtractIndexFromString(name.GetCString());
}
size_t GetIndexOfChildWithName(const ConstString &name) override {
return ExtractIndexFromString(name.GetCString());
}
private:
ValueObjectSP
GetDereferencedValueObject()
{
if (!m_backend.IsPointerOrReferenceType())
return m_backend.GetSP();
ValueObjectSP GetDereferencedValueObject() {
if (!m_backend.IsPointerOrReferenceType())
return m_backend.GetSP();
Error error;
return m_backend.Dereference(error);
}
Error error;
return m_backend.Dereference(error);
}
};
} // end of anonymous namespace
bool
lldb_private::formatters::JavaStringSummaryProvider(ValueObject &valobj, Stream &stream, const TypeSummaryOptions &opts)
{
if (valobj.IsPointerOrReferenceType())
{
Error error;
ValueObjectSP deref = valobj.Dereference(error);
if (error.Fail())
return false;
return JavaStringSummaryProvider(*deref, stream, opts);
}
bool lldb_private::formatters::JavaStringSummaryProvider(
ValueObject &valobj, Stream &stream, const TypeSummaryOptions &opts) {
if (valobj.IsPointerOrReferenceType()) {
Error error;
ValueObjectSP deref = valobj.Dereference(error);
if (error.Fail())
return false;
return JavaStringSummaryProvider(*deref, stream, opts);
}
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
return false;
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
return false;
ConstString data_name("value");
ConstString length_name("count");
ConstString data_name("value");
ConstString length_name("count");
ValueObjectSP length_sp = valobj.GetChildMemberWithName(length_name, true);
ValueObjectSP data_sp = valobj.GetChildMemberWithName(data_name, true);
if (!data_sp || !length_sp)
return false;
ValueObjectSP length_sp = valobj.GetChildMemberWithName(length_name, true);
ValueObjectSP data_sp = valobj.GetChildMemberWithName(data_name, true);
if (!data_sp || !length_sp)
return false;
bool success = false;
uint64_t length = length_sp->GetValueAsUnsigned(0, &success);
if (!success)
return false;
bool success = false;
uint64_t length = length_sp->GetValueAsUnsigned(0, &success);
if (!success)
return false;
if (length == 0)
{
stream.Printf("\"\"");
return true;
}
lldb::addr_t valobj_addr = data_sp->GetAddressOf();
StringPrinter::ReadStringAndDumpToStreamOptions options(valobj);
options.SetLocation(valobj_addr);
options.SetProcessSP(process_sp);
options.SetStream(&stream);
options.SetSourceSize(length);
options.SetNeedsZeroTermination(false);
options.SetLanguage(eLanguageTypeJava);
if (StringPrinter::ReadStringAndDumpToStream<StringPrinter::StringElementType::UTF16>(options))
return true;
stream.Printf("Summary Unavailable");
if (length == 0) {
stream.Printf("\"\"");
return true;
}
}
lldb::addr_t valobj_addr = data_sp->GetAddressOf();
bool
lldb_private::formatters::JavaArraySummaryProvider(ValueObject &valobj, Stream &stream, const TypeSummaryOptions &options)
{
if (valobj.IsPointerOrReferenceType())
{
Error error;
ValueObjectSP deref = valobj.Dereference(error);
if (error.Fail())
return false;
return JavaArraySummaryProvider(*deref, stream, options);
}
StringPrinter::ReadStringAndDumpToStreamOptions options(valobj);
options.SetLocation(valobj_addr);
options.SetProcessSP(process_sp);
options.SetStream(&stream);
options.SetSourceSize(length);
options.SetNeedsZeroTermination(false);
options.SetLanguage(eLanguageTypeJava);
CompilerType type = valobj.GetCompilerType();
uint32_t size = JavaASTContext::CalculateArraySize(type, valobj);
if (size == UINT32_MAX)
return false;
stream.Printf("[%u]{...}", size);
if (StringPrinter::ReadStringAndDumpToStream<
StringPrinter::StringElementType::UTF16>(options))
return true;
stream.Printf("Summary Unavailable");
return true;
}
SyntheticChildrenFrontEnd*
lldb_private::formatters::JavaArraySyntheticFrontEndCreator (CXXSyntheticChildren*, lldb::ValueObjectSP valobj_sp)
{
return valobj_sp ? new JavaArraySyntheticFrontEnd(valobj_sp) : nullptr;
bool lldb_private::formatters::JavaArraySummaryProvider(
ValueObject &valobj, Stream &stream, const TypeSummaryOptions &options) {
if (valobj.IsPointerOrReferenceType()) {
Error error;
ValueObjectSP deref = valobj.Dereference(error);
if (error.Fail())
return false;
return JavaArraySummaryProvider(*deref, stream, options);
}
CompilerType type = valobj.GetCompilerType();
uint32_t size = JavaASTContext::CalculateArraySize(type, valobj);
if (size == UINT32_MAX)
return false;
stream.Printf("[%u]{...}", size);
return true;
}
SyntheticChildrenFrontEnd *
lldb_private::formatters::JavaArraySyntheticFrontEndCreator(
CXXSyntheticChildren *, lldb::ValueObjectSP valobj_sp) {
return valobj_sp ? new JavaArraySyntheticFrontEnd(valobj_sp) : nullptr;
}