Patchwork Fix PR44890

login
register
mail settings
Submitter Richard Guenther
Date July 9, 2010, 6:30 p.m.
Message ID <alpine.LNX.2.00.1007092030180.1429@zhemvz.fhfr.qr>
Download mbox | patch
Permalink /patch/58423/
State New
Headers show

Comments

Richard Guenther - July 9, 2010, 6:30 p.m.
This fixes PR44890 - IVOPTs still sometimes creates non-pointer
induction variables for TMR_BASE.

Bootstrapped and tested on x86_64-unknown-linux-gnu, applied.

2010-07-09  Richard Guenther  <rguenther@suse.de>

	PR middle-end/44890
	* tree-ssa-address.c (create_mem_ref_raw): Only build a MEM_REF
	if base is a pointer.
	* tree-cfg.c (verify_expr): Update MEM_REF checking.

Patch

Index: gcc/tree-ssa-address.c
===================================================================
--- gcc/tree-ssa-address.c	(revision 161994)
+++ gcc/tree-ssa-address.c	(working copy)
@@ -352,7 +352,8 @@  create_mem_ref_raw (tree type, tree alia
   /* If possible use a plain MEM_REF instead of a TARGET_MEM_REF.  */
   if (alias_ptr_type
       && !addr->index
-      && !addr->step)
+      && !addr->step
+      && (!addr->base || POINTER_TYPE_P (TREE_TYPE (addr->base))))
     {
       tree base, offset;
       gcc_assert (!addr->symbol ^ !addr->base);
Index: gcc/tree-cfg.c
===================================================================
--- gcc/tree-cfg.c	(revision 161994)
+++ gcc/tree-cfg.c	(working copy)
@@ -2610,7 +2679,8 @@  verify_expr (tree *tp, int *walk_subtree
 
     case MEM_REF:
       x = TREE_OPERAND (t, 0);
-      if (!is_gimple_mem_ref_addr (x))
+      if (!POINTER_TYPE_P (TREE_TYPE (x))
+	  || !is_gimple_mem_ref_addr (x))
 	{
 	  error ("Invalid first operand of MEM_REF.");
 	  return x;