ada: Clean up utility function

This patch makes Sem_Util.Get_Library_Unit_Name use Uname more idiomatically.

gcc/ada/ChangeLog:

	* sem_util.adb (Get_Library_Unit_Name): Improve use of Uname.

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index a7869397bfcdc9adece72b613a739e7ba9526c10..30c1a5236ae70800041819098b0766bc075d6f98 100644 (file)
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -10656,15 +10656,9 @@ package body Sem_Util is
 
    function Get_Library_Unit_Name (Decl_Node : Node_Id) return String_Id is
       Unit_Name_Id : constant Unit_Name_Type := Get_Unit_Name (Decl_Node);
-      Buf : Bounded_String;
+      Buf          : Bounded_String;
    begin
-      Get_Unit_Name_String (Buf, Unit_Name_Id);
-
-      --  Remove the last seven characters (" (spec)" or " (body)")
-
-      Buf.Length := Buf.Length - 7;
-      pragma Assert (Buf.Chars (Buf.Length + 1) = ' ');
-
+      Get_Unit_Name_String (Buf, Unit_Name_Id, Suffix => False);
       return String_From_Name_Buffer (Buf);
    end Get_Library_Unit_Name;