sem_util.adb, [...]: Correct false positive warnings.

2014-01-24  Robert Dewar  <dewar@adacore.com>

	* sem_util.adb, lib-xref.adb: Correct false positive warnings.

From-SVN: r207031

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a21fe7cdd2b45442f508aa81c46422c6afd0160c..cabedee249ac935e6e5e331ead39ff647de85357 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-24  Robert Dewar  <dewar@adacore.com>
+
+       * sem_util.adb, lib-xref.adb: Correct false positive warnings.
+
 2014-01-24  Vincent Celier  <celier@adacore.com>
 
        * projects.texi: Document that aggregate projects are only

diff --git a/gcc/ada/lib-xref.adb b/gcc/ada/lib-xref.adb
index a01bbab6a3158fcae248cb492edddacf80f796fa..67739211abca3308c5a76b5397a639f279e3d48f 100644 (file)
--- a/gcc/ada/lib-xref.adb
+++ b/gcc/ada/lib-xref.adb
@@ -432,6 +432,7 @@ package body Lib.Xref is
       --  ??? There are several routines here and there that perform a similar
       --      (but subtly different) computation, which should be factored:
 
+      --      Sem_Util.Is_LHS
       --      Sem_Util.May_Be_Lvalue
       --      Sem_Util.Known_To_Be_Assigned
       --      Exp_Ch2.Expand_Entry_Parameter.In_Assignment_Context
@@ -473,20 +474,27 @@ package body Lib.Xref is
 
             --  ??? case of a slice assignment?
 
-            --  ??? Note that in some cases this is called too early
-            --  (see comments in Sem_Ch8.Find_Direct_Name), at a point where
-            --  the tree is not fully typed yet. In that case we may lack
-            --  an Etype for N, and we must disable the check for an implicit
-            --  dereference. If the dereference is on an LHS, this causes a
-            --  false positive.
-
             elsif (K = N_Selected_Component or else K = N_Indexed_Component)
               and then Prefix (P) = N
-              and then not (Present (Etype (N))
-                              and then
-                            Is_Access_Type (Etype (N)))
             then
-               N := P;
+               --  Check for access type. First a kludge, In some cases this is
+               --  called too early (see comments in Sem_Ch8.Find_Direct_Name),
+               --  at a point where the tree is not fully typed yet. In that
+               --  case we may lack an Etype for N, and we can't check the
+               --  Etype. For now, we always return False in such a case,
+               --  but this is clearly not right in all cases ???
+
+               if No (Etype (N)) then
+                  return False;
+
+               elsif Is_Access_Type (Etype (N)) then
+                  return False;
+
+               --  Access type case dealt with, keep going
+
+               else
+                  N := P;
+               end if;
 
             --  All other cases, definitely not on left side
 

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index b5bb307e8e5dc78b8efaf6d0462ec348ade4e7ed..422e462112950b6fa8b4d50474fda3aa89a2ba2b 100644 (file)
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -9882,7 +9882,12 @@ package body Sem_Util is
          --  a reference as a modification. It is not clear if there are any
          --  other bad consequences. ???
 
-         if Present (Etype (N)) and then Is_Access_Type (Etype (N)) then
+         if No (Etype (N)) then
+            return False;
+
+         --  We have an Etype set, so we can check it
+
+         elsif Is_Access_Type (Etype (N)) then
             return False;
 
          --  OK, not access type case, so just test whole expression