maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

DataFormatters: Rename clang_type to compiler_type. 

Reviewers: granata.enrico

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D12930

llvm-svn: 247915
This commit is contained in:
Bruce Mitchener 2015-09-17 18:43:40 +00:00
parent 1b2ba431e0
commit 59b5a37db0
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/DataFormatters/FormatManager.h
View File

@ -290,7 +290,7 @@ private:
static void
GetPossibleMatches (ValueObject& valobj,
CompilerType clang_type,
CompilerType compiler_type,
uint32_t reason,
lldb::DynamicValueType use_dynamic,
FormattersMatchVector& entries,

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

@ -413,7 +413,7 @@ private:
Stream *m_stream;
DumpValueObjectOptions options;
Flags m_type_flags;
CompilerType m_clang_type;
CompilerType m_compiler_type;
DumpValueObjectOptions::PointerDepth m_ptr_depth;
uint32_t m_curr_depth;
LazyBool m_should_print;

30
lldb/source/DataFormatters/FormatManager.cpp
View File

@ -190,7 +190,7 @@ FormatManager::DisableAllCategories ()
void
FormatManager::GetPossibleMatches (ValueObject& valobj,
CompilerType clang_type,
CompilerType compiler_type,
uint32_t reason,
lldb::DynamicValueType use_dynamic,
FormattersMatchVector& entries,
@ -199,8 +199,8 @@ FormatManager::GetPossibleMatches (ValueObject& valobj,
bool did_strip_typedef,
bool root_level)
{
clang_type = ClangASTContext::RemoveFastQualifiers(clang_type);
ConstString type_name(clang_type.GetConstTypeName());
compiler_type = ClangASTContext::RemoveFastQualifiers(compiler_type);
ConstString type_name(compiler_type.GetConstTypeName());
if (valobj.GetBitfieldBitSize() > 0)
{
StreamString sstring;
@ -211,13 +211,13 @@ FormatManager::GetPossibleMatches (ValueObject& valobj,
}
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)
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,
non_ref_type,
reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference,
@ -241,9 +241,9 @@ FormatManager::GetPossibleMatches (ValueObject& valobj,
}
}
if (clang_type.IsPointerType())
if (compiler_type.IsPointerType())
{
CompilerType non_ptr_type = clang_type.GetPointeeType();
CompilerType non_ptr_type = compiler_type.GetPointeeType();
GetPossibleMatches(valobj,
non_ptr_type,
reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference,
@ -282,9 +282,9 @@ FormatManager::GetPossibleMatches (ValueObject& valobj,
}
// 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,
deffed_type,
reason | lldb_private::eFormatterChoiceCriterionNavigatedTypedefs,
@ -298,15 +298,15 @@ FormatManager::GetPossibleMatches (ValueObject& valobj,
if (root_level)
{
do {
if (!clang_type.IsValid())
if (!compiler_type.IsValid())
break;
CompilerType unqual_clang_ast_type = clang_type.GetFullyUnqualifiedType();
if (!unqual_clang_ast_type.IsValid())
CompilerType unqual_compiler_ast_type = compiler_type.GetFullyUnqualifiedType();
if (!unqual_compiler_ast_type.IsValid())
break;
if (unqual_clang_ast_type.GetOpaqueQualType() != clang_type.GetOpaqueQualType())
if (unqual_compiler_ast_type.GetOpaqueQualType() != compiler_type.GetOpaqueQualType())
GetPossibleMatches (valobj,
unqual_clang_ast_type,
unqual_compiler_ast_type,
reason,
use_dynamic,
entries,

8
lldb/source/DataFormatters/TypeFormat.cpp
View File

@ -91,13 +91,13 @@ TypeFormatImpl_Format::FormatObject (ValueObject *valobj,
}
else
{
CompilerType clang_type = value.GetCompilerType ();
if (clang_type)
CompilerType compiler_type = value.GetCompilerType ();
if (compiler_type)
{
// put custom bytes to display in the DataExtractor to override the default value logic
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 we are dumping a pointer as a c-string, get the pointee data as a string
@ -122,7 +122,7 @@ TypeFormatImpl_Format::FormatObject (ValueObject *valobj,
}
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
data, // Data to extract from
0, // Byte offset into "m_data"

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

@ -176,8 +176,8 @@ ValueObjectPrinter::GetMostSpecializedValue ()
}
}
}
m_clang_type = m_valobj->GetCompilerType();
m_type_flags = m_clang_type.GetTypeInfo ();
m_compiler_type = m_valobj->GetCompilerType();
m_type_flags = m_compiler_type.GetTypeInfo ();
return true;
}