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

Change DataExtractor::Dump() to use a series of if..else if 

statements instead of a switch for the size of the floating
point types; some architectures sizeof double and sizeof long
double are the same and that's invalid in a switch.

Fix the LLDB_DISABLE_PYTHON ifdef block in FormatManager::LoadObjCFormatters
so it builds on arm again.

llvm-svn: 167263
This commit is contained in:
Jason Molenda 2012-11-01 23:35:19 +00:00
parent 2508b9b8d3
commit cc57a38325
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lldb/source/Core/DataExtractor.cpp
View File

@ -1710,23 +1710,25 @@ DataExtractor::Dump (Stream *s,
case eFormatFloat:
{
std::ostringstream ss;
switch (item_byte_size)
if (item_byte_size == sizeof(float))
{
default:
s->Printf("error: unsupported byte size (%u) for float format", item_byte_size);
return offset;
case sizeof(float):
ss.precision(std::numeric_limits<float>::digits10);
ss << GetFloat(&offset);
break;
case sizeof(double):
}
else if (item_byte_size == sizeof(double))
{
ss.precision(std::numeric_limits<double>::digits10);
ss << GetDouble(&offset);
break;
case sizeof(long double):
}
else if (item_byte_size == sizeof(long double))
{
ss.precision(std::numeric_limits<long double>::digits10);
ss << GetLongDouble(&offset);
break;
}
else
{
s->Printf("error: unsupported byte size (%u) for float format", item_byte_size);
return offset;
}
ss.flush();
s->Printf("%s", ss.str().c_str());

3
lldb/source/Core/FormatManager.cpp
View File

@ -955,7 +955,7 @@ FormatManager::LoadObjCFormatters()
objc_category_sp->GetSummaryNavigator()->Add(ConstString("BOOL *"),
ObjC_BOOL_summary);
#ifndef LLDB_DISABLE_PYTHON
// we need to skip pointers here since we are special casing a SEL* when retrieving its value
objc_flags.SetSkipPointers(true);
AddCXXSummary(objc_category_sp, lldb_private::formatters::ObjCSELSummaryProvider<false>, "SEL summary", ConstString("SEL"), objc_flags);
@ -963,7 +963,6 @@ FormatManager::LoadObjCFormatters()
AddCXXSummary(objc_category_sp, lldb_private::formatters::ObjCSELSummaryProvider<false>, "SEL summary", ConstString("objc_selector"), objc_flags);
AddCXXSummary(objc_category_sp, lldb_private::formatters::ObjCSELSummaryProvider<true>, "SEL summary", ConstString("objc_selector *"), objc_flags);
#ifndef LLDB_DISABLE_PYTHON
AddScriptSummary(objc_category_sp, "lldb.formatters.objc.Class.Class_Summary", ConstString("Class"), objc_flags);
#endif // LLDB_DISABLE_PYTHON