[multiple changes]

2012-10-01  Robert Dewar  <dewar@adacore.com>

	* checks.adb (Minimize_Eliminate_Checks): Changes from testing.
	(Apply_Arithmetic_Overflow_Minimized_Eliminated): Changes
	from testing.
	* sinfo.ads: Remove note on not setting Entity field in overflow
	case since this is no longer true.
	* Makefile.rtl: Add s-bignum.o

2012-10-01  Thomas Quinot  <quinot@adacore.com>

	* Make-generated.in: Correction to previous change for s-oscons
	target.

2012-10-01  Thomas Quinot  <quinot@adacore.com>

	* s-bignum.adb (Allocate_Bignum): Reorganize to kill strict
	aliasing warning.

From-SVN: r191913

6 files changed, 107 insertions, 59 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 0eba9d9..b297746 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,24 @@
 2012-10-01  Robert Dewar  <dewar@adacore.com>
 
+	* checks.adb (Minimize_Eliminate_Checks): Changes from testing.
+	(Apply_Arithmetic_Overflow_Minimized_Eliminated): Changes
+	from testing.
+	* sinfo.ads: Remove note on not setting Entity field in overflow
+	case since this is no longer true.
+	* Makefile.rtl: Add s-bignum.o
+
+2012-10-01  Thomas Quinot  <quinot@adacore.com>
+
+	* Make-generated.in: Correction to previous change for s-oscons
+	target.
+
+2012-10-01  Thomas Quinot  <quinot@adacore.com>
+
+	* s-bignum.adb (Allocate_Bignum): Reorganize to kill strict
+	aliasing warning.
+
+2012-10-01  Robert Dewar  <dewar@adacore.com>
+
 	* checks.adb (Overflow_Check_Mode): New function
 	(Apply_Overflow_Check): New procedure (Is_Check_Suppressed):
 	Moved here from Sem, Overflow_Check case now specially treated.
diff --git a/gcc/ada/Make-generated.in b/gcc/ada/Make-generated.in
index 5715934..00278df 100644
--- a/gcc/ada/Make-generated.in
+++ b/gcc/ada/Make-generated.in
@@ -93,10 +93,9 @@ $(ADA_GEN_SUBDIR)/s-oscons.ads : $(ADA_GEN_SUBDIR)/s-oscons-tmplt.c $(ADA_GEN_SU
 		$(RM) s-oscons-tmplt.i s-oscons-tmplt.s ; \
 		$(OSCONS_CPP) ; \
 		$(OSCONS_EXTRACT) ; \
-		./xoscons ; \
-		$(RM) ../../s-oscons.ads ; \
-		$(MOVE_IF_CHANGE) s-oscons.ads $(ADA_GEN_SUBDIR)/s-oscons.ads ; \
-		$(MOVE_IF_CHANGE) s-oscons.h $(ADA_GEN_SUBDIR)/s-oscons.h)
+		./xoscons ) ; \
+		$(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/oscons/s-oscons.ads $(ADA_GEN_SUBDIR)/s-oscons.ads ; \
+		$(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/oscons/s-oscons.h $(ADA_GEN_SUBDIR)/s-oscons.h
 
 $(ADA_GEN_SUBDIR)/sdefault.adb: $(ADA_GEN_SUBDIR)/stamp-sdefault ; @true
 $(ADA_GEN_SUBDIR)/stamp-sdefault : $(srcdir)/version.c Makefile
diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
index 144e914..8ef3469 100644
--- a/gcc/ada/Makefile.rtl
+++ b/gcc/ada/Makefile.rtl
@@ -481,6 +481,7 @@ GNATRTL_NONTASKING_OBJS= \
   s-atocou$(objext) \
   s-atopri$(objext) \
   s-auxdec$(objext) \
+  s-bignum$(objext) \
   s-bitops$(objext) \
   s-boarop$(objext) \
   s-bytswa$(objext) \
diff --git a/gcc/ada/checks.adb b/gcc/ada/checks.adb
index 196cd73..840fca4 100644
--- a/gcc/ada/checks.adb
+++ b/gcc/ada/checks.adb
@@ -1064,6 +1064,9 @@ package body Checks is
       Loc : constant Source_Ptr := Sloc (Op);
       P   : constant Node_Id    := Parent (Op);
 
+      LLIB : constant Entity_Id := Base_Type (Standard_Long_Long_Integer);
+      --  Operands and results are of this type when we convert
+
       Result_Type : constant Entity_Id := Etype (Op);
       --  Original result type
 
@@ -1109,7 +1112,7 @@ package body Checks is
 
       --  Bignum case
 
-      elsif Etype (Op) = RTE (RE_Bignum) then
+      elsif Is_RTE (Etype (Op), RE_Bignum) then
 
          --  We need a sequence that looks like
 
@@ -1118,7 +1121,7 @@ package body Checks is
          --    declare
          --       M   : Mark_Id := SS_Mark;
          --    begin
-         --       Rnn := Long_Long_Integer (From_Bignum (Op));
+         --       Rnn := Long_Long_Integer'Base (From_Bignum (Op));
          --       SS_Release (M);
          --    end;
 
@@ -1132,14 +1135,14 @@ package body Checks is
 
          --      A,B,C : Integer;
          --      ...
-         --      X := Long_Long_Integer (A * (B ** C));
+         --      X := Long_Long_Integer'Base (A * (B ** C));
 
          --  Now the product may fit in Long_Long_Integer but not in Integer.
          --  In Minimize/Eliminate mode, we don't want to introduce an overflow
          --  exception for this intermediate value.
 
          declare
-            Blk  : constant Node_Id  := Make_Bignum_Block (Loc);
+            Blk : constant Node_Id  := Make_Bignum_Block (Loc);
             Rnn : constant Entity_Id := Make_Temporary (Loc, 'R', Op);
             RHS : Node_Id;
 
@@ -1149,7 +1152,7 @@ package body Checks is
             RHS := Convert_From_Bignum (Op);
 
             if Nkind (P) /= N_Type_Conversion then
-               RHS := Convert_To (Result_Type, Op);
+               Convert_To_And_Rewrite (Result_Type, RHS);
                Rtype := Result_Type;
 
                --  Interesting question, do we need a check on that conversion
@@ -1158,7 +1161,7 @@ package body Checks is
                --  looked at later ???
 
             else
-               Rtype := Standard_Long_Long_Integer;
+               Rtype := LLIB;
             end if;
 
             Insert_Before
@@ -1177,10 +1180,10 @@ package body Checks is
             Analyze_And_Resolve (Op);
          end;
 
-         --  Here if the result is Long_Long_Integer
+         --  Here we know the result is Long_Long_Integer'Base
 
       else
-         pragma Assert (Etype (Op) = Standard_Long_Long_Integer);
+         pragma Assert (Etype (Op) = LLIB);
 
          --  All we need to do here is to convert the result to the proper
          --  result type. As explained above for the Bignum case, we can
@@ -6466,6 +6469,9 @@ package body Checks is
       Llo, Lhi : Uint;
       --  Ranges of values for left operand
 
+      LLIB : constant Entity_Id := Base_Type (Standard_Long_Long_Integer);
+      --  Operands and results are of this type when we convert
+
       LLLo, LLHi : Uint;
       --  Bounds of Long_Long_Integer
 
@@ -6559,7 +6565,27 @@ package body Checks is
             --  Multiplication
 
             when N_Op_Multiply =>
-               raise Program_Error;
+
+               --  Possible bounds of multiplication must come from multiplying
+               --  end values of the input ranges (four possibilities).
+
+               declare
+                  Mrk : constant Uintp.Save_Mark := Mark;
+                  --  Mark so we can release the Ev values
+
+                  Ev1 : constant Uint := Llo * Rlo;
+                  Ev2 : constant Uint := Llo * Rhi;
+                  Ev3 : constant Uint := Lhi * Rlo;
+                  Ev4 : constant Uint := Lhi * Rhi;
+
+               begin
+                  Lo := UI_Min (UI_Min (Ev1, Ev2), UI_Min (Ev3, Ev4));
+                  Hi := UI_Max (UI_Max (Ev1, Ev2), UI_Max (Ev3, Ev4));
+
+                  --  Release the Ev values
+
+                  Release_And_Save (Mrk, Lo, Hi);
+               end;
 
             --  Plus operator (affirmation)
 
@@ -6595,8 +6621,8 @@ package body Checks is
       --  0 .. 1, but the cases are rare and it is not worth the effort.
       --  Failing to do this switching back is only an efficiency issue.
 
-      LLLo := Intval (Type_Low_Bound  (Standard_Long_Long_Integer));
-      LLHi := Intval (Type_High_Bound (Standard_Long_Long_Integer));
+      LLLo := Intval (Type_Low_Bound  (LLIB));
+      LLHi := Intval (Type_High_Bound (LLIB));
 
       if Lo = No_Uint or else Lo < LLLo or else Hi > LLHi then
 
@@ -6688,26 +6714,30 @@ package body Checks is
       --  Long_Long_Integer and mark the result type as Long_Long_Integer.
 
       else
-         Convert_To_And_Rewrite
-           (Standard_Long_Long_Integer, Right_Opnd (N));
+         --  Convert right or only operand to Long_Long_Integer, except that
+         --  we do not touch the exponentiation right operand.
 
-         if Binary then
-            Convert_To_And_Rewrite
-              (Standard_Long_Long_Integer, Left_Opnd (N));
+         if Nkind (N) /= N_Op_Expon then
+            Convert_To_And_Rewrite (LLIB, Right_Opnd (N));
          end if;
 
-         Set_Etype (N, Standard_Long_Long_Integer);
+         --  Convert left operand to Long_Long_Integer for binary case
 
-         --  Clear entity field, since we have modified the type and mark
-         --  the node as analyzed to prevent junk infinite recursion
+         if Binary then
+            Convert_To_And_Rewrite (LLIB, Left_Opnd (N));
+         end if;
 
+         --  Reset node to unanalyzed
+
+         Set_Analyzed (N, False);
+         Set_Etype (N, Empty);
          Set_Entity (N, Empty);
-         Set_Analyzed (N, True);
+         Set_Do_Overflow_Check (N, False);
 
-         --  Turn off the overflow check flag, since this is precisely the
-         --  case where we have avoided an intermediate overflow check.
+         --  Now analyze this new node with checks off (since we know that
+         --  we do not need an overflow check).
 
-         Set_Do_Overflow_Check (N, False);
+         Analyze_And_Resolve (N, LLIB, Suppress => All_Checks);
       end if;
    end Minimize_Eliminate_Overflow_Checks;
 
diff --git a/gcc/ada/s-bignum.adb b/gcc/ada/s-bignum.adb
index e82fce2..06f7efd 100644
--- a/gcc/ada/s-bignum.adb
+++ b/gcc/ada/s-bignum.adb
@@ -37,8 +37,6 @@ with System;                  use System;
 with System.Secondary_Stack;  use System.Secondary_Stack;
 with System.Storage_Elements; use System.Storage_Elements;
 
-with Unchecked_Conversion;
-
 package body System.Bignums is
 
    use Interfaces;
@@ -205,25 +203,12 @@ package body System.Bignums is
    function Allocate_Bignum (Len : Length) return Bignum is
       Addr : Address;
 
-      --  The following definitions are to allow us to set the discriminant
-
-      type Header is record
-         Len : Length;
-         Neg : Boolean;
-      end record;
-
-      for Header use record
-         Len at 0 range 0 .. 23;
-         Neg at 3 range 0 .. 7;
-      end record;
-
-      type Header_Ptr is access all Header;
-
-      function To_Header_Ptr is new Unchecked_Conversion (Address, Header_Ptr);
-      function To_Bignum     is new Unchecked_Conversion (Address, Bignum);
-
    begin
-      if True then
+      --  Change the if False here to if True to get allocation on the heap
+      --  instead of the secondary stack, which is convenient for debugging
+      --  System.Bignum itself.
+
+      if False then
          declare
             B : Bignum;
          begin
@@ -231,10 +216,34 @@ package body System.Bignums is
             return B;
          end;
 
+      --  Normal case of allocation on the secondary stack
+
       else
+         --  Note: The approach used here is designed to avoid strict aliasing
+         --  warnings that appeared previously using unchecked conversion.
+
          SS_Allocate (Addr, Storage_Offset (4 + 4 * Len));
-         To_Header_Ptr (Addr).Len := Len;
-         return To_Bignum (Addr);
+
+         declare
+            B : Bignum;
+            for B'Address use Addr'Address;
+            pragma Import (Ada, B);
+
+            BD : Bignum_Data (Len);
+            for BD'Address use Addr;
+            pragma Import (Ada, BD);
+
+            --  Expose a writable view of discriminant BD.Len so that we can
+            --  initialize it.
+
+            BL : Length;
+            for BL'Address use BD.Len'Address;
+            pragma Import (Ada, BL);
+
+         begin
+            BL := Len;
+            return B;
+         end;
       end if;
    end Allocate_Bignum;
 
diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads
index e8a3d9a..31a069c 100644
--- a/gcc/ada/sinfo.ads
+++ b/gcc/ada/sinfo.ads
@@ -408,14 +408,6 @@ package Sinfo is
    --       Do_Overflow_Check        (Flag17-Sem) set if overflow check needed
    --       Has_Private_View         (Flag11-Sem) set in generic units.
 
-   --       Note on use of entity field. This field is set during analysis
-   --       and is used in carrying out semantic checking, but it has no
-   --       significance to the back end, which is driven by the Etype's
-   --       of the operands, and the Etype of the result. During processing
-   --       in the exapander for overflow checks, these types may be modified
-   --       and there is no point in trying to set a proper Entity value, so
-   --       it just gets cleared to Empty in this situation.
-
    --    "plus fields for unary operator"
    --       Chars                    (Name1)      Name_Id for the operator
    --       Right_Opnd               (Node3)      right operand expression
@@ -424,8 +416,6 @@ package Sinfo is
    --       Do_Overflow_Check        (Flag17-Sem) set if overflow check needed
    --       Has_Private_View         (Flag11-Sem) set in generic units.
 
-   --       See note on use of Entity field above (same situation).
-
    --    "plus fields for expression"
    --       Paren_Count                           number of parentheses levels
    --       Etype                    (Node5-Sem)  type of the expression