mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-22 19:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR middle-end/65735 (ICE (in duplicate_thread_path, at tree-ssa-threadupdate.c))

Browse Source 
PR tree-optimization/65735
	* tree-ssa-threadedge.c (fsm_find_control_statement_thread_paths):
	Remove visited_phis argument, add visited_bbs, avoid recursing into the
	same bb rather than just into the same phi node.
	(thread_through_normal_block): Adjust caller.

	* gcc.c-torture/compile/pr65735.c: New test.

From-SVN: r222011
This commit is contained in:
Jakub Jelinek 2015-04-11 19:32:54 +02:00 committed by Jakub Jelinek
parent bc7e7ed3e3
commit e9329eb586
4 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2015-04-11 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/65735
* tree-ssa-threadedge.c (fsm_find_control_statement_thread_paths):
Remove visited_phis argument, add visited_bbs, avoid recursing into the
same bb rather than just into the same phi node.
(thread_through_normal_block): Adjust caller.
2015-04-11 Gerald Pfeifer <gerald@pfeifer.com>
* doc/contrib.texi (Contributors): Add Ira Rosen.

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2015-04-11 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/65735
* gcc.c-torture/compile/pr65735.c: New test.
2015-04-11 H.J. Lu <hongjiu.lu@intel.com>
PR middle-end/65554

21
gcc/testsuite/gcc.c-torture/compile/pr65735.c Normal file
View File

@ -0,0 +1,21 @@
/* PR tree-optimization/65735 */
int foo (void);
void
bar (int a, int b, int c)
{
while (!a)
{
c = foo ();
if (c == 7)
c = b;
switch (c)
{
case 1:
a = b++;
if (b)
b = 1;
}
}
}

12
gcc/tree-ssa-threadedge.c
View File

@ -1015,7 +1015,7 @@ static int max_threaded_paths;
static void
fsm_find_control_statement_thread_paths (tree expr,
hash_set<gimple> *visited_phis,
hash_set<basic_block> *visited_bbs,
vec<basic_block, va_gc> *&path,
bool seen_loop_phi)
{
@ -1034,7 +1034,7 @@ fsm_find_control_statement_thread_paths (tree expr,
return;
/* Avoid infinite recursion. */
if (visited_phis->add (def_stmt))
if (visited_bbs->add (var_bb))
return;
gphi *phi = as_a <gphi *> (def_stmt);
@ -1109,7 +1109,7 @@ fsm_find_control_statement_thread_paths (tree expr,
{
vec_safe_push (path, bbi);
/* Recursively follow SSA_NAMEs looking for a constant definition. */
fsm_find_control_statement_thread_paths (arg, visited_phis, path,
fsm_find_control_statement_thread_paths (arg, visited_bbs, path,
seen_loop_phi);
path->pop ();
@ -1391,13 +1391,13 @@ thread_through_normal_block (edge e,
vec<basic_block, va_gc> *bb_path;
vec_alloc (bb_path, n_basic_blocks_for_fn (cfun));
vec_safe_push (bb_path, e->dest);
hash_set<gimple> *visited_phis = new hash_set<gimple>;
hash_set<basic_block> *visited_bbs = new hash_set<basic_block>;
max_threaded_paths = PARAM_VALUE (PARAM_MAX_FSM_THREAD_PATHS);
fsm_find_control_statement_thread_paths (cond, visited_phis, bb_path,
fsm_find_control_statement_thread_paths (cond, visited_bbs, bb_path,
false);
delete visited_phis;
delete visited_bbs;
vec_free (bb_path);
}
return 0;