This is the mail archive of the mailing list for the GCC project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] ada/16087: Accept statically matching constraint in full view

> Bootstrapped and regtested on i686-pc-linux-gnu. Ok for trunk?
>     gcc/ada/
> 	* sem_ch3.adb (Build_Derived_Record_Type): Accept statically matching
> 	constraint expressions.
>     gcc/testsuite/
> 	* gnat.dg/specs/ New.

OK with the following minor changes and comment updates (from ed):
--- sem_ch3.adb.orig
+++ sem_ch3.adb
@@ -6275,8 +6275,8 @@
               and then Has_Private_Declaration (Derived_Type)
               and then Present (Discriminant_Constraint (Derived_Type))
-               --  Verify that constraints of the full view conform to those
-               --  given in partial view.
+               --  Verify that constraints of the full view statically match
+               --  those given in the partial view.
                   C1, C2 : Elmt_Id;
@@ -6285,9 +6285,18 @@
                   C1 := First_Elmt (New_Discrs);
                   C2 := First_Elmt (Discriminant_Constraint (Derived_Type));
                   while Present (C1) and then Present (C2) loop
-                     if not
-                       Fully_Conformant_Expressions (Node (C1), Node (C2))
+                     if Fully_Conformant_Expressions (Node (C1), Node (C2))
+                       or else
+                     (Is_OK_Static_Expression (Node (C1))
+                        and then
+                      Is_OK_Static_Expression (Node (C2))
+                        and then
+                      Expr_Value (Node (C1)) = Expr_Value (Node (C2)))
+                        null;
+                     else
                         Error_Msg_N (
                           "constraint not conformant to previous declaration",
                              Node (C1));

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]