Skip to content

[checklocks] Use function line info for error messages when return instruction has no line numbers attached #12347

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

Open
uzairnawaz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[checklocks] Use function line info for error messages when return instruction has no line numbers attached #12347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions tools/checklocks/analysis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,17 +731,25 @@ func (pc *passContext) checkBasicBlock(fn *ssa.Function, block *ssa.BasicBlock,
rv, rls = pc.checkInstruction(inst, lff, ls)
if rls != nil {
failed := false

// if there is no line information attached to the return
// instruction, use the line info of the function itself
pos := rv.Pos()
if (pos == token.NoPos) {
pos = rv.Parent().Pos()
}

// Validate held locks.
for fieldName, fg := range lff.HeldOnExit {
r := fg.Resolver.resolveStatic(pc, ls, fn, rv)
if !r.valid() {
// This cannot be forced, since we have no reference.
pc.maybeFail(rv.Pos(), "lock %s cannot be resolved", fieldName)
pc.maybeFail(pos, "lock %s cannot be resolved", fieldName)
continue
}
if s, ok := rls.isHeld(r, fg.Exclusive); !ok {
if _, ok := pc.forced[pc.positionKey(rv.Pos())]; !ok && !lff.Ignore {
pc.maybeFail(rv.Pos(), "lock %s (%s) not held %s (locks: %s)", fieldName, s, exclusiveStr(fg.Exclusive), rls.String())
pc.maybeFail(pos, "lock %s (%s) not held %s (locks: %s)", fieldName, s, exclusiveStr(fg.Exclusive), rls.String())
failed = true
} else {
// Force the lock to be acquired.
Expand All @@ -751,7 +759,7 @@ func (pc *passContext) checkBasicBlock(fn *ssa.Function, block *ssa.BasicBlock,
}
// Check for other locks, but only if the above didn't trip.
if !failed && rls.count() != len(lff.HeldOnExit) && !lff.Ignore {
pc.maybeFail(rv.Pos(), "return with unexpected locks held (locks: %s)", rls.String())
pc.maybeFail(pos, "return with unexpected locks held (locks: %s)", rls.String())
}
}
}
Expand Down