From: Bob Duff <duff@adacore.com>
Date: Fri, 13 Jan 2023 13:34:45 +0000 (-0500)
Subject: ada: Remove duplicated code in Proc_Next_Component_Or_Discriminant
X-Git-Tag: basepoints/gcc-15~9296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ade343e6694ffeb4d587db073b19d5da5e1c3003;p=thirdparty%2Fgcc.git

ada: Remove duplicated code in Proc_Next_Component_Or_Discriminant

Proc_Next_Component_Or_Discriminant was duplicating the code
in Next_Component_Or_Discriminant.

gcc/ada/

	* einfo-utils.adb:
	(Proc_Next_Component_Or_Discriminant): Call
	Next_Component_Or_Discriminant.
---

diff --git a/gcc/ada/einfo-utils.adb b/gcc/ada/einfo-utils.adb
index dc379cbc8529..a8220e2d1336 100644
--- a/gcc/ada/einfo-utils.adb
+++ b/gcc/ada/einfo-utils.adb
@@ -3219,11 +3219,7 @@ package body Einfo.Utils is
 
    procedure Proc_Next_Component_Or_Discriminant (N : in out Node_Id) is
    begin
-      N := Next_Entity (N);
-      while Present (N) loop
-         exit when Ekind (N) in E_Component | E_Discriminant;
-         N := Next_Entity (N);
-      end loop;
+      N := Next_Component_Or_Discriminant (N);
    end Proc_Next_Component_Or_Discriminant;
 
    procedure Proc_Next_Discriminant              (N : in out Node_Id) is