diff mbox series

[COMMITTED] ada: Tune warning about assignment just before a raise statement

Message ID 20230525080526.1955679-1-poulhies@adacore.com
State Accepted
Headers
Series [COMMITTED] ada: Tune warning about assignment just before a raise statement |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Marc Poulhiès May 25, 2023, 8:05 a.m. UTC 
  From: Piotr Trojanek <trojanek@adacore.com>

Tune warning about a possibly ineffective assignment to a formal
parameter that happens just before a raise statement.

The warning is now emitted for parameters of all by-copy types and not
just of scalar types (this gives more warnings), but is suppressed for
aliased parameters (this removes some spurious warnings).

gcc/ada/

	* sem_ch11.adb (Analyze_Raise_Expression): Tune warning condition.
	* libgnat/g-dirope.ads (Open): Remove a potentially inaccurate comment.
	* libgnat/g-dirope.adb (Open): Remove a potentially useless assignment;
	the Dir output parameter should be assigned a null value anyway by the
	preceding call to Free.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/libgnat/g-dirope.adb | 1 -
 gcc/ada/libgnat/g-dirope.ads | 3 +--
 gcc/ada/sem_ch11.adb         | 7 ++++---
 3 files changed, 5 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/gcc/ada/libgnat/g-dirope.adb b/gcc/ada/libgnat/g-dirope.adb
index 127f6ba8e80..3cebc9fe4a7 100644
--- a/gcc/ada/libgnat/g-dirope.adb
+++ b/gcc/ada/libgnat/g-dirope.adb
@@ -636,7 +636,6 @@  package body GNAT.Directory_Operations is
 
       if not Is_Open (Dir) then
          Free (Dir);
-         Dir := Null_Dir;
          raise Directory_Error;
       end if;
    end Open;
diff --git a/gcc/ada/libgnat/g-dirope.ads b/gcc/ada/libgnat/g-dirope.ads
index a3a8e4635f0..cdb99ff3267 100644
--- a/gcc/ada/libgnat/g-dirope.ads
+++ b/gcc/ada/libgnat/g-dirope.ads
@@ -210,8 +210,7 @@  package GNAT.Directory_Operations is
    procedure Open (Dir : out Dir_Type; Dir_Name : Dir_Name_Str);
    --  Opens the directory named by Dir_Name and returns a Dir_Type value
    --  that refers to this directory, and is positioned at the first entry.
-   --  Raises Directory_Error if Dir_Name cannot be accessed. In that case
-   --  Dir will be set to Null_Dir.
+   --  Raises Directory_Error if Dir_Name cannot be accessed.
 
    procedure Close (Dir : in out Dir_Type);
    --  Closes the directory stream referred to by Dir. After calling Close
diff --git a/gcc/ada/sem_ch11.adb b/gcc/ada/sem_ch11.adb
index 5471111d682..73eca7a603e 100644
--- a/gcc/ada/sem_ch11.adb
+++ b/gcc/ada/sem_ch11.adb
@@ -543,11 +543,12 @@  package body Sem_Ch11 is
             if Present (P) and then Nkind (P) = N_Assignment_Statement then
                L := Name (P);
 
-               --  Give warning for assignment to scalar formal
+               --  Give warning for assignment to by-copy formal
 
-               if Is_Scalar_Type (Etype (L))
-                 and then Is_Entity_Name (L)
+               if Is_Entity_Name (L)
                  and then Is_Formal (Entity (L))
+                 and then Is_By_Copy_Type (Etype (L))
+                 and then not Is_Aliased (Entity (L))
 
                  --  Do this only for parameters to the current subprogram.
                  --  This avoids some false positives for the nested case.