OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR tree-optimization/32589 (exp_dbug.adb:981: error: invalid array index) 

PR tree-optimization/32589
	* doc/tree-ssa.texi (Rough GIMPLE Grammar): Add missing rule.
	* tree-gimple.c (is_gimple_min_invariant): Clarify head comment.
	* tree-ssa-propagate.c (valid_gimple_expression_p): New
	predicate, extracted from...
	(set_rhs): ...here.  Call it for the expression on entry.
	* tree-ssa-propagate.h (valid_gimple_expression_p): Declare.
	* tree-ssa-sccvn.c: Include tree-ssa-propagate.h.
	(simplify_binary_expression): Use valid_gimple_expression_p
	to validate the simplification.
	* Makefile.in (tree-ssa-sccvn.o): Depends on tree-ssa-propagate.h.

From-SVN: r126545
This commit is contained in:
Eric Botcazou 2007-07-11 09:43:25 +00:00 committed by Eric Botcazou
parent 13c0a63051
commit c2979eaf57
10 changed files with 74 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gcc/ChangeLog
View File

@ -1,10 +1,23 @@
2007-07-11 Eric Botcazou <ebotcazou@adacore.com>
PR tree-optimization/32589
* doc/tree-ssa.texi (Rough GIMPLE Grammar): Add missing rule.
* tree-gimple.c (is_gimple_min_invariant): Clarify head comment.
* tree-ssa-propagate.c (valid_gimple_expression_p): New
predicate, extracted from...
(set_rhs): ...here. Call it for the expression on entry.
* tree-ssa-propagate.h (valid_gimple_expression_p): Declare.
* tree-ssa-sccvn.c: Include tree-ssa-propagate.h.
(simplify_binary_expression): Use valid_gimple_expression_p
to validate the simplification.
* Makefile.in (tree-ssa-sccvn.o): Depends on tree-ssa-propagate.h.
2007-07-11 Danny Smith <dannysmith@users.sourceforge.net>
* config/i386/cygming.h (PREFERRED_DEBUGGING_TYPE): Define to
DWARF2_DEBUG on 32 bit target too.
(DWARF2_UNWIND_INFO): Reorganize 64-bit vs 32-bit definition.
2007-07-11 Nick Clifton <nickc@redhat.com>
* config/m32r/m32r.h (INITIALIZE_TRAMPOLINE): Provide alternative

2
gcc/Makefile.in
View File

@ -2042,7 +2042,7 @@ tree-ssa-sccvn.o : tree-ssa-sccvn.c $(TREE_FLOW_H) $(CONFIG_H) \
$(SYSTEM_H) $(TREE_H) $(GGC_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) \
$(TM_H) coretypes.h $(TREE_DUMP_H) tree-pass.h $(FLAGS_H) $(CFGLOOP_H) \
alloc-pool.h $(BASIC_BLOCK_H) bitmap.h $(HASHTAB_H) $(TREE_GIMPLE_H) \
$(TREE_INLINE_H) tree-iterator.h tree-ssa-sccvn.h
$(TREE_INLINE_H) tree-iterator.h tree-ssa-propagate.h tree-ssa-sccvn.h
tree-vn.o : tree-vn.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) \
$(TREE_H) $(TREE_FLOW_H) $(HASHTAB_H) langhooks.h tree-pass.h \
$(TREE_DUMP_H) $(DIAGNOSTIC_H) tree-ssa-sccvn.h

6
gcc/doc/tree-ssa.texi
View File

@ -1,4 +1,4 @@
@c Copyright (c) 2004, 2005 Free Software Foundation, Inc.
@c Copyright (c) 2004, 2005, 2007 Free Software Foundation, Inc.
@c Free Software Foundation, Inc.
@c This is part of the GCC manual.
@c For copying conditions, see the file gcc.texi.
@ -680,7 +680,7 @@ void f()
bitfieldref : BIT_FIELD_REF
op0 -> inner-compref
op1 -> CONST
op2 -> var
op2 -> val
compref : inner-compref
| TARGET_MEM_REF
@ -718,6 +718,8 @@ void f()
op1 -> val
val : ID
| invariant ADDR_EXPR
op0 -> addr-expr-arg
| CONST
rhs : lhs

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2007-07-11 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/invariant_index.ad[sb]: New test.
2007-07-11 Paolo Carlini <pcarlini@suse.de>
PR c++/32560

14
gcc/testsuite/gnat.dg/invariant_index.adb Normal file
View File

@ -0,0 +1,14 @@
-- { dg-do compile }
-- { dg-options "-O -gnatp" }
package body Invariant_Index is
procedure Proc (S : String) is
N : constant Integer := S'Length;
begin
Name_Buffer (1 + N .. Name_Len + N) := Name_Buffer (1 .. Name_Len);
Name_Buffer (1 .. N) := S;
Name_Len := Name_Len + N;
end;
end Invariant_Index;

8
gcc/testsuite/gnat.dg/invariant_index.ads Normal file
View File

@ -0,0 +1,8 @@
package Invariant_Index is
Name_Buffer : String (1 .. 100);
Name_Len : Natural;
procedure Proc (S : String);
end Invariant_Index;

2
gcc/tree-gimple.c
View File

@ -166,7 +166,7 @@ is_gimple_addressable (tree t)
|| INDIRECT_REF_P (t));
}
/* Return true if T is function invariant. Or rather a restricted
/* Return true if T is a GIMPLE minimal invariant. It's a restricted
form of function invariant. */
bool

32
gcc/tree-ssa-propagate.c
View File

@ -573,24 +573,17 @@ get_rhs (tree stmt)
}
/* Set the main expression of *STMT_P to EXPR. If EXPR is not a valid
GIMPLE expression no changes are done and the function returns
false. */
/* Return true if EXPR is a valid GIMPLE expression. */
bool
set_rhs (tree *stmt_p, tree expr)
valid_gimple_expression_p (tree expr)
{
tree stmt = *stmt_p, op;
enum tree_code code = TREE_CODE (expr);
stmt_ann_t ann;
tree var;
ssa_op_iter iter;
/* Verify the constant folded result is valid gimple. */
switch (TREE_CODE_CLASS (code))
{
case tcc_declaration:
if (!is_gimple_variable(expr))
if (!is_gimple_variable (expr))
return false;
break;
@ -665,6 +658,25 @@ set_rhs (tree *stmt_p, tree expr)
return false;
}
return true;
}
/* Set the main expression of *STMT_P to EXPR. If EXPR is not a valid
GIMPLE expression no changes are done and the function returns
false. */
bool
set_rhs (tree *stmt_p, tree expr)
{
tree stmt = *stmt_p, op;
stmt_ann_t ann;
tree var;
ssa_op_iter iter;
if (!valid_gimple_expression_p (expr))
return false;
if (EXPR_HAS_LOCATION (stmt)
&& (EXPR_P (expr)
|| GIMPLE_STMT_P (expr))

1
gcc/tree-ssa-propagate.h
View File

@ -114,6 +114,7 @@ typedef enum ssa_prop_result (*ssa_prop_visit_phi_fn) (tree);
/* In tree-ssa-propagate.c */
void ssa_propagate (ssa_prop_visit_stmt_fn, ssa_prop_visit_phi_fn);
tree get_rhs (tree);
bool valid_gimple_expression_p (tree expr);
bool set_rhs (tree *, tree);
tree first_vdef (tree);
bool stmt_makes_single_load (tree);

35
gcc/tree-ssa-sccvn.c
View File

@ -43,6 +43,7 @@ Boston, MA 02110-1301, USA. */
#include "bitmap.h"
#include "langhooks.h"
#include "cfgloop.h"
#include "tree-ssa-propagate.h"
#include "tree-ssa-sccvn.h"
/* This algorithm is based on the SCC algorithm presented by Keith
@ -1397,42 +1398,16 @@ simplify_binary_expression (tree rhs)
else if (SSA_VAL (op1) != VN_TOP && SSA_VAL (op1) != op1)
op1 = VN_INFO (op1)->valnum;
}
result = fold_binary (TREE_CODE (rhs), TREE_TYPE (rhs), op0, op1);
/* Make sure result is not a complex expression consisting
of operators of operators (IE (a + b) + (a + c))
Otherwise, we will end up with unbounded expressions if
fold does anything at all. */
if (result)
{
if (is_gimple_min_invariant (result))
return result;
else if (SSA_VAR_P (result))
return result;
else if (EXPR_P (result))
{
switch (TREE_CODE_CLASS (TREE_CODE (result)))
{
case tcc_unary:
{
tree op0 = TREE_OPERAND (result, 0);
if (!EXPR_P (op0))
return result;
}
break;
case tcc_binary:
{
tree op0 = TREE_OPERAND (result, 0);
tree op1 = TREE_OPERAND (result, 1);
if (!EXPR_P (op0) && !EXPR_P (op1))
return result;
}
break;
default:
break;
}
}
}
if (result && valid_gimple_expression_p (result))
return result;
return NULL_TREE;
}