aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2015-02-08 09:24:54 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2015-02-08 09:24:54 +0000
commit9d11273c622b4b50d5bc5a4c9b382fd2b2dddaee (patch)
tree701ffb222ebcfb6e3e1a5036efc1a93082dd1ef6 /gcc
parente2d13a4ad1876a15a4d77915d2138b0122afe411 (diff)
downloadgcc-9d11273c622b4b50d5bc5a4c9b382fd2b2dddaee.zip
gcc-9d11273c622b4b50d5bc5a4c9b382fd2b2dddaee.tar.gz
gcc-9d11273c622b4b50d5bc5a4c9b382fd2b2dddaee.tar.bz2
decl.c (gnat_to_gnu_entity): Do not bother about alias sets in presence of derivation for subprogram types.
* gcc-interface/decl.c (gnat_to_gnu_entity): Do not bother about alias sets in presence of derivation for subprogram types. From-SVN: r220511
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/gcc-interface/decl.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index ed638a6..e14b1c1 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,10 @@
2015-02-08 Eric Botcazou <ebotcazou@adacore.com>
+ * gcc-interface/decl.c (gnat_to_gnu_entity): Do not bother about alias
+ sets in presence of derivation for subprogram types.
+
+2015-02-08 Eric Botcazou <ebotcazou@adacore.com>
+
* gcc-interface/utils.c (begin_subprog_body): Assert that the body is
present in the same context as the declaration.
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 43984a2..12e5fd0 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -5138,7 +5138,9 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition)
to conflict with Comp2 and an alias set copy is required.
The language rules ensure the parent type is already frozen here. */
- if (Is_Derived_Type (gnat_entity) && !type_annotate_only)
+ if (kind != E_Subprogram_Type
+ && Is_Derived_Type (gnat_entity)
+ && !type_annotate_only)
{
Entity_Id gnat_parent_type = Underlying_Type (Etype (gnat_entity));
/* For constrained packed array subtypes, the implementation type is