From: Aldy Hernandez <aldyh@gcc.gnu.org>
Date: Fri, 13 Apr 2018 08:12:44 +0000 (+0000)
Subject: single_import changes by Andrew to fix my backwards threaders problems.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdb08d2be4187c11bcfc2ebdbf7f3b6af1c7e4c2;p=thirdparty%2Fgcc.git

single_import changes by Andrew to fix my backwards threaders problems.

From-SVN: r259365
---

diff --git a/gcc/ssa-range-bb.c b/gcc/ssa-range-bb.c
index c9408ae4f655..a19b482c2868 100644
--- a/gcc/ssa-range-bb.c
+++ b/gcc/ssa-range-bb.c
@@ -189,9 +189,11 @@ gori_map::single_import (tree name)
   basic_block bb;
   bitmap_iterator bi;
 
+  bb = gimple_bb (SSA_NAME_DEF_STMT (name));
+  if (bb && !incoming[bb->index])
+    calculate_gori (bb);
   if (def_chain [name_index] == NULL)
     return NULL_TREE;
-  bb = gimple_bb (SSA_NAME_DEF_STMT (name));
 
   EXECUTE_IF_AND_IN_BITMAP (def_chain [name_index], incoming[bb->index], 0,
 			    index, bi)
@@ -241,7 +243,7 @@ gori_map::calc_def_chain (tree name, basic_block bb)
   unsigned v = SSA_NAME_VERSION (name);
   range_stmt rn;
 
-  if (!stmt || gimple_bb (stmt) != bb)
+  if (!stmt || gimple_bb (stmt) != bb || is_a <gphi *> (stmt))
     {
       bitmap_set_bit (incoming[bb->index], v);
       return NULL;