From: Arnaud Charlet <charlet@gcc.gnu.org>
Date: Mon, 17 Aug 2009 10:00:43 +0000 (+0200)
Subject: [multiple changes]
X-Git-Tag: releases/gcc-4.5.0~3979
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b01bf852a0c2a50f5511c00c553eaed3b894ef05;p=thirdparty%2Fgcc.git

[multiple changes]

2009-08-17  Robert Dewar  <dewar@adacore.com>

	* tbuild.adb: Minor reformatting

2009-08-17  Thomas Quinot  <quinot@adacore.com>

	* exp_ch4.adb (Exp_Ch4.Expand_N_Slice.Make_Temporary): Rename to
	Make_Temporary_For_Slice to avoid confusion with Tbuild.Make_Temporary.
	Use Tbuild.Make_Temporary to create entity for the temporary.

From-SVN: r150832
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 963d30719d32..5a17cdbe2bee 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,14 @@
+2009-08-17  Robert Dewar  <dewar@adacore.com>
+
+	* make.adb: Add ??? comment
+	* tbuild.adb: Minor reformatting
+
+2009-08-17  Thomas Quinot  <quinot@adacore.com>
+
+	* exp_ch4.adb (Exp_Ch4.Expand_N_Slice.Make_Temporary): Rename to
+	Make_Temporary_For_Slice to avoid confusion with Tbuild.Make_Temporary.
+	Use Tbuild.Make_Temporary to create entity for the temporary.
+
 2009-08-17  Arnaud Charlet  <charlet@adacore.com>
 
 	* make.adb (Process_Multilib, Scan_Make_Arg): Refine previous change
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index acf96b057d8e..949027dd0ae9 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -7447,7 +7447,7 @@ package body Exp_Ch4 is
       --  processing will still generate the appropriate copy in operation,
       --  which will take care of the slice.
 
-      procedure Make_Temporary;
+      procedure Make_Temporary_For_Slice;
       --  Create a named variable for the value of the slice, in cases where
       --  the back-end cannot handle it properly, e.g. when packed types or
       --  unaligned slices are involved.
@@ -7486,14 +7486,13 @@ package body Exp_Ch4 is
          end loop;
       end Is_Procedure_Actual;
 
-      --------------------
-      -- Make_Temporary --
-      --------------------
+      ------------------------------
+      -- Make_Temporary_For_Slice --
+      ------------------------------
 
-      procedure Make_Temporary is
+      procedure Make_Temporary_For_Slice is
          Decl : Node_Id;
-         Ent  : constant Entity_Id :=
-                  Make_Defining_Identifier (Loc, New_Internal_Name ('T'));
+         Ent  : constant Entity_Id := Make_Temporary (Loc, 'T', N);
       begin
          Decl :=
            Make_Object_Declaration (Loc,
@@ -7510,7 +7509,7 @@ package body Exp_Ch4 is
 
          Rewrite (N, New_Occurrence_Of (Ent, Loc));
          Analyze_And_Resolve (N, Typ);
-      end Make_Temporary;
+      end Make_Temporary_For_Slice;
 
    --  Start of processing for Expand_N_Slice
 
@@ -7565,7 +7564,7 @@ package body Exp_Ch4 is
          if Nkind (Parent (N)) = N_Function_Call
            and then Is_Possibly_Unaligned_Slice (N)
          then
-            Make_Temporary;
+            Make_Temporary_For_Slice;
          end if;
 
       elsif Nkind (Parent (N)) = N_Assignment_Statement
@@ -7586,7 +7585,7 @@ package body Exp_Ch4 is
          return;
 
       else
-         Make_Temporary;
+         Make_Temporary_For_Slice;
       end if;
    end Expand_N_Slice;
 
diff --git a/gcc/ada/tbuild.adb b/gcc/ada/tbuild.adb
index 52f6fbf17a18..7273fde67036 100644
--- a/gcc/ada/tbuild.adb
+++ b/gcc/ada/tbuild.adb
@@ -446,7 +446,8 @@ package body Tbuild is
       Related_Node : Node_Id := Empty) return Node_Id
    is
       Temp : constant Node_Id :=
-               Make_Defining_Identifier (Loc, Chars => New_Internal_Name (Id));
+               Make_Defining_Identifier (Loc,
+                 Chars => New_Internal_Name (Id));
    begin
       Set_Related_Expression (Temp, Related_Node);
       return Temp;