re PR tree-optimization/86514 (wrong manipulation of 2-dimensional packed array at -O)

	PR tree-optimization/86514
	* tree-ssa-reassoc.c (init_range_entry) <CASE_CONVERT>: Return for a
	conversion to a boolean type from a type with greater precision.

From-SVN: r262684

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7b48f83..5ed47c1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-16  Eric Botcazou  <ebotcazou@adacore.com>
+
+       PR tree-optimization/86514
+       * tree-ssa-reassoc.c (init_range_entry) <CASE_CONVERT>: Return for a
+       conversion to a boolean type from a type with greater precision.
+
 2018-07-16  Tom de Vries  <tdevries@suse.de>
 
        * var-tracking.c (vt_initialize): Print adjusted insn slim if

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9b6fe46..b943f23 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-16  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gnat.dg/opt73.adb: New test.
+
 2018-07-16  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/3698

diff --git a/gcc/testsuite/gnat.dg/opt73.adb b/gcc/testsuite/gnat.dg/opt73.adb
new file mode 100644 (file)
index 0000000..38ab477
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/opt73.adb
@@ -0,0 +1,34 @@
+-- { dg-do run }
+-- { dg-options "-O" }
+
+procedure Opt73 is
+
+   type Terminal_Set_Indexed_By_Non_Terminal is
+     array (Natural range <>, Natural  range <>) of Boolean with Pack;
+
+   type Terminal_Set_Per_Non_Terminal
+     (Last_Terminal     : Natural;
+      Last_Non_Terminal : Natural) is
+   record
+      Map : Terminal_Set_Indexed_By_Non_Terminal
+        (1 .. Last_Non_Terminal, 0 .. Last_Terminal);
+   end record;
+
+   Follow : Terminal_Set_Per_Non_Terminal (5, 4);
+   Expect : Terminal_Set_Per_Non_Terminal :=
+     (5, 4, (1 => (2 => True, others => False),
+             others => (others => False)));
+
+   procedure Get_Follow (Value : out Terminal_Set_Per_Non_Terminal) is
+   begin
+      Value.Map := (others => (others => False));
+      Value.Map (1, 2) := True;
+      Value.Map (2, 0) := Value.Map (2, 0) or Value.Map (1, 0);
+   end;
+
+begin
+   Get_Follow (Follow);
+   if Follow /= Expect then
+      raise Program_Error;
+   end if;
+end;

diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index 97a53cd..41a37ab 100644 (file)
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -2168,8 +2168,13 @@ init_range_entry (struct range_entry *r, tree exp, gimple *stmt)
          continue;
        CASE_CONVERT:
          if (is_bool)
-           goto do_default;
-         if (TYPE_PRECISION (TREE_TYPE (arg0)) == 1)
+           {
+             if ((TYPE_PRECISION (exp_type) == 1
+                  || TREE_CODE (exp_type) == BOOLEAN_TYPE)
+                 && TYPE_PRECISION (TREE_TYPE (arg0)) > 1)
+               return;
+           }
+         else if (TYPE_PRECISION (TREE_TYPE (arg0)) == 1)
            {
              if (TYPE_UNSIGNED (TREE_TYPE (arg0)))
                is_bool = true;