This is an archive of the discontinued LLVM Phabricator instance.

Differential D12930

DataFormatters: Rename clang_type to compiler_type.
ClosedPublic

Authored by brucem on Sep 17 2015, 3:07 AM.

Details

Reviewers
granata.enrico
Commits
rG59b5a37db08c: DataFormatters: Rename clang_type to compiler_type.
rLLDB247915: DataFormatters: Rename clang_type to compiler_type.
rL247915: DataFormatters: Rename clang_type to compiler_type.

Diff Detail

Event Timeline

brucem updated this revision to Diff 34975.Sep 17 2015, 3:07 AM
brucem retitled this revision from to DataFormatters: Rename clang_type to compiler_type..
brucem updated this object.
brucem added a reviewer: granata.enrico.
brucem added a subscriber: lldb-commits.
granata.enrico accepted this revision.Sep 17 2015, 10:25 AM
granata.enrico edited edge metadata.

Fine by me

This revision is now accepted and ready to land.Sep 17 2015, 10:25 AM
Closed by commit rL247915: DataFormatters: Rename clang_type to compiler_type. (authored by brucem). · Explain WhySep 17 2015, 11:45 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
include/
lldb/
DataFormatters/
2 lines
2 lines
source/
DataFormatters/
30 lines
8 lines
4 lines

Diff 34975

include/lldb/DataFormatters/FormatManager.h

Show First 20 Lines • Show All 284 Lines • ▼ Show 20 Lines
private: private:
static std::vector<lldb::LanguageType> static std::vector<lldb::LanguageType>
GetCandidateLanguages (ValueObject& valobj); GetCandidateLanguages (ValueObject& valobj);
static void static void
GetPossibleMatches (ValueObject& valobj, GetPossibleMatches (ValueObject& valobj,
CompilerType clang_type, CompilerType compiler_type,
uint32_t reason, uint32_t reason,
lldb::DynamicValueType use_dynamic, lldb::DynamicValueType use_dynamic,
FormattersMatchVector& entries, FormattersMatchVector& entries,
bool did_strip_ptr, bool did_strip_ptr,
bool did_strip_ref, bool did_strip_ref,
bool did_strip_typedef, bool did_strip_typedef,
bool root_level = false); bool root_level = false);
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines

include/lldb/DataFormatters/ValueObjectPrinter.h

Show First 20 Lines • Show All 407 Lines • ▼ Show 20 Lines
private: private:
ValueObject *m_orig_valobj; ValueObject *m_orig_valobj;
ValueObject *m_valobj; ValueObject *m_valobj;
Stream *m_stream; Stream *m_stream;
DumpValueObjectOptions options; DumpValueObjectOptions options;
Flags m_type_flags; Flags m_type_flags;
CompilerType m_clang_type; CompilerType m_compiler_type;
DumpValueObjectOptions::PointerDepth m_ptr_depth; DumpValueObjectOptions::PointerDepth m_ptr_depth;
uint32_t m_curr_depth; uint32_t m_curr_depth;
LazyBool m_should_print; LazyBool m_should_print;
LazyBool m_is_nil; LazyBool m_is_nil;
LazyBool m_is_ptr; LazyBool m_is_ptr;
LazyBool m_is_ref; LazyBool m_is_ref;
LazyBool m_is_aggregate; LazyBool m_is_aggregate;
std::pair<TypeSummaryImpl*,bool> m_summary_formatter; std::pair<TypeSummaryImpl*,bool> m_summary_formatter;
Show All 13 Lines

source/DataFormatters/FormatManager.cpp

Show First 20 Lines • Show All 184 Lines • ▼ Show 20 LinesFormatManager::DisableAllCategories ()
{ {
if (iter.second) if (iter.second)
iter.second->Disable(); iter.second->Disable();
} }
} }
void void
FormatManager::GetPossibleMatches (ValueObject& valobj, FormatManager::GetPossibleMatches (ValueObject& valobj,
CompilerType clang_type, CompilerType compiler_type,
uint32_t reason, uint32_t reason,
lldb::DynamicValueType use_dynamic, lldb::DynamicValueType use_dynamic,
FormattersMatchVector& entries, FormattersMatchVector& entries,
bool did_strip_ptr, bool did_strip_ptr,
bool did_strip_ref, bool did_strip_ref,
bool did_strip_typedef, bool did_strip_typedef,
bool root_level) bool root_level)
{ {
clang_type = ClangASTContext::RemoveFastQualifiers(clang_type); compiler_type = ClangASTContext::RemoveFastQualifiers(compiler_type);
ConstString type_name(clang_type.GetConstTypeName()); ConstString type_name(compiler_type.GetConstTypeName());
if (valobj.GetBitfieldBitSize() > 0) if (valobj.GetBitfieldBitSize() > 0)
{ {
StreamString sstring; StreamString sstring;
sstring.Printf("%s:%d",type_name.AsCString(),valobj.GetBitfieldBitSize()); sstring.Printf("%s:%d",type_name.AsCString(),valobj.GetBitfieldBitSize());
ConstString bitfieldname = ConstString(sstring.GetData()); ConstString bitfieldname = ConstString(sstring.GetData());
entries.push_back({bitfieldname,0,did_strip_ptr,did_strip_ref,did_strip_typedef}); entries.push_back({bitfieldname,0,did_strip_ptr,did_strip_ref,did_strip_typedef});
reason |= lldb_private::eFormatterChoiceCriterionStrippedBitField; reason |= lldb_private::eFormatterChoiceCriterionStrippedBitField;
} }
entries.push_back({type_name,reason,did_strip_ptr,did_strip_ref,did_strip_typedef}); entries.push_back({type_name,reason,did_strip_ptr,did_strip_ref,did_strip_typedef});
ConstString display_type_name(clang_type.GetDisplayTypeName()); ConstString display_type_name(compiler_type.GetDisplayTypeName());
if (display_type_name != type_name) if (display_type_name != type_name)
entries.push_back({display_type_name,reason,did_strip_ptr,did_strip_ref,did_strip_typedef}); entries.push_back({display_type_name,reason,did_strip_ptr,did_strip_ref,did_strip_typedef});
for (bool is_rvalue_ref = true, j = true; j && clang_type.IsReferenceType(nullptr, &is_rvalue_ref); j = false) for (bool is_rvalue_ref = true, j = true; j && compiler_type.IsReferenceType(nullptr, &is_rvalue_ref); j = false)
{ {
CompilerType non_ref_type = clang_type.GetNonReferenceType(); CompilerType non_ref_type = compiler_type.GetNonReferenceType();
GetPossibleMatches(valobj, GetPossibleMatches(valobj,
non_ref_type, non_ref_type,
reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference, reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference,
use_dynamic, use_dynamic,
entries, entries,
did_strip_ptr, did_strip_ptr,
true, true,
did_strip_typedef); did_strip_typedef);
if (non_ref_type.IsTypedefType()) if (non_ref_type.IsTypedefType())
{ {
CompilerType deffed_referenced_type = non_ref_type.GetTypedefedType(); CompilerType deffed_referenced_type = non_ref_type.GetTypedefedType();
deffed_referenced_type = is_rvalue_ref ? ClangASTContext::GetRValueReferenceType(deffed_referenced_type) : ClangASTContext::GetLValueReferenceType(deffed_referenced_type); deffed_referenced_type = is_rvalue_ref ? ClangASTContext::GetRValueReferenceType(deffed_referenced_type) : ClangASTContext::GetLValueReferenceType(deffed_referenced_type);
GetPossibleMatches(valobj, GetPossibleMatches(valobj,
deffed_referenced_type, deffed_referenced_type,
reason | lldb_private::eFormatterChoiceCriterionNavigatedTypedefs, reason | lldb_private::eFormatterChoiceCriterionNavigatedTypedefs,
use_dynamic, use_dynamic,
entries, entries,
did_strip_ptr, did_strip_ptr,
did_strip_ref, did_strip_ref,
true); // this is not exactly the usual meaning of stripping typedefs true); // this is not exactly the usual meaning of stripping typedefs
} }
} }
if (clang_type.IsPointerType()) if (compiler_type.IsPointerType())
{ {
CompilerType non_ptr_type = clang_type.GetPointeeType(); CompilerType non_ptr_type = compiler_type.GetPointeeType();
GetPossibleMatches(valobj, GetPossibleMatches(valobj,
non_ptr_type, non_ptr_type,
reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference, reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference,
use_dynamic, use_dynamic,
entries, entries,
true, true,
did_strip_ref, did_strip_ref,
did_strip_typedef); did_strip_typedef);
Show All 22 Lines for (lldb::LanguageType language_type : GetCandidateLanguages(valobj))
did_strip_ptr, did_strip_ptr,
did_strip_ref, did_strip_ref,
did_strip_typedef}); did_strip_typedef});
} }
} }
} }
// try to strip typedef chains // try to strip typedef chains
if (clang_type.IsTypedefType()) if (compiler_type.IsTypedefType())
{ {
CompilerType deffed_type = clang_type.GetTypedefedType(); CompilerType deffed_type = compiler_type.GetTypedefedType();
GetPossibleMatches(valobj, GetPossibleMatches(valobj,
deffed_type, deffed_type,
reason | lldb_private::eFormatterChoiceCriterionNavigatedTypedefs, reason | lldb_private::eFormatterChoiceCriterionNavigatedTypedefs,
use_dynamic, use_dynamic,
entries, entries,
did_strip_ptr, did_strip_ptr,
did_strip_ref, did_strip_ref,
true); true);
} }
if (root_level) if (root_level)
{ {
do { do {
if (!clang_type.IsValid()) if (!compiler_type.IsValid())
break; break;
CompilerType unqual_clang_ast_type = clang_type.GetFullyUnqualifiedType(); CompilerType unqual_compiler_ast_type = compiler_type.GetFullyUnqualifiedType();
if (!unqual_clang_ast_type.IsValid()) if (!unqual_compiler_ast_type.IsValid())
break; break;
if (unqual_clang_ast_type.GetOpaqueQualType() != clang_type.GetOpaqueQualType()) if (unqual_compiler_ast_type.GetOpaqueQualType() != compiler_type.GetOpaqueQualType())
GetPossibleMatches (valobj, GetPossibleMatches (valobj,
unqual_clang_ast_type, unqual_compiler_ast_type,
reason, reason,
use_dynamic, use_dynamic,
entries, entries,
did_strip_ptr, did_strip_ptr,
did_strip_ref, did_strip_ref,
did_strip_typedef); did_strip_typedef);
} while(false); } while(false);
▲ Show 20 Lines • Show All 853 Lines • Show Last 20 Lines

source/DataFormatters/TypeFormat.cpp

Show First 20 Lines • Show All 85 Lines • ▼ Show 20 Lines if (valobj->CanProvideValue())
0, 0,
0, 0,
exe_ctx.GetBestExecutionContextScope()); exe_ctx.GetBestExecutionContextScope());
dest.swap(reg_sstr.GetString()); dest.swap(reg_sstr.GetString());
} }
} }
else else
{ {
CompilerType clang_type = value.GetCompilerType (); CompilerType compiler_type = value.GetCompilerType ();
if (clang_type) if (compiler_type)
{ {
// put custom bytes to display in the DataExtractor to override the default value logic // put custom bytes to display in the DataExtractor to override the default value logic
if (GetFormat() == eFormatCString) if (GetFormat() == eFormatCString)
{ {
lldb_private::Flags type_flags(clang_type.GetTypeInfo(NULL)); // disambiguate w.r.t. TypeFormatImpl::Flags lldb_private::Flags type_flags(compiler_type.GetTypeInfo(NULL)); // disambiguate w.r.t. TypeFormatImpl::Flags
if (type_flags.Test(eTypeIsPointer) && !type_flags.Test(eTypeIsObjC)) if (type_flags.Test(eTypeIsPointer) && !type_flags.Test(eTypeIsObjC))
{ {
// if we are dumping a pointer as a c-string, get the pointee data as a string // if we are dumping a pointer as a c-string, get the pointee data as a string
TargetSP target_sp(valobj->GetTargetSP()); TargetSP target_sp(valobj->GetTargetSP());
if (target_sp) if (target_sp)
{ {
size_t max_len = target_sp->GetMaximumSizeOfStringSummary(); size_t max_len = target_sp->GetMaximumSizeOfStringSummary();
Error error; Error error;
DataBufferSP buffer_sp(new DataBufferHeap(max_len+1,0)); DataBufferSP buffer_sp(new DataBufferHeap(max_len+1,0));
Address address(valobj->GetPointerValue()); Address address(valobj->GetPointerValue());
if (target_sp->ReadCStringFromMemory(address, (char*)buffer_sp->GetBytes(), max_len, error) && error.Success()) if (target_sp->ReadCStringFromMemory(address, (char*)buffer_sp->GetBytes(), max_len, error) && error.Success())
data.SetData(buffer_sp); data.SetData(buffer_sp);
} }
} }
} }
else else
{ {
Error error; Error error;
valobj->GetData(data, error); valobj->GetData(data, error);
if (error.Fail()) if (error.Fail())
return false; return false;
} }
StreamString sstr; StreamString sstr;
clang_type.DumpTypeValue (&sstr, // The stream to use for display compiler_type.DumpTypeValue (&sstr, // The stream to use for display
GetFormat(), // Format to display this type with GetFormat(), // Format to display this type with
data, // Data to extract from data, // Data to extract from
0, // Byte offset into "m_data" 0, // Byte offset into "m_data"
valobj->GetByteSize(), // Byte size of item in "m_data" valobj->GetByteSize(), // Byte size of item in "m_data"
valobj->GetBitfieldBitSize(), // Bitfield bit size valobj->GetBitfieldBitSize(), // Bitfield bit size
valobj->GetBitfieldBitOffset(), // Bitfield bit offset valobj->GetBitfieldBitOffset(), // Bitfield bit offset
exe_ctx.GetBestExecutionContextScope()); exe_ctx.GetBestExecutionContextScope());
// Given that we do not want to set the ValueObject's m_error // Given that we do not want to set the ValueObject's m_error
▲ Show 20 Lines • Show All 120 Lines • Show Last 20 Lines

source/DataFormatters/ValueObjectPrinter.cpp

Show First 20 Lines • Show All 170 Lines • ▼ Show 20 Lines else
if (options.m_use_synthetic == true) if (options.m_use_synthetic == true)
{ {
ValueObject *synthetic = m_valobj->GetSyntheticValue().get(); ValueObject *synthetic = m_valobj->GetSyntheticValue().get();
if (synthetic) if (synthetic)
m_valobj = synthetic; m_valobj = synthetic;
} }
} }
} }
m_clang_type = m_valobj->GetCompilerType(); m_compiler_type = m_valobj->GetCompilerType();
m_type_flags = m_clang_type.GetTypeInfo (); m_type_flags = m_compiler_type.GetTypeInfo ();
return true; return true;
} }
const char* const char*
ValueObjectPrinter::GetDescriptionForDisplay () ValueObjectPrinter::GetDescriptionForDisplay ()
{ {
const char* str = m_valobj->GetObjectDescription(); const char* str = m_valobj->GetObjectDescription();
if (!str) if (!str)
▲ Show 20 Lines • Show All 586 Lines • Show Last 20 Lines