From: Arnaud Charlet <charlet@gcc.gnu.org>
Date: Wed, 7 Jan 2015 08:52:35 +0000 (+0100)
Subject: [multiple changes]
X-Git-Tag: releases/gcc-5.1.0~2000
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ea3ba25c015d93f76b26ef1a3cf7497e8006b7c;p=thirdparty%2Fgcc.git

[multiple changes]

2015-01-07  Javier Miranda  <miranda@adacore.com>

	* exp_disp.adb (Expand_Interface_Conversion): Adding missing
	generation of accessibility check.

2015-01-07  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch3.adb (Derived_Type_Declaration): In the case of an
	illegal completion from a class- wide type, set etype of the
	derived type properly to prevent cascaded errors.

From-SVN: r219283
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 25920e38cd19..b45007bd6f8b 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,14 @@
+2015-01-07  Javier Miranda  <miranda@adacore.com>
+
+	* exp_disp.adb (Expand_Interface_Conversion): Adding missing
+	generation of accessibility check.
+
+2015-01-07  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch3.adb (Derived_Type_Declaration): In the case of an
+	illegal completion from a class- wide type, set etype of the
+	derived type properly to prevent cascaded errors.
+
 2015-01-07  Robert Dewar  <dewar@adacore.com>
 
 	* prj.ads, i-cpoint.adb, freeze.adb, ghost.adb, prj-err.adb: Minor
diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb
index 3f999647413c..4d07a3752bfe 100644
--- a/gcc/ada/exp_disp.adb
+++ b/gcc/ada/exp_disp.adb
@@ -1422,6 +1422,11 @@ package body Exp_Disp is
 
             if Is_Access_Type (Etype (Expression (N))) then
 
+               Apply_Accessibility_Check
+                 (N   => Expression (N),
+                  Typ => Etype (N),
+                  Insert_Node => N);
+
                --  Generate: Func (Address!(Expression))
 
                Rewrite (N,
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 61be2f9b6022..7757d6dda861 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -15860,11 +15860,12 @@ package body Sem_Ch3 is
 
       Taggd := Is_Tagged_Type (Parent_Type);
 
-      --  Perhaps the parent type should be changed to the class-wide type's
-      --  specific type in this case to prevent cascading errors ???
+      --  Set the parent type to the class-wide type's specific type
+      --  in this case to prevent cascading errors
 
       if Present (Extension) and then Is_Class_Wide_Type (Parent_Type) then
          Error_Msg_N ("parent type must not be a class-wide type", Indic);
+         Set_Etype (T, Etype (Parent_Type));
          return;
       end if;