From 9072df8ac1431dba51394b77ead766aada82867f Mon Sep 17 00:00:00 2001 From: Konrad Kleine Date: Mon, 6 Apr 2020 08:37:58 -0400 Subject: [PATCH] [lldb][nfc] remove overriden funcs with default impl Summary: These `SearchFilter` methods all return `true` by their default implementation: ```lang=c++ virtual bool ModulePasses(const FileSpec &spec); virtual bool ModulePasses(const lldb::ModuleSP &module_sp); virtual bool AddressPasses(Address &addr); virtual bool CompUnitPasses(FileSpec &fileSpec); virtual bool CompUnitPasses(CompileUnit &compUnit); ``` That's why I've documented the default behavior and remove the overrides (except for `AddressPasses`) in these `SearchFilter`-subclasses which all just repeated the default implementation: `SearchFilterByModule`, `SearchFilterByModuleList`. Reviewers: jankratochvil, labath Reviewed By: jankratochvil, labath Subscribers: labath, lldb-commits Tags: #lldb Differential Revision: https://reviews.llvm.org/D77376 --- lldb/include/lldb/Core/SearchFilter.h | 18 ++++++++++-------- lldb/source/Core/SearchFilter.cpp | 14 -------------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/lldb/include/lldb/Core/SearchFilter.h b/lldb/include/lldb/Core/SearchFilter.h index 178489a88f3db..9f56bbe403249 100644 --- a/lldb/include/lldb/Core/SearchFilter.h +++ b/lldb/include/lldb/Core/SearchFilter.h @@ -98,6 +98,8 @@ class SearchFilter { /// The file spec to check against the filter. /// \return /// \b true if \a spec passes, and \b false otherwise. + /// + /// \note the default implementation always returns \c true. virtual bool ModulePasses(const FileSpec &spec); /// Call this method with a Module to see if that module passes the filter. @@ -107,6 +109,8 @@ class SearchFilter { /// /// \return /// \b true if \a module passes, and \b false otherwise. + /// + /// \note the default implementation always returns \c true. virtual bool ModulePasses(const lldb::ModuleSP &module_sp); /// Call this method with a Address to see if \a address passes the filter. @@ -116,6 +120,8 @@ class SearchFilter { /// /// \return /// \b true if \a address passes, and \b false otherwise. + /// + /// \note the default implementation always returns \c true. virtual bool AddressPasses(Address &addr); /// Call this method with a FileSpec to see if \a file spec passes the @@ -126,6 +132,8 @@ class SearchFilter { /// /// \return /// \b true if \a file spec passes, and \b false otherwise. + /// + /// \note the default implementation always returns \c true. virtual bool CompUnitPasses(FileSpec &fileSpec); /// Call this method with a CompileUnit to see if \a comp unit passes the @@ -136,6 +144,8 @@ class SearchFilter { /// /// \return /// \b true if \a Comp Unit passes, and \b false otherwise. + /// + /// \note the default implementation always returns \c true. virtual bool CompUnitPasses(CompileUnit &compUnit); /// Call this method with a Function to see if \a function passes the @@ -321,10 +331,6 @@ class SearchFilterByModule : public SearchFilter { bool AddressPasses(Address &address) override; - bool CompUnitPasses(FileSpec &fileSpec) override; - - bool CompUnitPasses(CompileUnit &compUnit) override; - void GetDescription(Stream *s) override; uint32_t GetFilterRequiredItems() override; @@ -372,10 +378,6 @@ class SearchFilterByModuleList : public SearchFilter { bool AddressPasses(Address &address) override; - bool CompUnitPasses(FileSpec &fileSpec) override; - - bool CompUnitPasses(CompileUnit &compUnit) override; - void GetDescription(Stream *s) override; uint32_t GetFilterRequiredItems() override; diff --git a/lldb/source/Core/SearchFilter.cpp b/lldb/source/Core/SearchFilter.cpp index 494e88dde2671..ea51fb3791818 100644 --- a/lldb/source/Core/SearchFilter.cpp +++ b/lldb/source/Core/SearchFilter.cpp @@ -417,12 +417,6 @@ bool SearchFilterByModule::AddressPasses(Address &address) { return true; } -bool SearchFilterByModule::CompUnitPasses(FileSpec &fileSpec) { return true; } - -bool SearchFilterByModule::CompUnitPasses(CompileUnit &compUnit) { - return true; -} - void SearchFilterByModule::Search(Searcher &searcher) { if (!m_target_sp) return; @@ -543,14 +537,6 @@ bool SearchFilterByModuleList::AddressPasses(Address &address) { return true; } -bool SearchFilterByModuleList::CompUnitPasses(FileSpec &fileSpec) { - return true; -} - -bool SearchFilterByModuleList::CompUnitPasses(CompileUnit &compUnit) { - return true; -} - void SearchFilterByModuleList::Search(Searcher &searcher) { if (!m_target_sp) return;