[COMMITTED] ada: Fix spurious emissions of -gnatwj warning

Message ID 20230105144009.156114-1-poulhies@adacore.com
State Repeat Merge
Headers
Series [COMMITTED] ada: Fix spurious emissions of -gnatwj warning |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Marc Poulhiès Jan. 5, 2023, 2:40 p.m. UTC
  From: Ronan Desplanques <desplanques@adacore.com>

Before this patch, the compiler would erroneously emit a warning
about the use of parentheses for array aggregates being discouraged
in some situations. Those situations were the ones where array
aggregates were used as generic actuals when instantiating generic
packages defined in the runtime library.

This patch fixes this issue by looking at the Ada version explicitly
specified by the user instead of the Ada_Version flag which is
always set to the latest Ada version when compiling code from the
runtime library.

gcc/ada/

	* sem_aggr.adb (Resolve_Array_Aggregate): Tweak conditions for
	warning about use of parentheses for array aggregates.

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

---
 gcc/ada/sem_aggr.adb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Patch

diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
index 433f1ac84ca..958b2bbbd18 100644
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -1922,7 +1922,7 @@  package body Sem_Aggr is
 
       --  Disable the warning for GNAT Mode to allow for easier transition.
 
-      if Ada_Version >= Ada_2022
+      if Ada_Version_Explicit >= Ada_2022
         and then Warn_On_Obsolescent_Feature
         and then not GNAT_Mode
         and then not Is_Homogeneous_Aggregate (N)