From f4b170d0daf68b38fa951cb12d0b6e1395bc6ec7 Mon Sep 17 00:00:00 2001 From: Keno Fischer Date: Sat, 13 Dec 2014 00:05:58 +0000 Subject: [PATCH] SyntheticChildrenFrontEnd::* should also be built when python is disabled Summary: This moves - SyntheticChildrenFrontEnd::CreateValueObjectFromExpression - SyntheticChildrenFrontEnd::CreateValueObjectFromAddress - SyntheticChildrenFrontEnd::CreateValueObjectFromData outside the `#ifndef LLDB_DISABLE_PYTHON` since it doesn't seem to depend on python being available and indeed breaks the build when python is disabled. Reviewers: granata.enrico Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D6646 llvm-svn: 224170 --- lldb/source/DataFormatters/TypeSynthetic.cpp | 70 ++++++++++++++-------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/lldb/source/DataFormatters/TypeSynthetic.cpp b/lldb/source/DataFormatters/TypeSynthetic.cpp index 742adf7..658e99e 100644 --- a/lldb/source/DataFormatters/TypeSynthetic.cpp +++ b/lldb/source/DataFormatters/TypeSynthetic.cpp @@ -63,6 +63,41 @@ CXXSyntheticChildren::GetDescription() return sstr.GetString(); } +lldb::ValueObjectSP +SyntheticChildrenFrontEnd::CreateValueObjectFromExpression (const char* name, + const char* expression, + const ExecutionContext& exe_ctx) +{ + ValueObjectSP valobj_sp(ValueObject::CreateValueObjectFromExpression(name, expression, exe_ctx)); + if (valobj_sp) + valobj_sp->SetSyntheticChildrenGenerated(true); + return valobj_sp; +} + +lldb::ValueObjectSP +SyntheticChildrenFrontEnd::CreateValueObjectFromAddress (const char* name, + uint64_t address, + const ExecutionContext& exe_ctx, + ClangASTType type) +{ + ValueObjectSP valobj_sp(ValueObject::CreateValueObjectFromAddress(name, address, exe_ctx, type)); + if (valobj_sp) + valobj_sp->SetSyntheticChildrenGenerated(true); + return valobj_sp; +} + +lldb::ValueObjectSP +SyntheticChildrenFrontEnd::CreateValueObjectFromData (const char* name, + const DataExtractor& data, + const ExecutionContext& exe_ctx, + ClangASTType type) +{ + ValueObjectSP valobj_sp(ValueObject::CreateValueObjectFromData(name, data, exe_ctx, type)); + if (valobj_sp) + valobj_sp->SetSyntheticChildrenGenerated(true); + return valobj_sp; +} + #ifndef LLDB_DISABLE_PYTHON ScriptedSyntheticChildren::FrontEnd::FrontEnd(std::string pclass, ValueObject &backend) : @@ -111,39 +146,4 @@ ScriptedSyntheticChildren::GetDescription() return sstr.GetString(); } -lldb::ValueObjectSP -SyntheticChildrenFrontEnd::CreateValueObjectFromExpression (const char* name, - const char* expression, - const ExecutionContext& exe_ctx) -{ - ValueObjectSP valobj_sp(ValueObject::CreateValueObjectFromExpression(name, expression, exe_ctx)); - if (valobj_sp) - valobj_sp->SetSyntheticChildrenGenerated(true); - return valobj_sp; -} - -lldb::ValueObjectSP -SyntheticChildrenFrontEnd::CreateValueObjectFromAddress (const char* name, - uint64_t address, - const ExecutionContext& exe_ctx, - ClangASTType type) -{ - ValueObjectSP valobj_sp(ValueObject::CreateValueObjectFromAddress(name, address, exe_ctx, type)); - if (valobj_sp) - valobj_sp->SetSyntheticChildrenGenerated(true); - return valobj_sp; -} - -lldb::ValueObjectSP -SyntheticChildrenFrontEnd::CreateValueObjectFromData (const char* name, - const DataExtractor& data, - const ExecutionContext& exe_ctx, - ClangASTType type) -{ - ValueObjectSP valobj_sp(ValueObject::CreateValueObjectFromData(name, data, exe_ctx, type)); - if (valobj_sp) - valobj_sp->SetSyntheticChildrenGenerated(true); - return valobj_sp; -} - #endif // #ifndef LLDB_DISABLE_PYTHON -- 2.7.4