[checklocks] Use function line info for error messages when return instruction has no line numbers attached #12347
+11
−3
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
ayushr2
reviewed
Dec 8, 2025
Collaborator
|
Can you squash your commits, we don't have the ability to squash and merge yet. |
uzairnawaz
force-pushed
the
return-parent-line-numbers
branch
from
6e7b714 to
dc3d29a
Compare
uzairnawaz
force-pushed
the
return-parent-line-numbers
branch
from
dc3d29a to
9a04865
Compare
ayushr2
approved these changes
Dec 9, 2025
copybara-service bot
pushed a commit
that referenced
this pull request
Dec 9, 2025
…struction has no line numbers attached Resolves line information issues described by #11203 For functions that don't include explicit return statements in the Go source code, the ssa package inserts return instructions without line information attached, leading to poor error messages. Ex: -: return with unexpected locks held (locks: &({param:f}.mu) exclusively) Quick fix is to instead use the line number information of the parent function instead. FUTURE_COPYBARA_INTEGRATE_REVIEW=#12347 from uzairnawaz:return-parent-line-numbers 9a04865 PiperOrigin-RevId: 842286019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Resolves line information issues described by #11203
For functions that don't include explicit return statements in the Go source code, the ssa package inserts return instructions without line information attached, leading to poor error messages.
Ex: -: return with unexpected locks held (locks: &({param:f}.mu) exclusively)
Quick fix is to instead use the line number information of the parent function instead.