TeamHeptaMirrors/gcc
1
0
Fork 1
mirror of https://github.com/gcc-mirror/gcc.git synced 2026-05-06 14:59:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

path solver: Merge path_range_query constructors.

Browse Source 
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.
This commit is contained in:
Aldy Hernandez
2021-11-12 09:06:55 +01:00
parent 2f3d43a351
commit dc777f6b06
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
gcc/gimple-range-path.cc
View File

@@ -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.

17
gcc/gimple-range-path.h
View File

@@ -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<basic_block> &, const bitmap_head *imports = NULL);
void compute_ranges (const vec<basic_block> &,
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<basic_block> &);
@@ -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