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

Add LLDB_DISABLE_PYTHON around newly added methods in 

DataVisualization.h / DataVisualization.cpp / ValueObject.cpp
and
FormatManager.h / FormatManager.cpp

llvm-svn: 156886
This commit is contained in:
Jason Molenda 2012-05-16 00:38:08 +00:00
parent 29412d1c5c
commit 7a9a72b423
5 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/include/lldb/Core/DataVisualization.h
View File

@ -74,18 +74,24 @@ public:
static lldb::TypeSummaryImplSP
GetSummaryForType (lldb::TypeNameSpecifierImplSP type_sp);
#ifndef LLDB_DISABLE_PYTHON
static lldb::SyntheticChildrenSP
GetSyntheticChildrenForType (lldb::TypeNameSpecifierImplSP type_sp);
#endif
static lldb::TypeFilterImplSP
GetFilterForType (lldb::TypeNameSpecifierImplSP type_sp);
#ifndef LLDB_DISABLE_PYTHON
static lldb::TypeSyntheticImplSP
GetSyntheticForType (lldb::TypeNameSpecifierImplSP type_sp);
#endif
#ifndef LLDB_DISABLE_PYTHON
static lldb::SyntheticChildrenSP
GetSyntheticChildren(ValueObject& valobj,
lldb::DynamicValueType use_dynamic);
#endif
static bool
AnyMatches(ConstString type_name,

10
lldb/include/lldb/Core/FormatManager.h
View File

@ -131,6 +131,7 @@ public:
return retval;
}
#ifndef LLDB_DISABLE_PYTHON
SynthNavigator::MapValueType
GetSyntheticForType (lldb::TypeNameSpecifierImplSP type_sp)
{
@ -146,6 +147,7 @@ public:
return retval;
}
#endif
lldb::TypeNameSpecifierImplSP
GetTypeNameSpecifierForSummaryAtIndex (uint32_t index)
@ -503,9 +505,11 @@ public:
GetSummaryFormat (ValueObject& valobj,
lldb::DynamicValueType use_dynamic);
#ifndef LLDB_DISABLE_PYTHON
lldb::SyntheticChildrenSP
GetSyntheticChildren (ValueObject& valobj,
lldb::DynamicValueType use_dynamic);
#endif
private:
@ -655,18 +659,24 @@ public:
lldb::TypeFilterImplSP
GetFilterForType (lldb::TypeNameSpecifierImplSP type_sp);
#ifndef LLDB_DISABLE_PYTHON
lldb::TypeSyntheticImplSP
GetSyntheticForType (lldb::TypeNameSpecifierImplSP type_sp);
#endif
#ifndef LLDB_DISABLE_PYTHON
lldb::SyntheticChildrenSP
GetSyntheticChildrenForType (lldb::TypeNameSpecifierImplSP type_sp);
#endif
#ifndef LLDB_DISABLE_PYTHON
lldb::SyntheticChildrenSP
GetSyntheticChildren (ValueObject& valobj,
lldb::DynamicValueType use_dynamic)
{
return m_categories_map.GetSyntheticChildren(valobj, use_dynamic);
}
#endif
bool
AnyMatches (ConstString type_name,

6
lldb/source/Core/DataVisualization.cpp
View File

@ -109,18 +109,22 @@ DataVisualization::GetSummaryForType (lldb::TypeNameSpecifierImplSP type_sp)
return GetFormatManager().GetSummaryForType(type_sp);
}
#ifndef LLDB_DISABLE_PYTHON
lldb::SyntheticChildrenSP
DataVisualization::GetSyntheticChildren (ValueObject& valobj,
lldb::DynamicValueType use_dynamic)
{
return GetFormatManager().GetSyntheticChildren(valobj, use_dynamic);
}
#endif
#ifndef LLDB_DISABLE_PYTHON
lldb::SyntheticChildrenSP
DataVisualization::GetSyntheticChildrenForType (lldb::TypeNameSpecifierImplSP type_sp)
{
return GetFormatManager().GetSyntheticChildrenForType(type_sp);
}
#endif
lldb::TypeFilterImplSP
DataVisualization::GetFilterForType (lldb::TypeNameSpecifierImplSP type_sp)
@ -128,11 +132,13 @@ DataVisualization::GetFilterForType (lldb::TypeNameSpecifierImplSP type_sp)
return GetFormatManager().GetFilterForType(type_sp);
}
#ifndef LLDB_DISABLE_PYTHON
lldb::TypeSyntheticImplSP
DataVisualization::GetSyntheticForType (lldb::TypeNameSpecifierImplSP type_sp)
{
return GetFormatManager().GetSyntheticForType(type_sp);
}
#endif
bool
DataVisualization::AnyMatches (ConstString type_name,

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

@ -497,6 +497,7 @@ FormatManager::GetFilterForType (lldb::TypeNameSpecifierImplSP type_sp)
return filter_chosen_sp;
}
#ifndef LLDB_DISABLE_PYTHON
lldb::TypeSyntheticImplSP
FormatManager::GetSyntheticForType (lldb::TypeNameSpecifierImplSP type_sp)
{
@ -522,7 +523,9 @@ FormatManager::GetSyntheticForType (lldb::TypeNameSpecifierImplSP type_sp)
}
return synth_chosen_sp;
}
#endif
#ifndef LLDB_DISABLE_PYTHON
lldb::SyntheticChildrenSP
FormatManager::GetSyntheticChildrenForType (lldb::TypeNameSpecifierImplSP type_sp)
{
@ -535,7 +538,9 @@ FormatManager::GetSyntheticChildrenForType (lldb::TypeNameSpecifierImplSP type_s
else
return lldb::SyntheticChildrenSP(synth_sp.get());
}
#endif
#ifndef LLDB_DISABLE_PYTHON
lldb::SyntheticChildrenSP
CategoryMap::GetSyntheticChildren (ValueObject& valobj,
lldb::DynamicValueType use_dynamic)
@ -556,6 +561,7 @@ CategoryMap::GetSyntheticChildren (ValueObject& valobj,
}
return lldb::SyntheticChildrenSP();
}
#endif
void
CategoryMap::LoopThrough(CallbackType callback, void* param)

2
lldb/source/Core/ValueObject.cpp
View File

@ -250,7 +250,9 @@ ValueObject::UpdateFormatsIfNeeded(DynamicValueType use_dynamic)
{
SetValueFormat(DataVisualization::ValueFormats::GetFormat (*this, eNoDynamicValues));
SetSummaryFormat(DataVisualization::GetSummaryFormat (*this, use_dynamic));
#ifndef LLDB_DISABLE_PYTHON
SetSyntheticChildren(DataVisualization::GetSyntheticChildren (*this, use_dynamic));
#endif
m_last_format_mgr_revision = DataVisualization::GetCurrentRevision();
m_last_format_mgr_dynamic = use_dynamic;