diff options
| author | Bob Duff <duff@adacore.com> | 2014-11-20 14:26:10 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-11-20 15:26:10 +0100 |
| commit | d85badc750ae2eafa81d442e1702dd01cfbc3a82 (patch) | |
| tree | 060b03ec21539031aa321d03b1689f20bb420ef3 | |
| parent | d8d7e809d6c6ce977e188f99e104097b5ece31d8 (diff) | |
| download | gcc-d85badc750ae2eafa81d442e1702dd01cfbc3a82.zip gcc-d85badc750ae2eafa81d442e1702dd01cfbc3a82.tar.gz gcc-d85badc750ae2eafa81d442e1702dd01cfbc3a82.tar.bz2 | |
exp_attr.adb (Attribute_Max_Size_In_Storage_Elements): Eliminate 'Class references from the tree, because gigi crashes on 'Class.
2014-11-20 Bob Duff <duff@adacore.com>
* exp_attr.adb (Attribute_Max_Size_In_Storage_Elements):
Eliminate 'Class references from the tree, because gigi crashes on
'Class. Also, don't check Nkind (Attr) -- it is known to be
N_Attribute_Reference. Assert that instead.
From-SVN: r217856
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/exp_attr.adb | 19 |
2 files changed, 22 insertions, 4 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 4455049..5fcfdc4 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,12 @@ 2014-11-20 Bob Duff <duff@adacore.com> + * exp_attr.adb (Attribute_Max_Size_In_Storage_Elements): + Eliminate 'Class references from the tree, because gigi crashes on + 'Class. Also, don't check Nkind (Attr) -- it is known to be + N_Attribute_Reference. Assert that instead. + +2014-11-20 Bob Duff <duff@adacore.com> + * debug.adb: Minor comment fix. 2014-11-20 Arnaud Charlet <charlet@adacore.com> diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb index eb5f28f..595c548 100644 --- a/gcc/ada/exp_attr.adb +++ b/gcc/ada/exp_attr.adb @@ -4215,6 +4215,17 @@ package body Exp_Attr is -- wrapped inside a type conversion. begin + -- If the prefix is X'Class, we transform it into a direct reference + -- to the class-wide type, because the back end must not see a 'Class + -- reference. See also 'Size. + + if Is_Entity_Name (Pref) + and then Is_Class_Wide_Type (Entity (Pref)) + then + Rewrite (Prefix (N), New_Occurrence_Of (Entity (Pref), Loc)); + return; + end if; + Apply_Universal_Integer_Attribute_Checks (N); -- The universal integer check may sometimes add a type conversion, @@ -4225,6 +4236,7 @@ package body Exp_Attr is Attr := Expression (Attr); Conversion_Added := True; end if; + pragma Assert (Nkind (Attr) = N_Attribute_Reference); -- Heap-allocated controlled objects contain two extra pointers which -- are not part of the actual type. Transform the attribute reference @@ -4234,7 +4246,6 @@ package body Exp_Attr is -- two pointers are already present in the type. if VM_Target = No_VM - and then Nkind (Attr) = N_Attribute_Reference and then Needs_Finalization (Ptyp) and then not Header_Size_Added (Attr) then @@ -5567,9 +5578,9 @@ package body Exp_Attr is end if; end if; - -- For class-wide types, X'Class'Size is transformed into a direct - -- reference to the Size of the class type, so that the back end does - -- not have to deal with the X'Class'Size reference. + -- If the prefix is X'Class, we transform it into a direct reference + -- to the class-wide type, because the back end must not see a 'Class + -- reference. if Is_Entity_Name (Pref) and then Is_Class_Wide_Type (Entity (Pref)) |