From: Arnaud Charlet <charlet@adacore.com>
Date: Mon, 15 Mar 2021 07:45:35 +0000 (-0400)
Subject: [Ada] Relax null exclusion mismatch check in Relaxed_RM_Semantics mode
X-Git-Tag: basepoints/gcc-13~6700
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0becb0faaecc79df3de24bd5467b90cfd08a829a;p=thirdparty%2Fgcc.git

[Ada] Relax null exclusion mismatch check in Relaxed_RM_Semantics mode

gcc/ada/

	* sem_ch6.adb (Null_Exclusions_Match): Relax null exclusion
	mismatch check when Relaxed_RM_Semantics is set.
---

diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 7bca9df72257..d46d3f30326e 100644
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -6265,7 +6265,9 @@ package body Sem_Ch6 is
 
             --  Null exclusion must match
 
-            if not Null_Exclusions_Match (Old_Formal, New_Formal) then
+            if not Relaxed_RM_Semantics
+              and then not Null_Exclusions_Match (Old_Formal, New_Formal)
+            then
                Conformance_Error
                  ("\null exclusion for& does not match", New_Formal);