[multiple changes]

2010-10-04  Robert Dewar  <dewar@adacore.com>

	* s-taprop-vxworks.adb, sem_res.adb: Minor reformatting.

2010-10-04  Javier Miranda  <miranda@adacore.com>

	* exp_cg.adb (Write_Call_Info): Code clean up.

From-SVN: r164938

gcc/ada/ChangeLog

+2010-10-04  Robert Dewar  <dewar@adacore.com>
+
+	* s-taprop-vxworks.adb, sem_res.adb: Minor reformatting.
+
+2010-10-04  Javier Miranda  <miranda@adacore.com>
+
+	* exp_cg.adb (Write_Call_Info): Code clean up.
+
 2010-10-04  Arnaud Charlet  <charlet@adacore.com>
 
 	* s-taprop-mingw.adb (Create_Task): Initialize Thread_Id field to 0.

gcc/ada/exp_cg.adb

@@ -579,9 +579,14 @@ package body Exp_CG is
          Prim := Node (Elmt);
 
          --  Skip internal entities associated with overridden interface
-         --  primitives
+         --  primitives, and also inherited primitives.
 
-         if Present (Interface_Alias (Prim)) then
+         if Present (Interface_Alias (Prim))
+           or else
+            (Present (Alias (Prim))
+               and then Find_Dispatching_Type (Prim)
+                          /= Find_Dispatching_Type (Alias (Prim)))
+         then
             goto Continue;
          end if;
 

gcc/ada/s-taprop-vxworks.adb

@@ -1099,9 +1099,9 @@ package body System.Task_Primitives.Operations is
       Result : STATUS;
 
    begin
-
       --  Set_True can be called from an interrupt context, in which case
       --  Abort_Defer is undefined.
+
       if Is_Task_Context then
          SSL.Abort_Defer.all;
       end if;
@@ -1129,6 +1129,7 @@ package body System.Task_Primitives.Operations is
 
       --  Set_True can be called from an interrupt context, in which case
       --  Abort_Undefer is undefined.
+
       if Is_Task_Context then
          SSL.Abort_Undefer.all;
       end if;
@@ -1336,9 +1337,9 @@ package body System.Task_Primitives.Operations is
 
    function Is_Task_Context return Boolean is
       function intContext return int;
+      pragma Import (C, intContext, "intContext");
       --  Binding to the C routine intContext. This function returns 1 only
       --  if the current execution state is an interrupt context.
-      pragma Import (C, intContext, "intContext");
    begin
       return intContext /= 1;
    end Is_Task_Context;

gcc/ada/sem_res.adb

@@ -8856,13 +8856,11 @@ package body Sem_Res is
             --  newer language version.
 
             elsif Nkind (Orig_N) = N_Qualified_Expression
-              and then Nkind_In
-                         (Parent (N),
-                          N_Attribute_Reference,
-                          N_Indexed_Component,
-                          N_Selected_Component,
-                          N_Slice,
-                          N_Explicit_Dereference)
+              and then Nkind_In (Parent (N), N_Attribute_Reference,
+                                             N_Indexed_Component,
+                                             N_Selected_Component,
+                                             N_Slice,
+                                             N_Explicit_Dereference)
             then
                null;