re PR middle-end/44890 (Hitting gcc_assert in build2_stat with pr30388.c testsuite...

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.

From-SVN: r162005

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e7c944f8b0d9c618741f9f4d412acf37c8a93f40..b3c9f387d3554d47ac77c902f7a405ea0d85a90a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
 2010-07-08  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        PR target/44877

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index c7007937c474624f3ad2ebe3edfccd3959585217..9e38ca717a114be740f2b9b653f408c8e8883ea1 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -2610,7 +2610,8 @@ verify_expr (tree *tp, int *walk_subtrees, void *data ATTRIBUTE_UNUSED)
 
     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;

diff --git a/gcc/tree-ssa-address.c b/gcc/tree-ssa-address.c
index cf7a81d66d00c9475a5ce28be25141dcede3915d..f49bf14caeadc54576a9258c781025a8ae46011e 100644 (file)
--- a/gcc/tree-ssa-address.c
+++ b/gcc/tree-ssa-address.c
@@ -352,7 +352,8 @@ create_mem_ref_raw (tree type, tree alias_ptr_type, struct mem_address *addr)
   /* 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);