From: Robert Dewar <dewar@adacore.com>
Date: Tue, 4 Feb 2014 14:52:05 +0000 (+0000)
Subject: exp_ch5.adb, [...]: Minor reformatting.
X-Git-Tag: releases/gcc-4.9.0~1103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e247e586cb2b7cdc3519b3dddd1c50749a810ce;p=thirdparty%2Fgcc.git

exp_ch5.adb, [...]: Minor reformatting.

2014-02-04  Robert Dewar  <dewar@adacore.com>

	* exp_ch5.adb, einfo.ads, freeze.adb, sem_ch8.adb: Minor reformatting.

From-SVN: r207470
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 8f43cfe9de64..84171985fb3d 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-04  Robert Dewar  <dewar@adacore.com>
+
+	* exp_ch5.adb, einfo.ads, freeze.adb, sem_ch8.adb: Minor reformatting.
+
 2014-02-04  Gary Dismukes  <dismukes@adacore.com>
 
 	* sem_aggr.adb: Change "runtime" to "run time" in warning message,
diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads
index fae25dee0fdc..18a1e18d1c94 100644
--- a/gcc/ada/einfo.ads
+++ b/gcc/ada/einfo.ads
@@ -2775,7 +2775,7 @@ package Einfo is
 
 --    Is_Pure (Flag44)
 --       Defined in all entities. Set in all entities of a unit to which a
---       pragma Pure is applied except for non intrinsic imported subprogram,
+--       pragma Pure is applied except for non-intrinsic imported subprograms,
 --       and also set for the entity of the unit itself. In addition, this
 --       flag may be set for any other functions or procedures that are known
 --       to be side effect free, so in the case of subprograms, the Is_Pure
diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb
index d64d0c82a93e..a65365b2595d 100644
--- a/gcc/ada/exp_ch5.adb
+++ b/gcc/ada/exp_ch5.adb
@@ -3132,7 +3132,7 @@ package body Exp_Ch5 is
                --  the element is a constant in the loop.
 
                if No (Find_Value_Of_Aspect
-                       (Container_Typ, Aspect_Variable_Indexing))
+                        (Container_Typ, Aspect_Variable_Indexing))
                then
                   Set_Ekind (Id, E_Constant);
                end if;
diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index ad74fba927b8..93e7248abff3 100644
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -6521,6 +6521,11 @@ package body Freeze is
       --  can bypass the normal check to ensure that pure units call only pure
       --  subprograms.
 
+      --  The reason for the intrinsic exception is that in general, intrinsic
+      --  functions (such as shifts) are pure anyway. The only exceptions are
+      --  the intrinsics in GNAT.Source_Info, and that unit is not marked Pure
+      --  in any case, so no problem arises.
+
       if Is_Imported (E)
         and then Is_Pure (E)
         and then not Has_Pragma_Pure_Function (E)
diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb
index da5c6002ac1e..bb9894711a35 100644
--- a/gcc/ada/sem_ch8.adb
+++ b/gcc/ada/sem_ch8.adb
@@ -1195,7 +1195,8 @@ package body Sem_Ch8 is
 
       --  Set the Ekind of the entity, unless it has been set already, as is
       --  the case for the iteration object over a container with no variable
-      --  indexing.
+      --  indexing. In that case it's been marked as a constant, and we do not
+      --  want to change it to a variable.
 
       if Ekind (Id) /= E_Constant then
          Set_Ekind (Id, E_Variable);