gccrs: fix ICE for empty enum variant #4081
Open
Conversation
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
powerboat9
reviewed
Aug 14, 2025
gcc/rust/rust-gcc.cc
Outdated
Comment on lines
1261
to
1264
| vec_alloc (init, vals.size ()); | ||
| size_t reserve = vals.size (); | ||
| if (is_variant && union_index != -1) | ||
| reserve = reserve < 1 ? 1 : reserve; | ||
| vec_reserve (init, reserve); |
There was a problem hiding this comment.
Looks like this should really be vec_alloc (init, union_index != -1 ? 1 : vals.size ())
There was a problem hiding this comment.
@powerboat9
Thanks so much! I just updated it!
Lishin1215
force-pushed
the
3947
branch
2 times, most recently
from
7e2064c to
34a1709
Compare
powerboat9
reviewed
Aug 15, 2025
gcc/rust/rust-gcc.cc
Outdated
| @@ -1258,7 +1258,10 @@ constructor_expression (tree type_tree, bool is_variant, | |||
| return error_mark_node; | |||
|
|
|||
| vec<constructor_elt, va_gc> *init; | |||
| vec_alloc (init, vals.size ()); | |||
| size_t reserve = vals.size (); | |||
| if (is_variant && union_index != -1) | |||
There was a problem hiding this comment.
Looks like this condition should trigger even if is_variant is false, to handle unions properly
There was a problem hiding this comment.
@powerboat9
Thanks for pointing that out, I hadn’t considered the non-variant union case!
I’ve updated the patch accordingly. Thanks a lot!
gcc/rust/ChangeLog: * rust-gcc.cc (constructor_expression): Ensure vec_alloc reserves at least one element. gcc/testsuite/ChangeLog: * rust/compile/issue-3947.rs: New test. Signed-off-by: lishin <[email protected]>
powerboat9
approved these changes
Aug 15, 2025
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 #3947
gcc/rust/ChangeLog:
gcc/testsuite/ChangeLog: