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

tree-cfg.h (should_remove_lhs_p): New predicate. 

* tree-cfg.h (should_remove_lhs_p): New predicate.
	* cgraph.c (cgraph_edge::redirect_call_stmt_to_callee): Use it.
	* gimplify.c (gimplify_modify_expr): Likewise.
	* tree-cfg.c (verify_gimple_call): Likewise.
	* tree-cfgcleanup.c (fixup_noreturn_call): Likewise.
	* gimple-fold.c: Include "tree-cfg.h".
	(gimple_fold_call): Use should_remove_lhs_p.

From-SVN: r236637
This commit is contained in:
Marek Polacek 2016-05-24 13:34:37 +00:00 committed by Marek Polacek
parent 30fd297774
commit abd3a68c13
7 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/ChangeLog
View File

@ -1,3 +1,13 @@
2016-05-24 Marek Polacek <polacek@redhat.com>
* tree-cfg.h (should_remove_lhs_p): New predicate.
* cgraph.c (cgraph_edge::redirect_call_stmt_to_callee): Use it.
* gimplify.c (gimplify_modify_expr): Likewise.
* tree-cfg.c (verify_gimple_call): Likewise.
* tree-cfgcleanup.c (fixup_noreturn_call): Likewise.
* gimple-fold.c: Include "tree-cfg.h".
(gimple_fold_call): Use should_remove_lhs_p.
2016-05-24 Richard Biener <rguenther@suse.de> 2016-05-24 Richard Biener <rguenther@suse.de>
PR tree-optimization/71253 PR tree-optimization/71253

5
gcc/cgraph.c
View File

@ -1513,10 +1513,7 @@ cgraph_edge::redirect_call_stmt_to_callee (void)
} }
/* If the call becomes noreturn, remove the LHS if possible. */ /* If the call becomes noreturn, remove the LHS if possible. */
if (lhs if (gimple_call_noreturn_p (new_stmt) && should_remove_lhs_p (lhs))
&& (gimple_call_flags (new_stmt) & ECF_NORETURN)
&& TREE_CODE (TYPE_SIZE_UNIT (TREE_TYPE (lhs))) == INTEGER_CST
&& !TREE_ADDRESSABLE (TREE_TYPE (lhs)))
{ {
if (TREE_CODE (lhs) == SSA_NAME) if (TREE_CODE (lhs) == SSA_NAME)
{ {

8
gcc/gimple-fold.c
View File

@ -54,6 +54,7 @@ along with GCC; see the file COPYING3. If not see
#include "optabs-query.h" #include "optabs-query.h"
#include "omp-low.h" #include "omp-low.h"
#include "ipa-chkp.h" #include "ipa-chkp.h"
#include "tree-cfg.h"
/* Return true when DECL can be referenced from current unit. /* Return true when DECL can be referenced from current unit.
@ -3052,12 +3053,9 @@ gimple_fold_call (gimple_stmt_iterator *gsi, bool inplace)
== void_type_node)) == void_type_node))
gimple_call_set_fntype (stmt, TREE_TYPE (fndecl)); gimple_call_set_fntype (stmt, TREE_TYPE (fndecl));
/* If the call becomes noreturn, remove the lhs. */ /* If the call becomes noreturn, remove the lhs. */
if (lhs if (gimple_call_noreturn_p (stmt)
&& (gimple_call_flags (stmt) & ECF_NORETURN)
&& (VOID_TYPE_P (TREE_TYPE (gimple_call_fntype (stmt))) && (VOID_TYPE_P (TREE_TYPE (gimple_call_fntype (stmt)))
|| ((TREE_CODE (TYPE_SIZE_UNIT (TREE_TYPE (lhs))) || should_remove_lhs_p (lhs)))
== INTEGER_CST)
&& !TREE_ADDRESSABLE (TREE_TYPE (lhs)))))
{ {
if (TREE_CODE (lhs) == SSA_NAME) if (TREE_CODE (lhs) == SSA_NAME)
{ {

4
gcc/gimplify.c
View File

@ -4873,9 +4873,7 @@ gimplify_modify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
} }
} }
notice_special_calls (call_stmt); notice_special_calls (call_stmt);
if (!gimple_call_noreturn_p (call_stmt) if (!gimple_call_noreturn_p (call_stmt) || !should_remove_lhs_p (*to_p))
|| TREE_ADDRESSABLE (TREE_TYPE (*to_p))
|| TREE_CODE (TYPE_SIZE_UNIT (TREE_TYPE (*to_p))) != INTEGER_CST)
gimple_call_set_lhs (call_stmt, *to_p); gimple_call_set_lhs (call_stmt, *to_p);
else if (TREE_CODE (*to_p) == SSA_NAME) else if (TREE_CODE (*to_p) == SSA_NAME)
/* The above is somewhat premature, avoid ICEing later for a /* The above is somewhat premature, avoid ICEing later for a

6
gcc/tree-cfg.c
View File

@ -3385,11 +3385,9 @@ verify_gimple_call (gcall *stmt)
return true; return true;
} }
if (lhs if (gimple_call_ctrl_altering_p (stmt)
&& gimple_call_ctrl_altering_p (stmt)
&& gimple_call_noreturn_p (stmt) && gimple_call_noreturn_p (stmt)
&& TREE_CODE (TYPE_SIZE_UNIT (TREE_TYPE (lhs))) == INTEGER_CST && should_remove_lhs_p (lhs))
&& !TREE_ADDRESSABLE (TREE_TYPE (lhs)))
{ {
error ("LHS in noreturn call"); error ("LHS in noreturn call");
return true; return true;

10
gcc/tree-cfg.h
View File

@ -108,4 +108,14 @@ extern bool gimple_find_sub_bbs (gimple_seq, gimple_stmt_iterator *);
extern bool extract_true_false_controlled_edges (basic_block, basic_block, extern bool extract_true_false_controlled_edges (basic_block, basic_block,
edge *, edge *); edge *, edge *);
/* Return true if the LHS of a call should be removed. */
inline bool
should_remove_lhs_p (tree lhs)
{
return (lhs
&& TREE_CODE (TYPE_SIZE_UNIT (TREE_TYPE (lhs))) == INTEGER_CST
&& !TREE_ADDRESSABLE (TREE_TYPE (lhs)));
}
#endif /* _TREE_CFG_H */ #endif /* _TREE_CFG_H */

3
gcc/tree-cfgcleanup.c
View File

@ -604,8 +604,7 @@ fixup_noreturn_call (gimple *stmt)
temporaries of variable-sized types is not supported. Also don't temporaries of variable-sized types is not supported. Also don't
do this with TREE_ADDRESSABLE types, as assign_temp will abort. */ do this with TREE_ADDRESSABLE types, as assign_temp will abort. */
tree lhs = gimple_call_lhs (stmt); tree lhs = gimple_call_lhs (stmt);
if (lhs && TREE_CODE (TYPE_SIZE_UNIT (TREE_TYPE (lhs))) == INTEGER_CST if (should_remove_lhs_p (lhs))
&& !TREE_ADDRESSABLE (TREE_TYPE (lhs)))
{ {
gimple_call_set_lhs (stmt, NULL_TREE); gimple_call_set_lhs (stmt, NULL_TREE);