Skip to content

Commit

Permalink
[lldb] Remove 'use_synthetic' parameters in ValueObject code
Browse files Browse the repository at this point in the history
Summary:
`CalculateSyntheticValue` and `GetSyntheticValue` have a `use_synthetic` parameter
that makes the function do nothing when it's false. We obviously always pass true
to the function (or check that the value we pass is true), because there really isn't
any point calling with function with a `false`. This just removes all of this.

Reviewers: labath, JDevlieghere, davide

Reviewed By: davide

Subscribers: davide

Differential Revision: https://reviews.llvm.org/D79568
  • Loading branch information
Teemperor committed May 8, 2020
1 parent adf3b8e commit 7b1f1cf
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 15 deletions.
4 changes: 2 additions & 2 deletions lldb/include/lldb/Core/ValueObject.h
Expand Up @@ -575,7 +575,7 @@ class ValueObject : public UserID {

virtual lldb::ValueObjectSP GetNonSyntheticValue();

lldb::ValueObjectSP GetSyntheticValue(bool use_synthetic = true);
lldb::ValueObjectSP GetSyntheticValue();

virtual bool HasSyntheticValue();

Expand Down Expand Up @@ -926,7 +926,7 @@ class ValueObject : public UserID {

virtual bool HasDynamicValueTypeInfo() { return false; }

virtual void CalculateSyntheticValue(bool use_synthetic = true);
virtual void CalculateSyntheticValue();

// Should only be called by ValueObject::GetChildAtIndex() Returns a
// ValueObject managed by this ValueObject's manager.
Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
Expand Up @@ -66,7 +66,7 @@ class ValueObjectSynthetic : public ValueObject {

bool IsSynthetic() override { return true; }

void CalculateSyntheticValue(bool use_synthetic) override {}
void CalculateSyntheticValue() override {}

bool IsDynamic() override {
return ((m_parent != nullptr) ? m_parent->IsDynamic() : false);
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/API/SBValue.cpp
Expand Up @@ -137,7 +137,7 @@ class ValueImpl {
}

if (m_use_synthetic) {
ValueObjectSP synthetic_sp = value_sp->GetSyntheticValue(m_use_synthetic);
ValueObjectSP synthetic_sp = value_sp->GetSyntheticValue();
if (synthetic_sp)
value_sp = synthetic_sp;
}
Expand Down
16 changes: 5 additions & 11 deletions lldb/source/Core/ValueObject.cpp
Expand Up @@ -1933,10 +1933,7 @@ ValueObject::GetSyntheticExpressionPathChild(const char *expression,
return synthetic_child_sp;
}

void ValueObject::CalculateSyntheticValue(bool use_synthetic) {
if (!use_synthetic)
return;

void ValueObject::CalculateSyntheticValue() {
TargetSP target_sp(GetTargetSP());
if (target_sp && !target_sp->GetEnableSyntheticValue()) {
m_synthetic_value = nullptr;
Expand Down Expand Up @@ -1988,11 +1985,8 @@ ValueObjectSP ValueObject::GetStaticValue() { return GetSP(); }

lldb::ValueObjectSP ValueObject::GetNonSyntheticValue() { return GetSP(); }

ValueObjectSP ValueObject::GetSyntheticValue(bool use_synthetic) {
if (!use_synthetic)
return ValueObjectSP();

CalculateSyntheticValue(use_synthetic);
ValueObjectSP ValueObject::GetSyntheticValue() {
CalculateSyntheticValue();

if (m_synthetic_value)
return m_synthetic_value->GetSP();
Expand All @@ -2006,7 +2000,7 @@ bool ValueObject::HasSyntheticValue() {
if (m_synthetic_children_sp.get() == nullptr)
return false;

CalculateSyntheticValue(true);
CalculateSyntheticValue();

return m_synthetic_value != nullptr;
}
Expand Down Expand Up @@ -3341,7 +3335,7 @@ lldb::ValueObjectSP ValueObjectManager::GetSP() {
}

if (m_use_synthetic) {
lldb::ValueObjectSP synthetic_sp = m_user_valobj_sp->GetSyntheticValue(m_use_synthetic);
lldb::ValueObjectSP synthetic_sp = m_user_valobj_sp->GetSyntheticValue();
if (synthetic_sp)
m_user_valobj_sp = synthetic_sp;
}
Expand Down

0 comments on commit 7b1f1cf

Please sign in to comment.