re PR middle-end/81695 (internal compiler error: in size_binop_loc, at fold-const...

	PR middle/81695
	* fold-const.c (fold_indirect_ref_1): Restore original behavior
	regarding size_zero_node.

From-SVN: r251119

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cea00bef1fb25e7f1bd6a32b1d40f27d72e2d98c..6cd2ea6616feb683f8bb2175ff10c669da2da772 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-16  Marek Polacek  <polacek@redhat.com>
+
+       PR middle/81695
+       * fold-const.c (fold_indirect_ref_1): Restore original behavior
+       regarding size_zero_node.
+
 2017-08-16  Martin Liska  <mliska@suse.cz>
 
        PR target/81753

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 5a118ca50a18cc3fbf03aadfad87b58d41c00e28..0a5b168c3200168c04bc313eca53f56d313bf8f6 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -14109,22 +14109,19 @@ fold_indirect_ref_1 (location_t loc, tree type, tree op0)
                   && type == TREE_TYPE (op00type))
            {
              tree type_domain = TYPE_DOMAIN (op00type);
-             tree min;
-             if (type_domain != NULL_TREE
-                 && (min = TYPE_MIN_VALUE (type_domain))
-                 && TREE_CODE (min) == INTEGER_CST)
+             tree min = size_zero_node;
+             if (type_domain && TYPE_MIN_VALUE (type_domain))
+               min = TYPE_MIN_VALUE (type_domain);
+             offset_int off = wi::to_offset (op01);
+             offset_int el_sz = wi::to_offset (TYPE_SIZE_UNIT (type));
+             offset_int remainder;
+             off = wi::divmod_trunc (off, el_sz, SIGNED, &remainder);
+             if (remainder == 0 && TREE_CODE (min) == INTEGER_CST)
                {
-                 offset_int off = wi::to_offset (op01);
-                 offset_int el_sz = wi::to_offset (TYPE_SIZE_UNIT (type));
-                 offset_int remainder;
-                 off = wi::divmod_trunc (off, el_sz, SIGNED, &remainder);
-                 if (remainder == 0)
-                   {
-                     off = off + wi::to_offset (min);
-                     op01 = wide_int_to_tree (sizetype, off);
-                     return build4_loc (loc, ARRAY_REF, type, op00, op01,
-                                        NULL_TREE, NULL_TREE);
-                   }
+                 off = off + wi::to_offset (min);
+                 op01 = wide_int_to_tree (sizetype, off);
+                 return build4_loc (loc, ARRAY_REF, type, op00, op01,
+                                    NULL_TREE, NULL_TREE);
                }
            }
        }