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

<rdar://problem/12717717> 

Modifying our data formatters matching algorithm to ensure that "const X*" is treated as equivalent to "X*"
Also, a couple improvements to the "lldb types" logging

llvm-svn: 184215
This commit is contained in:
Enrico Granata 2013-06-18 18:23:07 +00:00
parent 0e5d677fc3
commit 68ae4117d9
6 changed files with 98 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lldb/include/lldb/DataFormatters/FormatNavigator.h
View File

@ -28,6 +28,7 @@
#include "lldb/DataFormatters/FormatClasses.h"
#include "lldb/Symbol/ClangASTContext.h"
#include "lldb/Symbol/ClangASTType.h"
#include "lldb/Target/ObjCLanguageRuntime.h"
#include "lldb/Target/Process.h"
@ -648,6 +649,36 @@ protected:
if (Get_Impl (valobj,type,entry,use_dynamic,reason))
return true;
// try going to the unqualified type
do {
if (log)
log->Printf("[Get] trying the unqualified type");
lldb::clang_type_t opaque_type = type.getAsOpaquePtr();
if (!opaque_type)
{
if (log)
log->Printf("[Get] could not get the opaque_type");
break;
}
ClangASTType unqual_clang_ast_type = ClangASTType::GetFullyUnqualifiedType(valobj.GetClangAST(),opaque_type);
if (!unqual_clang_ast_type.IsValid())
{
if (log)
log->Printf("[Get] could not get the unqual_clang_ast_type");
break;
}
clang::QualType unqualified_qual_type = clang::QualType::getFromOpaquePtr(unqual_clang_ast_type.GetOpaqueQualType());
if (unqualified_qual_type.getTypePtrOrNull() != type.getTypePtrOrNull())
{
if (log)
log->Printf("[Get] unqualified type is there and is not the same, let's try");
if (Get_Impl (valobj,unqualified_qual_type,entry,use_dynamic,reason))
return true;
}
else if (log)
log->Printf("[Get] unqualified type same as original type");
} while(false);
// if all else fails, go to static type
if (valobj.IsDynamic())
{

8
lldb/include/lldb/Symbol/ClangASTType.h
View File

@ -151,7 +151,13 @@ public:
{
return GetTypeClass (GetASTContext(), GetOpaqueQualType());
}
ClangASTType
GetFullyUnqualifiedType ();
static ClangASTType
GetFullyUnqualifiedType (clang::ASTContext *ast_context, lldb::clang_type_t clang_type);
void
DumpValue (ExecutionContext *exe_ctx,
Stream *s,

20
lldb/source/Core/Debugger.cpp
View File

@ -1204,13 +1204,13 @@ ScanFormatDescriptor (const char* var_name_begin,
*var_name_final = *percent_position;
std::string format_name(*var_name_final+1, var_name_end-*var_name_final-1);
if (log)
log->Printf("ScanFormatDescriptor] parsing %s as a format descriptor", format_name.c_str());
log->Printf("[ScanFormatDescriptor] parsing %s as a format descriptor", format_name.c_str());
if ( !FormatManager::GetFormatFromCString(format_name.c_str(),
true,
*custom_format) )
{
if (log)
log->Printf("ScanFormatDescriptor] %s is an unknown format", format_name.c_str());
log->Printf("[ScanFormatDescriptor] %s is an unknown format", format_name.c_str());
switch (format_name.front())
{
@ -1242,12 +1242,12 @@ ScanFormatDescriptor (const char* var_name_begin,
else
{
if (log)
log->Printf("ScanFormatDescriptor] will display value for this VO");
log->Printf("[ScanFormatDescriptor] will display value for this VO");
*val_obj_display = ValueObject::eValueObjectRepresentationStyleValue;
}
}
if (log)
log->Printf("ScanFormatDescriptor] final format description outcome: custom_format = %d, val_obj_display = %d",
log->Printf("[ScanFormatDescriptor] final format description outcome: custom_format = %d, val_obj_display = %d",
*custom_format,
*val_obj_display);
return true;
@ -1469,11 +1469,10 @@ FormatPromptRecurse
{
do_deref_pointer = true;
var_name_begin++;
if (log)
log->Printf("[Debugger::FormatPrompt] found a deref, new string is: %s",var_name_begin);
}
if (log)
log->Printf("[Debugger::FormatPrompt] initial string: %s",var_name_begin);
if (*var_name_begin == 's')
{
if (!valobj->IsSynthetic())
@ -1481,17 +1480,16 @@ FormatPromptRecurse
if (!valobj)
break;
var_name_begin++;
if (log)
log->Printf("[Debugger::FormatPrompt] found a synthetic, new string is: %s",var_name_begin);
}
if (log)
log->Printf("[Debugger::FormatPrompt] initial string: %s",var_name_begin);
// should be a 'v' by now
if (*var_name_begin != 'v')
break;
if (log)
log->Printf("[Debugger::FormatPrompt] initial string: %s",var_name_begin);
log->Printf("[Debugger::FormatPrompt] string I am working with: %s",var_name_begin);
ValueObject::ExpressionPathAftermath what_next = (do_deref_pointer ?
ValueObject::eExpressionPathAftermathDereference : ValueObject::eExpressionPathAftermathNothing);

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

@ -346,9 +346,18 @@ FormatManager::GetSummaryFormat (ValueObject& valobj,
if (valobj_type)
{
if (log)
log->Printf("[FormatManager::GetSummaryFormat] Looking into cache for type %s", valobj_type.AsCString("<invalid>"));
log->Printf("\n\n[FormatManager::GetSummaryFormat] Looking into cache for type %s", valobj_type.AsCString("<invalid>"));
if (m_format_cache.GetSummary(valobj_type,retval))
{
if (log)
{
log->Printf("[FormatManager::GetSummaryFormat] Cache search success. Returning.");
#ifdef LLDB_CONFIGURATION_DEBUG
log->Printf("[FormatManager::GetSummaryFormat] Cache hits: %llu - Cache Misses: %llu", m_format_cache.GetCacheHits(), m_format_cache.GetCacheMisses());
#endif
}
return retval;
}
if (log)
log->Printf("[FormatManager::GetSummaryFormat] Cache search failed. Going normal route");
}
@ -381,11 +390,20 @@ FormatManager::GetSyntheticChildren (ValueObject& valobj,
if (valobj_type)
{
if (log)
log->Printf("[FormatManager::GetSyntheticChildren] Looking into cache for type %s\n", valobj_type.AsCString("<invalid>"));
log->Printf("\n\n[FormatManager::GetSyntheticChildren] Looking into cache for type %s", valobj_type.AsCString("<invalid>"));
if (m_format_cache.GetSynthetic(valobj_type,retval))
{
if (log)
{
log->Printf("[FormatManager::GetSyntheticChildren] Cache search success. Returning.");
#ifdef LLDB_CONFIGURATION_DEBUG
log->Printf("[FormatManager::GetSyntheticChildren] Cache hits: %llu - Cache Misses: %llu", m_format_cache.GetCacheHits(), m_format_cache.GetCacheMisses());
#endif
}
return retval;
}
if (log)
log->Printf("[FormatManager::GetSyntheticChildren] Cache search failed. Going normal route\n");
log->Printf("[FormatManager::GetSyntheticChildren] Cache search failed. Going normal route");
}
#endif
retval = m_categories_map.GetSyntheticChildren(valobj, use_dynamic);
@ -393,7 +411,7 @@ FormatManager::GetSyntheticChildren (ValueObject& valobj,
if (valobj_type)
{
if (log)
log->Printf("[FormatManager::GetSyntheticChildren] Caching %p for type %s\n",retval.get(),valobj_type.AsCString("<invalid>"));
log->Printf("[FormatManager::GetSyntheticChildren] Caching %p for type %s",retval.get(),valobj_type.AsCString("<invalid>"));
m_format_cache.SetSynthetic(valobj_type,retval);
}
#ifdef LLDB_CONFIGURATION_DEBUG
@ -690,9 +708,7 @@ FormatManager::LoadSystemFormatters()
TypeCategoryImpl::SharedPointer sys_category_sp = GetCategory(m_system_category_name);
sys_category_sp->GetSummaryNavigator()->Add(ConstString("char *"), string_format);
sys_category_sp->GetSummaryNavigator()->Add(ConstString("const char *"), string_format);
sys_category_sp->GetSummaryNavigator()->Add(ConstString("unsigned char *"), string_format);
sys_category_sp->GetSummaryNavigator()->Add(ConstString("const unsigned char *"), string_format);
sys_category_sp->GetRegexSummaryNavigator()->Add(any_size_char_arr, string_array_format);
lldb::TypeSummaryImplSP ostype_summary(new StringSummaryFormat(TypeSummaryImpl::Flags().SetCascades(false)
@ -709,16 +725,12 @@ FormatManager::LoadSystemFormatters()
#ifndef LLDB_DISABLE_PYTHON
// FIXME because of a bug in the FormatNavigator we need to add a summary for both X* and const X* (<rdar://problem/12717717>)
AddCXXSummary(sys_category_sp, lldb_private::formatters::Char16StringSummaryProvider, "char16_t * summary provider", ConstString("char16_t *"), string_flags);
AddCXXSummary(sys_category_sp, lldb_private::formatters::Char16StringSummaryProvider, "char16_t * summary provider", ConstString("const char16_t *"), string_flags);
AddCXXSummary(sys_category_sp, lldb_private::formatters::Char32StringSummaryProvider, "char32_t * summary provider", ConstString("char32_t *"), string_flags);
AddCXXSummary(sys_category_sp, lldb_private::formatters::Char32StringSummaryProvider, "char32_t * summary provider", ConstString("const char32_t *"), string_flags);
AddCXXSummary(sys_category_sp, lldb_private::formatters::WCharStringSummaryProvider, "wchar_t * summary provider", ConstString("wchar_t *"), string_flags);
AddCXXSummary(sys_category_sp, lldb_private::formatters::WCharStringSummaryProvider, "wchar_t * summary provider", ConstString("const wchar_t *"), string_flags);
AddCXXSummary(sys_category_sp, lldb_private::formatters::Char16StringSummaryProvider, "unichar * summary provider", ConstString("unichar *"), string_flags);
AddCXXSummary(sys_category_sp, lldb_private::formatters::Char16StringSummaryProvider, "unichar * summary provider", ConstString("const unichar *"), string_flags);
TypeSummaryImpl::Flags widechar_flags;
widechar_flags.SetDontShowValue(true)

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

@ -192,13 +192,13 @@ TypeCategoryMap::GetSummaryFormat (ValueObject& valobj,
lldb::TypeCategoryImplSP category_sp = *begin;
lldb::TypeSummaryImplSP current_format;
if (log)
log->Printf("[CategoryMap::GetSummaryFormat] Trying to use category %s\n", category_sp->GetName());
log->Printf("\n[CategoryMap::GetSummaryFormat] Trying to use category %s", category_sp->GetName());
if (!category_sp->Get(valobj, current_format, use_dynamic, &reason_why))
continue;
return current_format;
}
if (log)
log->Printf("[CategoryMap::GetSummaryFormat] nothing found - returning empty SP\n");
log->Printf("[CategoryMap::GetSummaryFormat] nothing found - returning empty SP");
return lldb::TypeSummaryImplSP();
}
@ -220,13 +220,13 @@ TypeCategoryMap::GetSyntheticChildren (ValueObject& valobj,
lldb::TypeCategoryImplSP category_sp = *begin;
lldb::SyntheticChildrenSP current_format;
if (log)
log->Printf("[CategoryMap::GetSyntheticChildren] Trying to use category %s\n", category_sp->GetName());
log->Printf("\n[CategoryMap::GetSyntheticChildren] Trying to use category %s", category_sp->GetName());
if (!category_sp->Get(valobj, current_format, use_dynamic, &reason_why))
continue;
return current_format;
}
if (log)
log->Printf("[CategoryMap::GetSyntheticChildren] nothing found - returning empty SP\n");
log->Printf("[CategoryMap::GetSyntheticChildren] nothing found - returning empty SP");
return lldb::SyntheticChildrenSP();
}
#endif

25
lldb/source/Symbol/ClangASTType.cpp
View File

@ -195,6 +195,31 @@ ClangASTType::GetPointerType (clang::ASTContext *ast_context,
return NULL;
}
ClangASTType
ClangASTType::GetFullyUnqualifiedType ()
{
return GetFullyUnqualifiedType(m_ast, m_type);
}
static clang::QualType GetFullyUnqualifiedType_Impl (clang::QualType Ty,
clang::ASTContext * ctx)
{
if (Ty->isPointerType())
Ty = ctx->getPointerType(GetFullyUnqualifiedType_Impl(Ty->getPointeeType(),ctx));
else
Ty = Ty.getUnqualifiedType();
Ty.removeLocalConst();
Ty.removeLocalRestrict();
Ty.removeLocalVolatile();
return Ty;
}
ClangASTType
ClangASTType::GetFullyUnqualifiedType (clang::ASTContext *ast_context, lldb::clang_type_t clang_type)
{
return ClangASTType(ast_context,GetFullyUnqualifiedType_Impl(clang::QualType::getFromOpaquePtr(clang_type),ast_context).getAsOpaquePtr());
}
lldb::Encoding
ClangASTType::GetEncoding (uint64_t &count)
{