diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 77477d4d417..30cd0b1b767 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-02  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch3.adb (Build_Derived_Private_Type): If the parent type
+	has discriminants, do not override the Stored_Constraint list of
+	the full view of the derived type with that of the derived type.
+
 2017-05-02  Bob Duff  <duff@adacore.com>
 
 	* sem_attr.adb (Attribute_Enum_Rep): Disallow T'Enum_Rep.
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index b15ee3d49be..73c2f51f801 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -7797,9 +7797,6 @@ package body Sem_Ch3 is
                Set_Last_Entity (Der_Base, Last_Discr);
                Set_First_Entity (Derived_Type, First_Entity (Der_Base));
                Set_Last_Entity  (Derived_Type, Last_Entity  (Der_Base));
-
-               Set_Stored_Constraint
-                 (Full_Der, Stored_Constraint (Derived_Type));
             end;
          end if;