[multiple changes]

2017-04-27  Gary Dismukes  <dismukes@adacore.com>

	* exp_util.adb: Minor reformatting.

2017-04-27  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch4.adb: Fix copy/pasto.

From-SVN: r247381

gcc/ada/ChangeLog

+2017-04-27  Gary Dismukes  <dismukes@adacore.com>
+
+	* exp_util.adb: Minor reformatting.
+
+2017-04-27  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch4.adb: Fix copy/pasto.
+
 2017-04-27  Tristan Gingold  <gingold@adacore.com>
 
 	* gcc-interface/Make-lang.in: Define EH_MECHANISM while building

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)

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;