[multiple changes]

2010-06-14  Robert Dewar  <dewar@adacore.com>

	* sem.adb, sem_ch12.adb, sem_util.adb: Minor reformatting and
	comment addition.

2010-06-14  Arnaud Charlet  <charlet@adacore.com>

	* lib-xref.ads: Doc updates:
	 - Allocate 'Q' for #include entity kind
	 - Free 'Z'
	 - Allocate 'g' for regular macros
	 - Allocate 'G' for function-like macros

From-SVN: r160726

gcc/ada/ChangeLog

+2010-06-14  Robert Dewar  <dewar@adacore.com>
+
+	* sem.adb, sem_ch12.adb, sem_util.adb: Minor reformatting and
+	comment addition.
+
+2010-06-14  Arnaud Charlet  <charlet@adacore.com>
+
+	* lib-xref.ads: Doc updates:
+	 - Allocate 'Q' for #include entity kind
+	 - Free 'Z'
+	 - Allocate 'g' for regular macros
+	 - Allocate 'G' for function-like macros
+
 2010-06-14  Ed Schonberg  <schonberg@adacore.com>
 
 	* sinfo.ads, sinfo.adb (Withed_Body): New attribute of a with_clause.

gcc/ada/lib-xref.ads

@@ -541,7 +541,7 @@ package Lib.Xref is
    --    d     decimal fixed-point object      decimal fixed-point type
    --    e     non-Boolean enumeration object  non_Boolean enumeration type
    --    f     floating-point object           floating-point type
-   --    g     (unused)                        (unused)
+   --    g     C/C++ macro                     C/C++ fun-like macro
    --    h     Interface (Ada 2005)            Abstract type
    --    i     signed integer object           signed integer type
    --    j     (unused)                        (unused)
@@ -551,7 +551,7 @@ package Lib.Xref is
    --    n     enumeration literal             named number
    --    o     ordinary fixed-point object     ordinary fixed-point type
    --    p     access object                   access type
-   --    q     label on block                  (unused)
+   --    q     label on block                  C/C++ include file
    --    r     record object                   record type
    --    s     string object                   string type
    --    t     task object                     task type
@@ -560,7 +560,7 @@ package Lib.Xref is
    --    w     protected object                protected type
    --    x     abstract procedure              exception
    --    y     abstract function               entry or entry family
-   --    z     generic formal parameter        C/C++ macro
+   --    z     generic formal parameter        (unused)
 
    --------------------------------------
    -- Handling of Imported Subprograms --

gcc/ada/sem.adb

@@ -1811,7 +1811,7 @@ package body Sem is
                  and then Body_CU /= Cunit (Main_Unit)
                  and then Nkind (Unit (Body_CU)) /= N_Subprogram_Body
                  and then (Nkind (Unit (Comp)) /= N_Package_Declaration
-                    or else Present (Withed_Body (Clause)))
+                             or else Present (Withed_Body (Clause)))
                then
                   Body_U := Get_Cunit_Unit_Number (Body_CU);
 

gcc/ada/sem_ch12.adb

@@ -8596,6 +8596,7 @@ package body Sem_Ch12 is
            (Inst_Node, Specification (Gen_Decl), Body_Optional);
          Gen_Body_Id := Corresponding_Body (Gen_Decl);
       end if;
+
       Mark_Context (Act_Decl, Gen_Decl);
 
       --  Establish global variable for sloc adjustment and for error recovery

gcc/ada/sem_util.adb

@@ -10489,6 +10489,9 @@ package body Sem_Util is
                end loop;
             end;
 
+            --  For a class wide subtype, we also need debug information
+            --  for the equivalent type.
+
             if Ekind (T) = E_Class_Wide_Subtype then
                Set_Debug_Info_Needed_If_Not_Set (Equivalent_Type (T));
             end if;