[multiple changes]

2009-07-13  Gary Dismukes  <dismukes@adacore.com>

	* sem_ch10.adb, sem_ch12.adb, gnat1drv.adb, exp_ch4.adb: Fix casing of
	several references to CodePeer.

2009-07-13  Bob Duff  <duff@adacore.com>

	* exp_dist.adb (Build_From_Any_Function,Build_To_Any_Function,
	Build_TypeCode_Function_All): Do not recurse if the type is the base
	type.

From-SVN: r149580

6 files changed, 34 insertions, 15 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 7e8d26d..ed02aea 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,14 @@
+2009-07-13  Gary Dismukes  <dismukes@adacore.com>
+
+	* sem_ch10.adb, sem_ch12.adb, gnat1drv.adb, exp_ch4.adb: Fix casing of
+	several references to CodePeer.
+
+2009-07-13  Bob Duff  <duff@adacore.com>
+
+	* exp_dist.adb (Build_From_Any_Function,Build_To_Any_Function,
+	Build_TypeCode_Function_All): Do not recurse if the type is the base
+	type.
+
 2009-07-13  Robert Dewar  <dewar@adacore.com>
 
 	* exp_ch4.adb: Minor comment change
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index 3a0ab48..178f164 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -4093,7 +4093,7 @@ package body Exp_Ch4 is
          Insert_Action (N, New_If);
          Analyze_And_Resolve (N, Typ);
 
-         --  Link temporary to original expression, for Codepeer
+         --  Link temporary to original expression, for CodePeer
 
          Set_Related_Expression (Cnn, Original_Node (N));
       end if;
diff --git a/gcc/ada/exp_dist.adb b/gcc/ada/exp_dist.adb
index b1e77663..a0ba2f0 100644
--- a/gcc/ada/exp_dist.adb
+++ b/gcc/ada/exp_dist.adb
@@ -8672,7 +8672,9 @@ package body Exp_Dist is
             Use_Opaque_Representation : Boolean;
 
          begin
-            if Is_Itype (Typ) then
+            --  The following test needs a comment ???
+
+            if Is_Itype (Typ) and then Typ /= Base_Type (Typ) then
                Build_From_Any_Function
                   (Loc  => Loc,
                    Typ  => Etype (Typ),
@@ -9497,7 +9499,9 @@ package body Exp_Dist is
             --  opaque sequence of bytes.
 
          begin
-            if Is_Itype (Typ) then
+            --  The following test needs a comment ???
+
+            if Is_Itype (Typ) and then Typ /= Base_Type (Typ) then
                Build_To_Any_Function
                   (Loc  => Loc,
                   Typ  => Etype (Typ),
@@ -10624,8 +10628,12 @@ package body Exp_Dist is
             Type_Name_Str    : String_Id;
             Type_Repo_Id_Str : String_Id;
 
+         --  Start of processing for Build_TypeCode_Function
+
          begin
-            if Is_Itype (Typ) then
+            --  The following test needs a comment ???
+
+            if Is_Itype (Typ) and then Typ /= Base_Type (Typ) then
                Build_TypeCode_Function
                   (Loc  => Loc,
                   Typ  => Etype (Typ),
diff --git a/gcc/ada/gnat1drv.adb b/gcc/ada/gnat1drv.adb
index b787556..c8d9cb3 100644
--- a/gcc/ada/gnat1drv.adb
+++ b/gcc/ada/gnat1drv.adb
@@ -148,7 +148,7 @@ procedure Gnat1drv is
 
       if CodePeer_Mode then
 
-         --  Turn off inlining, confuses codepeer output and gains nothing
+         --  Turn off inlining, confuses CodePeer output and gains nothing
 
          Front_End_Inlining := False;
          Inline_Active      := False;
@@ -164,7 +164,7 @@ procedure Gnat1drv is
          Dynamic_Elaboration_Checks := False;
 
          --  Suppress overflow checks since this is handled implicitely by
-         --  codepeer. Enable all other language checks.
+         --  CodePeer. Enable all other language checks.
 
          Suppress_Options       := (Overflow_Check => True, others => False);
          Enable_Overflow_Checks := False;
@@ -174,7 +174,7 @@ procedure Gnat1drv is
          Debug_Generated_Code := False;
 
          --  Turn cross-referencing on in case it was disabled (by e.g. -gnatD)
-         --  Do we really need to spend time generating xref in codepeer
+         --  Do we really need to spend time generating xref in CodePeer
          --  mode??? Consider setting Xref_Active to False.
 
          Xref_Active := True;
@@ -193,26 +193,26 @@ procedure Gnat1drv is
 
          Generate_SCIL := True;
 
-         --  Enable assertions and debug pragmas, since they give codepeer
+         --  Enable assertions and debug pragmas, since they give CodePeer
          --  valuable extra information.
 
          Assertions_Enabled     := True;
          Debug_Pragmas_Enabled  := True;
 
          --  Suppress compiler warnings, since what we are interested in here
-         --  is what codepeer can find out. Also disable all simple value
+         --  is what CodePeer can find out. Also disable all simple value
          --  propagation. This is an optimization which is valuable for code
          --  optimization, and also for generation of compiler warnings, but
-         --  these are being turned off anyway, and codepeer understands
+         --  these are being turned off anyway, and CodePeer understands
          --  things more clearly if references are not optimized in this way.
 
          Warning_Mode  := Suppress;
          Debug_Flag_MM := True;
 
          --  Set normal RM validity checking, and checking of IN OUT parameters
-         --  (this might give codepeer more useful checks to analyze, to be
+         --  (this might give CodePeer more useful checks to analyze, to be
          --  confirmed???). All other validity checking is turned off, since
-         --  this can generate very complex trees that only confuse codepeer
+         --  this can generate very complex trees that only confuse CodePeer
          --  and do not bring enough useful info.
 
          Reset_Validity_Check_Options;
@@ -221,7 +221,7 @@ procedure Gnat1drv is
          Validity_Check_In_Params     := True;
 
          --  Turn off style check options since we are not interested in any
-         --  front-end warnings when we are getting code peer output.
+         --  front-end warnings when we are getting CodePeer output.
 
          Reset_Style_Check_Options;
       end if;
diff --git a/gcc/ada/sem_ch10.adb b/gcc/ada/sem_ch10.adb
index d715432..970d367 100644
--- a/gcc/ada/sem_ch10.adb
+++ b/gcc/ada/sem_ch10.adb
@@ -742,7 +742,7 @@ package body Sem_Ch10 is
                   --  in its scope. Finally we create a Units table entry for
                   --  the subprogram declaration, to maintain a one-to-one
                   --  correspondence with compilation unit nodes. This is
-                  --  critical for the tree traversals performed by Codepeer.
+                  --  critical for the tree traversals performed by CodePeer.
 
                   declare
                      Loc : constant Source_Ptr := Sloc (N);
diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb
index 9afdb0a..75b2495 100644
--- a/gcc/ada/sem_ch12.adb
+++ b/gcc/ada/sem_ch12.adb
@@ -4374,7 +4374,7 @@ package body Sem_Ch12 is
       --  The new compilation unit is linked to its body, but both share the
       --  same file, so we do not set Body_Required on the new unit so as not
       --  to create a spurious dependency on a non-existent body in the ali.
-      --  This simplifies Codepeer unit traversal.
+      --  This simplifies CodePeer unit traversal.
 
       --  We use the original instantiation compilation unit as the resulting
       --  compilation unit of the instance, since this is the main unit.