From: Piotr Trojanek <trojanek@adacore.com>
Date: Wed, 9 Feb 2022 16:15:27 +0000 (+0100)
Subject: [Ada] Accept raise expressions as operands of boolean operators
X-Git-Tag: basepoints/gcc-14~6851
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c97014ce88150584689a2ae9a95d8a40115e0423;p=thirdparty%2Fgcc.git

[Ada] Accept raise expressions as operands of boolean operators

This patch restores the previous behaviour of a recently rewritten
routine Sem_Ch4.Find_Boolean_Types for boolean operators where one of
the operands is a raise-expression, e.g.:

  (raise Program_Error or else (X /= Y))

This change is required for the Entity field of the "or else" operator
to be set. For GNAT it doesn't matter, but GNATprove requires this field
to be set.

The affected call sequence starts at Find_Boolean_Types, goes via
Check_Right_Argument and Check_Boolean_Pair to Valid_Boolean_Arg, which
ultimately guards a call to Add_One_Interp.

gcc/ada/

	* sem_type.adb (Valid_Boolean_Arg): Operands of Raise_Type are
	valid boolean arguments.
---

diff --git a/gcc/ada/sem_type.adb b/gcc/ada/sem_type.adb
index 4476ea970e9..e947296c9a2 100644
--- a/gcc/ada/sem_type.adb
+++ b/gcc/ada/sem_type.adb
@@ -3507,6 +3507,7 @@ package body Sem_Type is
         or else Is_Modular_Integer_Type (T)
         or else T = Universal_Integer
         or else T = Any_Composite
+        or else T = Raise_Type
       then
          return True;