FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove shadowed oracle field.

Browse source 
The m_oracle field in the path solver was shadowing the base class.
This was causing subtle problems while calculating outgoing edges
between blocks, because the query object being passed did not have an
oracle set.

This should further improve our solving ability.

Tested on x86-64 Linux.

gcc/ChangeLog:

	* gimple-range-path.cc (path_range_query::compute_ranges): Use
	get_path_oracle.
	* gimple-range-path.h (class path_range_query): Remove shadowed
	m_oracle field.
	(path_range_query::get_path_oracle): New.
This commit is contained in:
Aldy Hernandez 2021-10-01 12:27:55 +02:00
parent 9c1a633d96
commit 75d053df72
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gcc/gimple-range-path.cc
View file

@ -480,7 +480,7 @@ path_range_query::compute_ranges (const vec<basic_block> &path,
if (m_resolve)
{
add_copies_to_imports ();
m_oracle->reset_path ();
get_path_oracle ()->reset_path ();
compute_relations (path);
}

3
gcc/gimple-range-path.h
View file

@ -38,7 +38,6 @@ public:
bool range_of_expr (irange &r, tree name, gimple * = NULL) override;
bool range_of_stmt (irange &r, gimple *, tree name = NULL) override;
bool unreachable_path_p ();
path_oracle *oracle () { return m_oracle; }
void dump (FILE *) override;
void debug ();
@ -46,6 +45,7 @@ private:
bool internal_range_of_expr (irange &r, tree name, gimple *);
bool defined_outside_path (tree name);
void range_on_path_entry (irange &r, tree name);
path_oracle *get_path_oracle () { return (path_oracle *)m_oracle; }
// Cache manipulation.
void set_cache (const irange &r, tree name);
@ -85,7 +85,6 @@ private:
auto_bitmap m_imports;
gimple_ranger &m_ranger;
non_null_ref m_non_null;
path_oracle *m_oracle;
// Current path position.
unsigned m_pos;