From a8715461c4989d53c66544932b5f677a399c84b3 Mon Sep 17 00:00:00 2001 From: charlet Date: Tue, 6 Jan 2015 10:35:08 +0000 Subject: [PATCH] 2015-01-06 Eric Botcazou * freeze.adb (Freeze_Array_Type) : Remove always true test and unreachable 'else' arm. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219254 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/freeze.adb | 21 ++++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 861d0c8..6e363c3 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2015-01-06 Eric Botcazou + + * freeze.adb (Freeze_Array_Type) : Remove always + true test and unreachable 'else' arm. + 2015-01-06 Vincent Celier * prj-conf.adb (Check_Target): Improve error message when diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index a2fcddc..c07bb56 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -2450,27 +2450,18 @@ package body Freeze is Get_Attribute_Definition_Clause (FS, Attribute_Component_Size); - if Known_Static_Esize (Ctyp) then - Error_Msg_N - ("incorrect component size for " - & T & " components", Clause); - Error_Msg_Uint_1 := Esize (Ctyp); - Error_Msg_N - ("\only allowed value is^", Clause); - - else - Error_Msg_N - ("component size cannot be given for " - & T & " components", Clause); - end if; + Error_Msg_N + ("incorrect component size for " + & T & " components", Clause); + Error_Msg_Uint_1 := Esize (Ctyp); + Error_Msg_N + ("\only allowed value is^", Clause); else Error_Msg_N ("cannot pack " & T & " components", Get_Rep_Pragma (FS, Name_Pack)); end if; - - return; end Complain_CS; -- Start of processing for Alias_Atomic_Check -- 2.7.4