Author: Alex Langford Date: 2020-01-28T14:11:53-08:00 New Revision: 5eaf44f99f0a0a3bdfa892892b8aaca841c8dbe0
URL: https://github.com/llvm/llvm-project/commit/5eaf44f99f0a0a3bdfa892892b8aaca841c8dbe0 DIFF: https://github.com/llvm/llvm-project/commit/5eaf44f99f0a0a3bdfa892892b8aaca841c8dbe0.diff LOG: [lldb] Delete ValueObject::GetBaseClassPath Summary: This method has exactly one call site, which is only actually executed if `ValueObject::IsBaseClass` returns false. However, the first thing that `ValueObject::GetBaseClassPath` does is check if `ValueObject::IsBaseClass` is true. Because this can never be the case, this method always returns false and is therefore effectively dead. Differential Revision: https://reviews.llvm.org/D73517 Added: Modified: lldb/include/lldb/Core/ValueObject.h lldb/source/Core/ValueObject.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/Core/ValueObject.h b/lldb/include/lldb/Core/ValueObject.h index 1b000e617f0e..aa0ff60b3f7c 100644 --- a/lldb/include/lldb/Core/ValueObject.h +++ b/lldb/include/lldb/Core/ValueObject.h @@ -396,8 +396,6 @@ class ValueObject : public UserID { bool IsIntegerType(bool &is_signed); - virtual bool GetBaseClassPath(Stream &s); - virtual void GetExpressionPath( Stream &s, bool qualify_cxx_base_classes, GetExpressionPathFormat = eGetExpressionPathFormatDereferencePointers); diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp index 3a0aecfa646b..f6e7dcc305ac 100644 --- a/lldb/source/Core/ValueObject.cpp +++ b/lldb/source/Core/ValueObject.cpp @@ -2013,23 +2013,6 @@ bool ValueObject::HasSyntheticValue() { return m_synthetic_value != nullptr; } -bool ValueObject::GetBaseClassPath(Stream &s) { - if (IsBaseClass()) { - bool parent_had_base_class = - GetParent() && GetParent()->GetBaseClassPath(s); - CompilerType compiler_type = GetCompilerType(); - llvm::Optional<std::string> cxx_class_name = - TypeSystemClang::GetCXXClassName(compiler_type); - if (cxx_class_name) { - if (parent_had_base_class) - s.PutCString("::"); - s.PutCString(cxx_class_name.getValue()); - } - return parent_had_base_class || cxx_class_name; - } - return false; -} - ValueObject *ValueObject::GetNonBaseClassParent() { if (GetParent()) { if (GetParent()->IsBaseClass()) @@ -2139,13 +2122,8 @@ void ValueObject::GetExpressionPath(Stream &s, bool qualify_cxx_base_classes, } const char *name = GetName().GetCString(); - if (name) { - if (qualify_cxx_base_classes) { - if (GetBaseClassPath(s)) - s.PutCString("::"); - } + if (name) s.PutCString(name); - } } } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits