[multiple changes]

2012-11-06  Robert Dewar  <dewar@adacore.com>

	* exp_ch4.adb: Minor comment change.

2012-11-06  Robert Dewar  <dewar@adacore.com>

	* gnat_ugn.texi: Extensive revision of documentation of overflow
	checking.
	* vms_data.ads: Overflow check numbers must be in range 1-3,
	not 0-3.

2012-11-06  Tristan Gingold  <gingold@adacore.com>

	* sem_ch9.adb (Analyze_Protected_Type_Declaration): Emit a
	warning if pragma Priority is used in presence of an interrupt
	handler.

From-SVN: r193234

gcc/ada/ChangeLog

 2012-11-06  Robert Dewar  <dewar@adacore.com>
 
+	* exp_ch4.adb: Minor comment change.
+
+2012-11-06  Robert Dewar  <dewar@adacore.com>
+
+	* gnat_ugn.texi: Extensive revision of documentation of overflow
+	checking.
+	* vms_data.ads: Overflow check numbers must be in range 1-3,
+	not 0-3.
+
+2012-11-06  Tristan Gingold  <gingold@adacore.com>
+
+	* sem_ch9.adb (Analyze_Protected_Type_Declaration): Emit a
+	warning if pragma Priority is used in presence of an interrupt
+	handler.
+
+2012-11-06  Robert Dewar  <dewar@adacore.com>
+
 	* checks.ads, checks.adb, exp_ch4.adb: Minor changes throughout for
 	new overflow checking.
 	* exp_util.adb (Insert_Actions): Remove special casing of

gcc/ada/exp_ch4.adb

@@ -3715,7 +3715,7 @@ package body Exp_Ch4 is
       --  Save result type
 
       Lo, Hi : Uint;
-      --  Bounds in Minimize calls, not used yet ???
+      --  Bounds in Minimize calls, not used currently
 
       LLIB : constant Entity_Id := Base_Type (Standard_Long_Long_Integer);
       --  Entity for Long_Long_Integer'Base (Standard should export this???)

gcc/ada/sem_ch9.adb

@@ -2036,16 +2036,12 @@ package body Sem_Ch9 is
          --  by an aspect/pragma.
 
          declare
-            Id : constant Entity_Id :=
-                   Defining_Identifier (Original_Node (N));
+            Id : constant Entity_Id := Defining_Identifier (Original_Node (N));
             --  The warning must be issued on the original identifier in order
             --  to deal properly with the case of a single protected object.
 
             Prio_Item : constant Node_Id :=
-                          Get_Rep_Item
-                            (Defining_Identifier (N),
-                             Name_Priority,
-                             Check_Parents => False);
+                          Get_Rep_Item (Def_Id, Name_Priority, False);
 
          begin
             if Present (Prio_Item) then
@@ -2074,11 +2070,42 @@ package body Sem_Ch9 is
          end if;
       end if;
 
+      --  If the Attach_Handler aspect is specified or the Interrupt_Handler
+      --  aspect is True, then the initial ceiling priority must be in the
+      --  range of System.Interrupt_Priority. It is therefore recommanded
+      --  to use the Interrupt_Priority aspect instead of the Priority aspect.
+
+      if Has_Interrupt_Handler (T) or else Has_Attach_Handler (T) then
+         declare
+            Prio_Item : constant Node_Id :=
+                          Get_Rep_Item (Def_Id, Name_Priority, False);
+
+         begin
+            if Present (Prio_Item) then
+
+               --  Aspect case
+
+               if (Nkind (Prio_Item) = N_Aspect_Specification
+                    or else From_Aspect_Specification (Prio_Item))
+                 and then Chars (Identifier (Prio_Item)) = Name_Priority
+               then
+                  Error_Msg_N ("?aspect Interrupt_Priority is preferred "
+                               & "in presence of handlers", Prio_Item);
+
+               --  Pragma case
+
+               elsif Pragma_Name (Prio_Item) = Name_Priority then
+                  Error_Msg_N ("?pragma Interrupt_Priority is preferred "
+                               & "in presence of handlers", Prio_Item);
+               end if;
+            end if;
+         end;
+      end if;
+
       --  Case of a completion of a private declaration
 
-      if T /= Def_Id
-        and then Is_Private_Type (Def_Id)
-      then
+      if T /= Def_Id and then Is_Private_Type (Def_Id) then
+
          --  Deal with preelaborable initialization. Note that this processing
          --  is done by Process_Full_View, but as can be seen below, in this
          --  case the call to Process_Full_View is skipped if any serious
@@ -2326,9 +2353,7 @@ package body Sem_Ch9 is
             --  the first parameter of Entry_Id since it is the interface
             --  controlling formal.
 
-            if Ada_Version >= Ada_2012
-              and then Is_Disp_Req
-            then
+            if Ada_Version >= Ada_2012 and then Is_Disp_Req then
                declare
                   Enclosing_Formal : Entity_Id;
                   Target_Formal    : Entity_Id;
@@ -2668,7 +2693,7 @@ package body Sem_Ch9 is
       Ref_Id : Entity_Id;
       --  This is the entity of the task or task type, and is the entity used
       --  for cross-reference purposes (it differs from Spec_Id in the case of
-      --  a single task, since Spec_Id is set to the task type)
+      --  a single task, since Spec_Id is set to the task type).
 
    begin
       Tasking_Used := True;

gcc/ada/vms_data.ads

@@ -2117,12 +2117,11 @@ package VMS_Data is
    --   range 0-3, it sets the overflow checking mode for all expressions,
    --   including those outside and within assertions. The meaning of nnn is:
    --
-   --     0   suppress overflow checks (SUPPRESSED)
-   --     1   all intermediate overflows checked (CHECKED)
+   --     1   all intermediate computations done using base type (STRICT)
    --     2   minimize intermediate overflows (MINIMIZED)
    --     3   eliminate intermediate overflows (ELIMINATED)
    --
-   --   Otherwise nn can be two digits, both 0-3, and in this case the first
+   --   Otherwise nn can be two digits, both 1-3, and in this case the first
    --   digit sets the mode (using the above code) for expressions outside an
    --   assertion, and the second digit sets the mode for expressions within
    --   an assertion.