Repository navigation
Fix evaluation order in struct field expressions - #4448
Open
elshorbagyx wants to merge 1 commit into
Open
elshorbagyx wants to merge 1 commit into
elshorbagyx wants to merge 1 commit into
Conversation
elshorbagyx
force-pushed
the
fix-4445
branch
4 times, most recently
from
February 25, 2026 04:00
188de4d to
d1fd377
Compare
Member
|
the tests are failing: but also i am pretty sure we update the ordering within the typecheck pass to sort this out. |
Author
I am working on that. |
Collaborator
|
Make sure to double-check that the generated GIMPLE doesn't have unspecified evaluation order (I'm not sure about |
elshorbagyx
force-pushed
the
fix-4445
branch
from
February 27, 2026 06:57
d1fd377 to
b4a862e
Compare
Author
|
@philberty @powerboat9 |
Member
|
you need to fix your change log here to match gcc style |
Fixes Rust-GCC#4445 gcc/rust/ChangeLog: * backend/rust-compile-expr.cc (CompileExpr::visit): Get the struct field type by field name instead of relying on declaration order, and only reorder fields for struct ADTs. * typecheck/rust-hir-type-check-struct.cc (TypeCheckStructExpr::resolve): Cancel reordering of struct field expressions. Signed-off-by: Mohamed El Shorbagy <mohrizq895@gmail.com>
elshorbagyx
force-pushed
the
fix-4445
branch
from
September 1, 2026 02:52
7470ba2 to
088b863
Compare
Author
|
I believe it is now ready |
powerboat9
reviewed
Sep 1, 2026
Comment on lines
+831
to
+833
| auto _adt = static_cast<TyTy::ADTType *> (adt->clone ()); | ||
| _adt->get_variants ()[0]->get_fields () = ordered_variant_fields; | ||
| tyty = _adt; |
Collaborator
There was a problem hiding this comment.
I'm not sure creating a new type with reordered fields and treating trees constructed with that type the same as trees constructed with the old type will work.
Author
There was a problem hiding this comment.
I am not sure I understand your concern -- could you elaborate ?
powerboat9
reviewed
Sep 1, 2026
|
|
||
| // it must be an ADT | ||
| rust_assert (tyty->get_kind () == TyTy::TypeKind::ADT); | ||
| TyTy::ADTType *adt = static_cast<TyTy::ADTType *> (tyty); |
Collaborator
There was a problem hiding this comment.
and adt, while used after tyty is updated, is not itself updated
Collaborator
|
It'd probably be better to create temporary variables, initialize them in order, then use them in the constructor expression |
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #4445
gcc/rust/ChangeLog:
gccrs evaluates struct field expressions in the order they are declared inside the struct definition. The current logic reorders the struct field expressions to match the struct field types, which results in incorrect behavior compared to the Rust reference (as mentioned in #4445). Instead, we could fetch the struct field type by field name through
lookup_field.