From a59626c8b8497593145aa5969ca30cddaeaa8acd Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Thu, 7 Oct 2021 19:59:09 +0200 Subject: [PATCH] [Ada] Remove redundant guard in expansion of dispatching calls gcc/ada/ * exp_ch3.adb (Make_Predefined_Primitive_Specs, Predefined_Primitive_Bodies): Remove guard with restriction No_Dispatching_Calls. --- gcc/ada/exp_ch3.adb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index 1f4f191..d4373ee 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -10611,11 +10611,9 @@ package body Exp_Ch3 is -- Disp_Requeue -- Disp_Timed_Select - -- Disable the generation of these bodies if No_Dispatching_Calls, - -- Ravenscar or ZFP is active. + -- Disable the generation of these bodies if Ravenscar or ZFP is active if Ada_Version >= Ada_2005 - and then not Restriction_Active (No_Dispatching_Calls) and then not Restriction_Active (No_Select_Statements) and then RTE_Available (RE_Select_Specific_Data) then @@ -11094,8 +11092,7 @@ package body Exp_Ch3 is -- The interface versions will have null bodies - -- Disable the generation of these bodies if No_Dispatching_Calls, - -- Ravenscar or ZFP is active. + -- Disable the generation of these bodies if Ravenscar or ZFP is active -- In VM targets we define these primitives in all root tagged types -- that are not interface types. Done because in VM targets we don't @@ -11114,7 +11111,6 @@ package body Exp_Ch3 is or else (not Tagged_Type_Expansion and then Tag_Typ = Root_Type (Tag_Typ))) - and then not Restriction_Active (No_Dispatching_Calls) and then not Restriction_Active (No_Select_Statements) and then RTE_Available (RE_Select_Specific_Data) then -- 2.7.4