From 7b1f1cf1cf71ed143673a981074da642cfcde56e Mon Sep 17 00:00:00 2001 From: Raphael Isemann Date: Fri, 8 May 2020 19:09:30 +0200 Subject: [PATCH] [lldb] Remove 'use_synthetic' parameters in ValueObject code 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 --- lldb/include/lldb/Core/ValueObject.h | 4 ++-- .../lldb/Core/ValueObjectSyntheticFilter.h | 2 +- lldb/source/API/SBValue.cpp | 2 +- lldb/source/Core/ValueObject.cpp | 16 +++++----------- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/lldb/include/lldb/Core/ValueObject.h b/lldb/include/lldb/Core/ValueObject.h index 35574f1a76478..1dd399ae7813e 100644 --- a/lldb/include/lldb/Core/ValueObject.h +++ b/lldb/include/lldb/Core/ValueObject.h @@ -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(); @@ -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. diff --git a/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h b/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h index 8ff7f50521172..406586fb24f62 100644 --- a/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h +++ b/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h @@ -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); diff --git a/lldb/source/API/SBValue.cpp b/lldb/source/API/SBValue.cpp index 65a2a5046c582..7485b0ee1838e 100644 --- a/lldb/source/API/SBValue.cpp +++ b/lldb/source/API/SBValue.cpp @@ -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; } diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp index f80e86fc195b8..59bd0c0209b66 100644 --- a/lldb/source/Core/ValueObject.cpp +++ b/lldb/source/Core/ValueObject.cpp @@ -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; @@ -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(); @@ -2006,7 +2000,7 @@ bool ValueObject::HasSyntheticValue() { if (m_synthetic_children_sp.get() == nullptr) return false; - CalculateSyntheticValue(true); + CalculateSyntheticValue(); return m_synthetic_value != nullptr; } @@ -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; }