From e6326de502f1ab27024182ef38255a7ae65fdd2d Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Fri, 28 Apr 2017 15:25:02 +0200 Subject: [PATCH] [multiple changes] 2017-04-27 Gary Dismukes * exp_util.adb: Minor reformatting. 2017-04-27 Ed Schonberg * sem_ch4.adb: Fix copy/pasto. From-SVN: r247381 --- gcc/ada/ChangeLog | 8 ++++++++ gcc/ada/exp_util.adb | 2 +- gcc/ada/sem_ch4.adb | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 3bab80e2788..ce8aa6fbdad 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2017-04-27 Gary Dismukes + + * exp_util.adb: Minor reformatting. + +2017-04-27 Ed Schonberg + + * sem_ch4.adb: Fix copy/pasto. + 2017-04-27 Tristan Gingold * gcc-interface/Make-lang.in: Define EH_MECHANISM while building diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb index 056a034078e..0430d647558 100644 --- a/gcc/ada/exp_util.adb +++ b/gcc/ada/exp_util.adb @@ -1118,7 +1118,7 @@ package body Exp_Util is -- GNATprove mode, we must build a wrapper for the current -- inherited operation. If the reference is the prefix of an -- attribute such as 'Result (or others ???) there is no need - -- for a wrapper: the condition is just rewritten in terms of + -- for a wrapper: the condition is just rewritten in terms of -- the inherited subprogram. if Is_Subprogram (New_E) diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index 41e6ca5a10a..21ab45478ae 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -7373,7 +7373,7 @@ package body Sem_Ch4 is if Nkind (Right_Opnd (N)) = N_Integer_Literal then Remove_Address_Interpretations (Second_Op); - elsif Nkind (Right_Opnd (N)) = N_Integer_Literal then + elsif Nkind (Left_Opnd (N)) = N_Integer_Literal then Remove_Address_Interpretations (First_Op); end if; end if; -- 2.30.2