From: Piotr Trojanek <trojanek@adacore.com>
Date: Fri, 25 Jun 2021 10:45:57 +0000 (+0200)
Subject: [Ada] Fix repeated generation of dispatch tables in CodePeer mode
X-Git-Tag: basepoints/gcc-13~4612
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a8e133af28f8039740d09c650f0eca0a03113f6;p=thirdparty%2Fgcc.git

[Ada] Fix repeated generation of dispatch tables in CodePeer mode

gcc/ada/

	* exp_disp.adb (Make_DT): Move call to Set_Has_Dispatch_Table,
	so it is executed regardless of the Generate_SCIL mode.
---

diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb
index 4db883cd296b..647068f38206 100644
--- a/gcc/ada/exp_disp.adb
+++ b/gcc/ada/exp_disp.adb
@@ -6610,7 +6610,6 @@ package body Exp_Disp is
       Append_Elmt (DT, DT_Decl);
 
       Analyze_List (Result, Suppress => All_Checks);
-      Set_Has_Dispatch_Table (Typ);
 
       --  Mark entities containing dispatch tables. Required by the backend to
       --  handle them properly.
@@ -6643,6 +6642,8 @@ package body Exp_Disp is
 
    <<Leave_SCIL>>
 
+      Set_Has_Dispatch_Table (Typ);
+
       --  Register the tagged type in the call graph nodes table
 
       Register_CG_Node (Typ);