Skip to content

internal/refactor/inline: always retain braces for binding declarations#79842

Open
AshvinBambhaniya wants to merge 1 commit into
golang:masterfrom
AshvinBambhaniya:master
Open

internal/refactor/inline: always retain braces for binding declarations#79842
AshvinBambhaniya wants to merge 1 commit into
golang:masterfrom
AshvinBambhaniya:master

Conversation

@AshvinBambhaniya
Copy link
Copy Markdown

When inlining a function that requires a binding declaration (e.g.,
'var p = arg'), the inliner must ensure that the new variable does
not collide with other declarations in the same scope.

Previously, the inliner would often elide the braces around the
inlined body if the chosen variable name (the parameter name) was
not yet present in the caller's scope. However, when multiple calls
are inlined into the same block, independent inlining passes may
choose the same name, leading to a redeclaration error.

This change modifies Go to always retain block braces whenever a
binding declaration is introduced. This provides guaranteed scope
isolation for the new variables and prevents redeclaration conflicts
between multiple concurrent inlinings.

Additionally, this fix adds a missing 'res.bindingDecl = true' flag
in the void-function inlining strategy, which was previously causing
some inlinings to incorrectly elide braces even when variables were
introduced.

Fixes #79813

When inlining a function that requires a binding declaration (e.g.,
'var p = arg'), the inliner must ensure that the new variable does
not collide with other declarations in the same scope.

Previously, the inliner would often elide the braces around the
inlined body if the chosen variable name (the parameter name) was
not yet present in the caller's scope. However, when multiple calls
are inlined into the same block, independent inlining passes may
choose the same name, leading to a redeclaration error.

This CL ensures that we always retain block braces whenever a
binding declaration is introduced. This provides guaranteed scope
isolation for the new variables and prevents redeclaration conflicts
between multiple concurrent inlinings.

Additionally, this fix adds a missing 'res.bindingDecl = true' flag
in the void-function inlining strategy, which was previously causing
some inlinings to incorrectly elide braces even when variables were
introduced.

Fixes golang#79813
@google-cla
Copy link
Copy Markdown

google-cla Bot commented Jun 5, 2026

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@gopherbot
Copy link
Copy Markdown
Contributor

This PR (HEAD: aa40121) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/go/+/787240.

Important tips:

  • Don't comment on this PR. All discussion takes place in Gerrit.
  • You need a Gmail or other Google account to log in to Gerrit.
  • To change your code in response to feedback:
    • Push a new commit to the branch used by your GitHub PR.
    • A new "patch set" will then appear in Gerrit.
    • Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
    • Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
    • Multiple commits in the PR will be squashed by GerritBot.
  • The title and description of the GitHub PR are used to construct the final commit message.
    • Edit these as needed via the GitHub web interface (not via Gerrit or git).
    • You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
  • See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.

@gopherbot
Copy link
Copy Markdown
Contributor

Message from Gopher Robot:

Patch Set 1:

Congratulations on opening your first change. Thank you for your contribution!

Next steps:
A maintainer will review your change and provide feedback. See
https://go.dev/doc/contribute#review for more info and tips to get your
patch through code review.

Most changes in the Go project go through a few rounds of revision. This can be
surprising to people new to the project. The careful, iterative review process
is our way of helping mentor contributors and ensuring that their contributions
have a lasting impact.

During May-July and Nov-Jan the Go project is in a code freeze, during which
little code gets reviewed or merged. If a reviewer responds with a comment like
R=go1.11 or adds a tag like "wait-release", it means that this CL will be
reviewed as part of the next development cycle. See https://go.dev/s/release
for more details.


Please don’t reply on this GitHub thread. Visit golang.org/cl/787240.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link
Copy Markdown
Contributor

Message from Viacheslav Danilin:

Patch Set 1:

(1 comment)


Please don’t reply on this GitHub thread. Visit golang.org/cl/787240.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link
Copy Markdown
Contributor

Message from Alan Donovan:

Patch Set 1:

(1 comment)


Please don’t reply on this GitHub thread. Visit golang.org/cl/787240.
After addressing review feedback, remember to publish your drafts!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

cmd/go: go fix breaks code using //go:fix inline due to semantic conflict

2 participants