From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2136) id 16BD9385840E; Sat, 13 Nov 2021 10:48:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 16BD9385840E MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Aldy Hernandez To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5222] path solver: Merge path_range_query constructors. X-Act-Checkin: gcc X-Git-Author: Aldy Hernandez X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 2f3d43a35155685b1795b4392e20e1c14a33c38f X-Git-Newrev: dc777f6b0646fed2f18a580ce249cb6404f89205 Message-Id: <20211113104830.16BD9385840E@sourceware.org> Date: Sat, 13 Nov 2021 10:48:30 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2021 10:48:30 -0000 https://gcc.gnu.org/g:dc777f6b0646fed2f18a580ce249cb6404f89205 commit r12-5222-gdc777f6b0646fed2f18a580ce249cb6404f89205 Author: Aldy Hernandez Date: Fri Nov 12 09:06:55 2021 +0100 path solver: Merge path_range_query constructors. There's no need for two constructors, when we can do it all with one that defaults to the common behavior: path_range_query (bool resolve = true, gimple_ranger *ranger = NULL); Tested on x86-64 Linux. gcc/ChangeLog: * gimple-range-path.cc (path_range_query::path_range_query): Merge ctors. (path_range_query::import_p): Move from header file. (path_range_query::~path_range_query): Adjust for combined ctors. * gimple-range-path.h: Merge ctors. (path_range_query::import_p): Move to .cc file. Diff: --- gcc/gimple-range-path.cc | 31 +++++++++++++++++-------------- gcc/gimple-range-path.h | 17 ++++------------- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/gcc/gimple-range-path.cc b/gcc/gimple-range-path.cc index 71b290434cb..32b2cb57597 100644 --- a/gcc/gimple-range-path.cc +++ b/gcc/gimple-range-path.cc @@ -36,33 +36,36 @@ along with GCC; see the file COPYING3. If not see // Internal construct to help facilitate debugging of solver. #define DEBUG_SOLVER (dump_file && (param_threader_debug == THREADER_DEBUG_ALL)) -path_range_query::path_range_query (gimple_ranger *ranger, bool resolve) +path_range_query::path_range_query (bool resolve, gimple_ranger *ranger) : m_cache (new ssa_global_cache), m_has_cache_entry (BITMAP_ALLOC (NULL)), - m_ranger (ranger), m_resolve (resolve), - m_alloced_ranger (false) + m_alloced_ranger (!ranger) { - m_oracle = new path_oracle (ranger->oracle ()); -} + if (m_alloced_ranger) + m_ranger = new gimple_ranger; + else + m_ranger = ranger; -path_range_query::path_range_query (bool resolve) - : m_cache (new ssa_global_cache), - m_has_cache_entry (BITMAP_ALLOC (NULL)), - m_ranger (new gimple_ranger), - m_resolve (resolve), - m_alloced_ranger (true) -{ m_oracle = new path_oracle (m_ranger->oracle ()); } path_range_query::~path_range_query () { - BITMAP_FREE (m_has_cache_entry); - delete m_cache; delete m_oracle; if (m_alloced_ranger) delete m_ranger; + BITMAP_FREE (m_has_cache_entry); + delete m_cache; +} + +// Return TRUE if NAME is in the import bitmap. + +bool +path_range_query::import_p (tree name) +{ + return (TREE_CODE (name) == SSA_NAME + && bitmap_bit_p (m_imports, SSA_NAME_VERSION (name))); } // Mark cache entry for NAME as unused. diff --git a/gcc/gimple-range-path.h b/gcc/gimple-range-path.h index ea4864d35ef..f8b2b04e57c 100644 --- a/gcc/gimple-range-path.h +++ b/gcc/gimple-range-path.h @@ -32,10 +32,10 @@ along with GCC; see the file COPYING3. If not see class path_range_query : public range_query { public: - path_range_query (class gimple_ranger *ranger, bool resolve = true); - path_range_query (bool resolve = true); + path_range_query (bool resolve = true, class gimple_ranger *ranger = NULL); virtual ~path_range_query (); - void compute_ranges (const vec &, const bitmap_head *imports = NULL); + void compute_ranges (const vec &, + const bitmap_head *imports = NULL); void compute_ranges (edge e); void compute_imports (bitmap imports, basic_block exit); bool range_of_expr (irange &r, tree name, gimple * = NULL) override; @@ -64,7 +64,7 @@ private: void compute_phi_relations (basic_block bb, basic_block prev); void maybe_register_phi_relation (gphi *, tree arg); bool add_to_imports (tree name, bitmap imports); - inline bool import_p (tree name); + bool import_p (tree name); // Path navigation. void set_path (const vec &); @@ -104,13 +104,4 @@ private: bool m_alloced_ranger; }; -// Return TRUE if NAME is in the import bitmap. - -bool -path_range_query::import_p (tree name) -{ - return (TREE_CODE (name) == SSA_NAME - && bitmap_bit_p (m_imports, SSA_NAME_VERSION (name))); -} - #endif // GCC_TREE_SSA_THREADSOLVER_H