Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix circularity issue with binding const local #75371

Merged
merged 5 commits into from
Oct 11, 2024
Merged

Fix circularity issue with binding const local #75371

merged 5 commits into from
Oct 11, 2024

Conversation

jcouv
Copy link
Member

@jcouv jcouv commented Oct 3, 2024 •
edited
Loading

Fixes #75353

Opened issue #75416 (wrong binder used in switch expression binding)
Opened issue #75437 (injected binders may get dropped by GetBinder)

@jcouv jcouv self-assigned this Oct 3, 2024
@dotnet-issue-labeler dotnet-issue-labeler bot added the untriaged Issues and PRs which have not yet been triaged by a lead label Oct 3, 2024
@jcouv jcouv force-pushed the const-loop branch 2 times, most recently from ef825d8 to dd9a999 Compare October 3, 2024 23:11
This was referenced Oct 4, 2024
Open
Open
@jcouv jcouv force-pushed the const-loop branch 4 times, most recently from 8fde573 to 7aeabe9 Compare October 7, 2024 16:03
@jcouv jcouv marked this pull request as ready for review October 7, 2024 19:56
@jcouv jcouv requested a review from a team as a code owner October 7, 2024 19:56
RikkiGibson
RikkiGibson reviewed Oct 7, 2024
View reviewed changes
Copy link
Contributor

@RikkiGibson RikkiGibson left a comment

Choose a reason for hiding this comment

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

Just one minor question, otherwise looks good

333fred
333fred reviewed Oct 7, 2024
View reviewed changes
src/Compilers/CSharp/Test/Semantic/Semantics/ConstantTests.cs Outdated
Copy link
Member

@333fred 333fred Oct 7, 2024 •
edited by jcouv
Loading

Choose a reason for hiding this comment

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

Consider adding a test for a collection expression like [x]. #Resolved

@AlekseyTs
Copy link
Contributor

AlekseyTs commented Oct 8, 2024 •
edited
Loading

Consider opening an issue to check for other binders that are created on the fly, which could be "lost" in similar scenarios. #Closed

@AlekseyTs
Copy link
Contributor

AlekseyTs commented Oct 8, 2024 •
edited
Loading

Done with review pass (commit 1) #Closed

AlekseyTs
AlekseyTs reviewed Oct 8, 2024
View reviewed changes
src/Compilers/CSharp/Portable/Binder/LocalBinderFactory.cs Outdated
if (node.Initializer is { } initializer)
{
var oldEnclosing = _enclosing;
var localInProgressBinder = new LocalInProgressBinder(initializer, _enclosing);
Copy link
Contributor

@AlekseyTs AlekseyTs Oct 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

new LocalInProgressBinder(initializer, _enclosing)

Would it make sense to limit creation of the extra binder to const declarations? #Closed

@jcouv jcouv mentioned this pull request Oct 8, 2024
Open
AlekseyTs
AlekseyTs reviewed Oct 8, 2024
View reviewed changes
src/Compilers/CSharp/Portable/Symbols/Source/SourceLocalSymbol.cs Outdated
@@ -536,7 +536,25 @@ public LocalWithInitializer(
Debug.Assert(initializer != null);

_initializer = initializer;
_initializerBinder = initializerBinder;
_initializerBinder = initializerBinder.GetBinder(initializer) ?? new LocalInProgressBinder(_initializer, initializerBinder);
Copy link
Contributor

@AlekseyTs AlekseyTs Oct 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

new LocalInProgressBinder

We probably don't want to inject this binder for non-constants. #Closed

@AlekseyTs
Copy link
Contributor

Done with review pass (commit 3)

AlekseyTs
AlekseyTs reviewed Oct 9, 2024
View reviewed changes
src/Compilers/CSharp/Portable/Symbols/Source/SourceLocalSymbol.cs Outdated
@@ -536,7 +536,26 @@ public LocalWithInitializer(
Debug.Assert(initializer != null);

_initializer = initializer;
_initializerBinder = initializerBinder;
_initializerBinder = initializerBinder.GetBinder(initializer);
Copy link
Contributor

@AlekseyTs AlekseyTs Oct 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

initializerBinder.GetBinder(initializer)

It is expected to get null from this call for non-constant declarations. Most likely this is the reason why CI is failing. #Closed

@AlekseyTs
Copy link
Contributor

Done with review pass (commit 4)

AlekseyTs
AlekseyTs approved these changes Oct 10, 2024
View reviewed changes
Copy link
Contributor

@AlekseyTs AlekseyTs left a comment

Choose a reason for hiding this comment

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

LGTM (commit 5)

@jcouv jcouv merged commit d1afb2f into dotnet:main Oct 11, 2024
24 checks passed
@jcouv jcouv deleted the const-loop branch October 11, 2024 17:16
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone Oct 11, 2024
This was referenced Oct 22, 2024
Closed
Closed
@akhera99 akhera99 modified the milestones: Next, 17.13 P1 Oct 28, 2024
@dotnet-bot dotnet-bot mentioned this pull request Oct 29, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RikkiGibson RikkiGibson RikkiGibson left review comments

@AlekseyTs AlekseyTs AlekseyTs approved these changes

@333fred 333fred 333fred approved these changes

Assignees

@jcouv jcouv

Labels
Area-Compilers untriaged Issues and PRs which have not yet been triaged by a lead
Projects
None yet
Milestone
17.13 P1
Development

Successfully merging this pull request may close these issues.

crash on assigning result of a switch expression to a constant
5 participants
@jcouv @AlekseyTs @333fred @RikkiGibson @akhera99