git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR middle-end/65233 (ICE (segfault) on arm-linux-gnueabihf and aarch64-linux-gnu) 

2015-03-05  Richard Biener  <rguenther@suse.de>

	PR middle-end/65233
	* ipa-polymorphic-call.c: Include tree-ssa-operands.h and
	tree-into-ssa.h.
	(walk_ssa_copies): Revert last chage.  Instead do not walk
	SSA names registered for SSA update.

From-SVN: r221203
This commit is contained in:
Richard Biener 2015-03-05 08:37:40 +00:00 committed by Richard Biener
parent 41616a5e38
commit b3406fa083
2 changed files with 14 additions and 5 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-03-05 Richard Biener <rguenther@suse.de>
PR middle-end/65233
* ipa-polymorphic-call.c: Include tree-ssa-operands.h and
tree-into-ssa.h.
(walk_ssa_copies): Revert last chage. Instead do not walk
SSA names registered for SSA update.
2015-03-03 Jan Hubicka <hubicka@ucw.cz> 2015-03-03 Jan Hubicka <hubicka@ucw.cz>
PR ipa/65270 PR ipa/65270

11
gcc/ipa-polymorphic-call.c
View File

@ -81,6 +81,8 @@ along with GCC; see the file COPYING3. If not see
#include "data-streamer.h" #include "data-streamer.h"
#include "lto-streamer.h" #include "lto-streamer.h"
#include "streamer-hooks.h" #include "streamer-hooks.h"
#include "tree-ssa-operands.h"
#include "tree-into-ssa.h"
/* Return true when TYPE contains an polymorphic type and thus is interesting /* Return true when TYPE contains an polymorphic type and thus is interesting
for devirtualization machinery. */ for devirtualization machinery. */
@ -804,7 +806,9 @@ walk_ssa_copies (tree op, hash_set<tree> **global_visited = NULL)
STRIP_NOPS (op); STRIP_NOPS (op);
while (TREE_CODE (op) == SSA_NAME while (TREE_CODE (op) == SSA_NAME
&& !SSA_NAME_IS_DEFAULT_DEF (op) && !SSA_NAME_IS_DEFAULT_DEF (op)
&& SSA_NAME_DEF_STMT (op) /* We might be called via fold_stmt during cfgcleanup where
SSA form need not be up-to-date. */
&& !name_registered_for_update_p (op)
&& (gimple_assign_single_p (SSA_NAME_DEF_STMT (op)) && (gimple_assign_single_p (SSA_NAME_DEF_STMT (op))
|| gimple_code (SSA_NAME_DEF_STMT (op)) == GIMPLE_PHI)) || gimple_code (SSA_NAME_DEF_STMT (op)) == GIMPLE_PHI))
{ {
@ -835,10 +839,7 @@ walk_ssa_copies (tree op, hash_set<tree> **global_visited = NULL)
{ {
gimple phi = SSA_NAME_DEF_STMT (op); gimple phi = SSA_NAME_DEF_STMT (op);
if (gimple_phi_num_args (phi) > 2 if (gimple_phi_num_args (phi) > 2)
/* We can be called while cleaning up the CFG and can
have empty PHIs about to be removed. */
|| gimple_phi_num_args (phi) == 0)
goto done; goto done;
if (gimple_phi_num_args (phi) == 1) if (gimple_phi_num_args (phi) == 1)
op = gimple_phi_arg_def (phi, 0); op = gimple_phi_arg_def (phi, 0);