Skip to content

Fix nr2 unit struct#3299

Merged
P-E-P merged 10 commits intoRust-GCC:masterfrom
P-E-P:fix-nr2-unit-struct
Jan 29, 2025
Merged

Fix nr2 unit struct#3299
P-E-P merged 10 commits intoRust-GCC:masterfrom
P-E-P:fix-nr2-unit-struct

Conversation

@P-E-P
Copy link
Member

@P-E-P P-E-P commented Dec 10, 2024

No description provided.

@P-E-P P-E-P force-pushed the fix-nr2-unit-struct branch 2 times, most recently from b490ffd to 9d29160 Compare December 11, 2024 12:45
@powerboat9
Copy link
Collaborator

powerboat9 commented Dec 11, 2024 •
edited
Loading

Label scope is for ex: break 'a right?

Edit: ah, I see

@powerboat9
Copy link
Collaborator

powerboat9 commented Dec 11, 2024

Most of the edits here look like they only apply to nr1

@P-E-P
Copy link
Member Author

P-E-P commented Dec 12, 2024

Most of the edits here look like they only apply to nr1

This PR isn't finished yet. Basically I stumbled on a problem for NR2, and discovered that this problem should apply on NR1. So I fixed NR1 then I changed the behavior for both NR.

@P-E-P P-E-P force-pushed the fix-nr2-unit-struct branch 2 times, most recently from eb1f1c7 to b2bf11e Compare January 6, 2025 17:22
@P-E-P P-E-P mentioned this pull request Jan 8, 2025
Merged
@P-E-P P-E-P force-pushed the fix-nr2-unit-struct branch from b2bf11e to bd1b05f Compare January 11, 2025 21:35
@powerboat9
Copy link
Collaborator

powerboat9 commented Jan 12, 2025

A lot of these commits seem like they're ready to be merged, if put in separate pull request(s)

@P-E-P P-E-P marked this pull request as ready for review January 13, 2025 17:28
@P-E-P
Copy link
Member Author

P-E-P commented Jan 13, 2025 •
edited
Loading

A lot of these commits seem like they're ready to be merged, if put in separate pull request(s)

I think it is nearly ready to be merged anyway. I'll keep it like that for now.

@P-E-P
Copy link
Member Author

P-E-P commented Jan 13, 2025

@philberty could you please take a look at b646b25 ? There is a mention of ResolvePathType::Compile earlier in a comment but that type must have disappeared since I can't find it. Not 100% convinced this is the right way of fixing unit struct compile issue.

@P-E-P P-E-P requested a review from philberty January 13, 2025 17:30
@P-E-P
Copy link
Member Author

P-E-P commented Jan 14, 2025

If accepted as is I could technically remove ac30ed1.

@P-E-P P-E-P force-pushed the fix-nr2-unit-struct branch from b646b25 to 93a788b Compare January 14, 2025 11:04
@P-E-P P-E-P requested a review from CohenArthur January 16, 2025 14:25
CohenArthur
CohenArthur approved these changes Jan 21, 2025
View reviewed changes
Copy link
Member

@CohenArthur CohenArthur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but waiting on feedback from @philberty :)

@P-E-P P-E-P force-pushed the fix-nr2-unit-struct branch from 93a788b to 17455c8 Compare January 24, 2025 12:56
P-E-P added 10 commits January 29, 2025 10:51
@P-E-P
Labels shall be pushed within label namespace
58962e1 
Labels were using the wrong namespace.

gcc/rust/ChangeLog:

	* resolve/rust-ast-resolve-expr.cc (ResolveExpr::visit): Change label
	push function from type rib to label rib.
	* resolve/rust-ast-resolve-item.cc (ResolveTraitItems::visit):
	Likewise.
	(ResolveItem::visit): Likewise.
	(ResolveExternItem::visit): Likewise.
	* resolve/rust-ast-resolve-stmt.h: Likewise.
	* resolve/rust-ast-resolve.cc (NameResolution::go): Likewise.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
@P-E-P
Add debug dump to old name resolver
9d2846d 
It might be necessary to compare both name resolution' internal states
during the transition. This new debug representation could help with
that.

gcc/rust/ChangeLog:

	* resolve/rust-name-resolver.h: Add new degug dump for old name
	resolver.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
@P-E-P
Add unit struct to name namespace in old resolver
2b265df 
We missed the name namespace for unit struct in the old resolver.

gcc/rust/ChangeLog:

	* resolve/rust-ast-resolve-toplevel.h: Add struct to name namespace.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
@P-E-P
Remove query mode on CompileItem
dca276c 
Query mode was a hack to catch up some compile errors early, it was
deemed to be removed at some time. Recent changes to NR1 highlighted
an incompatibility with it hence it's removal.

gcc/rust/ChangeLog:

	* backend/rust-compile-item.h: Remove query mode.
	* backend/rust-compile-resolve-path.cc (HIRCompileBase::query_compile):
	Likewise.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
@P-E-P
Remove some tests from nr2 exclusion file
6957654 
Those test are now passing.

gcc/testsuite/ChangeLog:

	* rust/compile/nr2/exclude: Remove passing tests.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
@P-E-P
Clone expr instead of taking it
ef22133 
We're reusing the value, it could therefore not be taken be should be
cloned.

gcc/rust/ChangeLog:

	* typecheck/rust-hir-type-check-enumitem.cc (TypeCheckEnumItem::visit):
	Clone expr instead of taking it.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
@P-E-P
Make foreverstack debug string const
1a6e0d0 
Those function should not change anything within the foreverstack, it
can therefore be made const.

gcc/rust/ChangeLog:

	* resolve/rust-forever-stack.h: Make debug functions const.
	* resolve/rust-forever-stack.hxx: Likewise.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
@P-E-P
Resolved item type shall be differentiated later
b08c3eb 
We need to query all namespaces and error out at a later stage if the
retrieved item is wrong.

gcc/rust/ChangeLog:

	* typecheck/rust-hir-trait-resolve.cc (TraitResolver::resolve_path_to_trait):
	Query all namespaces.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
@P-E-P
Compile unit struct with constructor
b39d999 
gcc/rust/ChangeLog:

	* backend/rust-compile-resolve-path.cc (ResolvePathRef::resolve): Do
	not use query system for unit struct but compile it's constructor
	instead.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
@P-E-P
Remove some passing test from exclude file
174804a 
Those tests are now passing.

gcc/testsuite/ChangeLog:

	* rust/compile/nr2/exclude: Remove some tests.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
@P-E-P P-E-P force-pushed the fix-nr2-unit-struct branch from 17455c8 to 174804a Compare January 29, 2025 10:01
@P-E-P P-E-P added this pull request to the merge queue Jan 29, 2025
Merged via the queue into Rust-GCC:master with commit 84bca6f Jan 29, 2025
12 checks passed
@P-E-P P-E-P deleted the fix-nr2-unit-struct branch August 5, 2025 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@CohenArthur CohenArthur CohenArthur approved these changes

@philberty philberty Awaiting requested review from philberty

Assignees

No one assigned

Labels

name resolution

Projects

name resolution 2.0
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@P-E-P @powerboat9 @CohenArthur