4 files changed, 17 insertions, 5 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index bcd2dd9c92e..ea30d6d834e 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-22  Robert Dewar  <dewar@adacore.com>
+
+	* lib-load.adb: MInor reformatting
+
+	* lib-load.ads: Minor reformatting
+
+	* sinfo.ads: Minor reformatting
+
 2009-04-22  Bob Duff  <duff@adacore.com>
 
 	* exp_pakd.adb: Minor comment fixes.
diff --git a/gcc/ada/lib-load.adb b/gcc/ada/lib-load.adb
index c582e1e5841..0bce92577cd 100644
--- a/gcc/ada/lib-load.adb
+++ b/gcc/ada/lib-load.adb
@@ -768,6 +768,7 @@ package body Lib.Load is
 
    procedure Make_Instance_Unit (N : Node_Id; In_Main : Boolean) is
       Sind : constant Source_File_Index := Source_Index (Main_Unit);
+
    begin
       Units.Increment_Last;
 
@@ -782,9 +783,11 @@ package body Lib.Load is
          Units.Table (Main_Unit).Version        := Source_Checksum (Sind);
 
       else
-         --  Duplicate information from instance unit, for the body.
-         Units.Table (Units.Last) :=
-           Units.Table (Get_Cunit_Unit_Number (Library_Unit (N)));
+         --  Duplicate information from instance unit, for the body
+         --  The unit node N has been rewritten as a body, but it was placed
+         --  in the units table when first loaded as a declaration.
+
+         Units.Table (Units.Last) := Units.Table (Get_Cunit_Unit_Number (N));
          Units.Table (Units.Last).Cunit := N;
       end if;
    end Make_Instance_Unit;
diff --git a/gcc/ada/lib-load.ads b/gcc/ada/lib-load.ads
index 088cc382499..fe1fd6eaeb2 100644
--- a/gcc/ada/lib-load.ads
+++ b/gcc/ada/lib-load.ads
@@ -176,6 +176,7 @@ package Lib.Load is
    --  We create an additional entry for the body, so that the binder can
    --  generate the proper elaboration calls to both. The argument N is the
    --  compilation unit node created for the body.
+   --
    --  If the instance is not the main program, we still generate the instance
    --  body even though we do not generate code for it. In that case we still
    --  generate a compilation unit node for it, and we need to make an entry
diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads
index df677a44473..d45b4b039ba 100644
--- a/gcc/ada/sinfo.ads
+++ b/gcc/ada/sinfo.ads
@@ -33,8 +33,8 @@
 --  package provides a basic tree structure. Sinfo describes how this structure
 --  is used to represent the syntax of an Ada program.
 
---  The grammar in the RM is followed very closely in the tree
---  design, and is repeated as part of this source file.
+--  The grammar in the RM is followed very closely in the tree design, and is
+--  repeated as part of this source file.
 
 --  The tree contains not only the full syntactic representation of the
 --  program, but also the results of semantic analysis. In particular, the