From d387808d8bd4e6eda08dd5f1661c1c70a6c9a1b2 Mon Sep 17 00:00:00 2001 From: Javier Miranda Date: Fri, 22 May 2020 15:29:57 -0400 Subject: [PATCH] [Ada] Fix recent regression on _Master declaration gcc/ada/ * exp_ch9.adb (Build_Class_Wide_Master): Insert the declaration of _Master before its use; required to avoid assertion failure in the backend. --- gcc/ada/exp_ch9.adb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb index 70fdf1d1851..c4b98822684 100644 --- a/gcc/ada/exp_ch9.adb +++ b/gcc/ada/exp_ch9.adb @@ -1215,10 +1215,21 @@ package body Exp_Ch9 is if not Has_Master_Entity (Master_Scope) or else No (Current_Entity_In_Scope (Name_Id)) then + declare + Ins_Nod : Node_Id; + begin Set_Has_Master_Entity (Master_Scope); Master_Decl := Build_Master_Declaration (Loc); - Insert_Action (Find_Hook_Context (Related_Node), Master_Decl); + + -- Ensure that the master declaration is placed before its use + + Ins_Nod := Find_Hook_Context (Related_Node); + while not Is_List_Member (Ins_Nod) loop + Ins_Nod := Parent (Ins_Nod); + end loop; + + Insert_Before (First (List_Containing (Ins_Nod)), Master_Decl); Analyze (Master_Decl); -- Mark the containing scope as a task master. Masters associated -- 2.30.2