diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-04 10:50:25 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-04 10:50:25 +0200 |
| commit | a4640a3936bb760801ca5d2d44152a3424a8facb (patch) | |
| tree | d6b414dd132c799d806e53f7814358013c4f0e2f /gcc/ada/exp_ch7.adb | |
| parent | 39ade2f90880866196d78b8f523613c60828fd78 (diff) | |
| download | gcc-a4640a3936bb760801ca5d2d44152a3424a8facb.zip gcc-a4640a3936bb760801ca5d2d44152a3424a8facb.tar.gz gcc-a4640a3936bb760801ca5d2d44152a3424a8facb.tar.bz2 | |
[multiple changes]
2011-08-04 Eric Botcazou <ebotcazou@adacore.com>
* bindgen.adb: Add comments.
2011-08-04 Yannick Moy <moy@adacore.com>
* einfo.adb, einfo.ads: Free Flag254 and make Formal_Proof_On a
synthesized flag.
* sem_prag.adb (Analyze_Pragma): record the pragma Annotate
(Formal_Proof, On/Off) in the Rep_Item list of the current subprogram.
2011-08-04 Robert Dewar <dewar@adacore.com>
* exp_ch7.adb, exp_ch6.adb, sem_ch3.adb, layout.adb, sem_ch5.adb,
osint-c.ads, sem_util.ads, gnat1drv.adb, targparm.ads, sem_ch6.adb,
sem_ch13.adb, s-pooloc.adb: Minor reformatting.
From-SVN: r177334
Diffstat (limited to 'gcc/ada/exp_ch7.adb')
| -rw-r--r-- | gcc/ada/exp_ch7.adb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb index 21a1ffe..abe960b3 100644 --- a/gcc/ada/exp_ch7.adb +++ b/gcc/ada/exp_ch7.adb @@ -2817,6 +2817,10 @@ package body Exp_Ch7 is -- order to detect this scenario, save the state of entry into the -- finalization code. + -- No need to do this for VM case, since VM version of Ada.Exceptions + -- does not include routine Raise_From_Controlled_Operation which is the + -- the sole user of flag Abort. + if Abort_Allowed and then VM_Target = No_VM then @@ -2871,9 +2875,7 @@ package body Exp_Ch7 is Attribute_Name => Name_Identity))); end; - -- No abort or .NET/JVM. The VM version of Ada.Exceptions does not - -- include routine Raise_From_Controlled_Operation which is the sole - -- user of flag Abort. + -- No abort or .NET/JVM else A_Expr := New_Reference_To (Standard_False, Loc); @@ -7131,8 +7133,9 @@ package body Exp_Ch7 is Utyp := Underlying_Type (Root_Type (Base_Type (Typ))); Ref := Unchecked_Convert_To (Utyp, Ref); + -- The following is to prevent problems with UC see 1.156 RH ??? + Set_Assignment_OK (Ref); - -- To prevent problems with UC see 1.156 RH ??? end if; -- If the underlying_type is a subtype, then we are dealing with the |