[multiple changes]

2011-09-15  Robert Dewar  <dewar@adacore.com>

	* tree_io.ads: Minor reformatting.
	* a-intnam.ads: Fix bad header.

2011-09-15  Thomas Quinot  <quinot@adacore.com>

	* a-exexpr-gcc.adb: Minor reformatting.

2011-09-15  Yannick Moy  <moy@adacore.com>

	* sem_ch6.adb: Propagate information that an expression function comes
	from source (otherwise references to this entity are not stored).

From-SVN: r178878

5 files changed, 40 insertions, 7 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 36d4661..8d5c011 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,19 @@
 2011-09-15  Robert Dewar  <dewar@adacore.com>
 
+	* tree_io.ads: Minor reformatting.
+	* a-intnam.ads: Fix bad header.
+
+2011-09-15  Thomas Quinot  <quinot@adacore.com>
+
+	* a-exexpr-gcc.adb: Minor reformatting.
+
+2011-09-15  Yannick Moy  <moy@adacore.com>
+
+	* sem_ch6.adb: Propagate information that an expression function comes
+	from source (otherwise references to this entity are not stored).
+
+2011-09-15  Robert Dewar  <dewar@adacore.com>
+
 	* a-cdlili.adb, a-coinve.adb, a-stzunb-shared.ads, a-suezst.adb,
 	a-suenco.adb, a-stwiun-shared.ads, a-cobove.adb, a-convec.adb,
 	a-btgbso.adb, a-cbdlli.adb, a-suewst.adb: Minor reformatting.
diff --git a/gcc/ada/a-exexpr-gcc.adb b/gcc/ada/a-exexpr-gcc.adb
index 1f11227..6321099 100644
--- a/gcc/ada/a-exexpr-gcc.adb
+++ b/gcc/ada/a-exexpr-gcc.adb
@@ -441,8 +441,7 @@ package body Exception_Propagation is
    --  Unwind_RaiseException to actually do the raise, taking care of
    --  handling the two phase scheme it implements.
 
-   procedure Propagate_Exception
-   is
+   procedure Propagate_Exception is
       Excep         : constant EOA := Get_Current_Excep.all;
       GCC_Exception : GNAT_GCC_Exception_Access;
 
diff --git a/gcc/ada/a-intnam.ads b/gcc/ada/a-intnam.ads
index f50c46a..48a50db 100644
--- a/gcc/ada/a-intnam.ads
+++ b/gcc/ada/a-intnam.ads
@@ -6,10 +6,23 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
--- This specification is derived from the Ada Reference Manual for use with --
--- GNAT.  In accordance with the copyright of that document, you can freely --
--- copy and modify this specification,  provided that if you redistribute a --
--- modified version,  any changes that you have made are clearly indicated. --
+--          Copyright (C) 1995-2011, Free Software Foundation, Inc.         --
+--                                                                          --
+-- GNAT is free software;  you can  redistribute it  and/or modify it under --
+-- terms of the  GNU General Public License as published  by the Free Soft- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
+-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
+-- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
+-- or FITNESS FOR A PARTICULAR PURPOSE.                                     --
+--                                                                          --
+-- As a special exception under Section 7 of GPL version 3, you are granted --
+-- additional permissions described in the GCC Runtime Library Exception,   --
+-- version 3.1, as published by the Free Software Foundation.               --
+--                                                                          --
+-- You should have received a copy of the GNU General Public License and    --
+-- a copy of the GCC Runtime Library Exception along with this program;     --
+-- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
+-- <http://www.gnu.org/licenses/>.                                          --
 --                                                                          --
 ------------------------------------------------------------------------------
 
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index c1d8767..6740dd6 100644
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -325,7 +325,14 @@ package body Sem_Ch6 is
          New_Decl :=
            Make_Subprogram_Declaration (Loc,
              Specification => Copy_Separate_Tree (Specification (N)));
+
+         --  Do rewrite setting Comes_From_Source on the result if the original
+         --  expression function came from source.
+
          Rewrite (N, New_Decl);
+         Set_Comes_From_Source
+           (Defining_Entity (N), Comes_From_Source (Def_Id));
+
          Analyze (N);
          Set_Is_Inlined (Defining_Entity (New_Decl));
 
diff --git a/gcc/ada/tree_io.ads b/gcc/ada/tree_io.ads
index 2afae45..9829436 100644
--- a/gcc/ada/tree_io.ads
+++ b/gcc/ada/tree_io.ads
@@ -54,7 +54,7 @@ package Tree_IO is
    --  format that would result in the compiler being incompatible with an
    --  older version of ASIS.
    --
-   --  27  2011-09-06  Changes in the tree structures for expression functions
+   --  27  Changes in the tree structures for expression functions
 
    procedure Tree_Read_Initialize (Desc : File_Descriptor);
    --  Called to initialize reading of a tree file. This call must be made