Discriminated record formation is broken #289
Conversation
|
The second commit proposes a quick fix. |
xbauch
force-pushed
the
remove/test-discriminant-record
branch
from
edf4c2e to
2642281
Compare
gnat2goto/driver/tree_walk.adb
Outdated
| I_Type => | ||
| Do_Type_Reference (Etype (Iter)), | ||
| Range_Check => False, | ||
| Value => "0"); |
There was a problem hiding this comment.
Looks like a dummy value? Shouldn't this be an unsupported feature report or an exception, something of the sort then?
There was a problem hiding this comment.
Yes. Or better yet, we should find out how to properly initialise the struct-member so that we don't end up calling Discriminant_Default_Value on a node that doesn't have one.
| @@ -4083,12 +4095,15 @@ package body Tree_Walk is | |||
| function Do_Selected_Component (N : Node_Id) return Irep is | |||
| Root : constant Irep := Do_Expression (Prefix (N)); | |||
| Component : constant Entity_Id := Entity (Selector_Name (N)); | |||
| Orig_Component : constant Entity_Id := | |||
There was a problem hiding this comment.
Can you add a short explanation for what an original record component is and why we need it here?
There was a problem hiding this comment.
struct Foo { int a; };
struct Foo bar;
bar.a = 5;
So the Unique_Name of the struct-component in declaration is Foo__a. But when parsing the assignment the component is that of the entity bar, thus it's unique-name is bar__a: which is not present in Foo. That's why we have to use the component of the original-record to get the right name. (I'll add this as a comment.)
| @@ -15,4 +15,6 @@ procedure Discriminated_Record is | |||
| begin | |||
| Inst1.A (5) := 1; | |||
| Inst1.B (10) := 2; | |||
|
|
|||
| pragma Assert (Inst1.A (5) = 1); | |||
There was a problem hiding this comment.
This I very much approve of. If you update B and then check the same assertion again it would be even better!
|
The changes look sensible and should be satisfactory when the comments left by other reviewers are addressed. |
xbauch
force-pushed
the
remove/test-discriminant-record
branch
from
2642281 to
fa24182
Compare
by giving the struct. component the right name and by forcing the initialisation of the constraints.
xbauch
force-pushed
the
remove/test-discriminant-record
branch
from
fa24182 to
61f2883
Compare
the test is now marked as failing.