cmd/cgo: add line info for return statements

When calling a C function, line information will be
incorrect if the function call's closing parenthesis
is not on the same line as the last argument. We add
a comment with the line info for the return statement
to guide debuggers to the correct line.

Fixes #49839.

Change-Id: I8bc2ce35fec9cbcafbbe8536d5a79dc487eb24bb
GitHub-Last-Rev: 8b28646d2e
GitHub-Pull-Request: golang/go#49840
Reviewed-on: https://go-review.googlesource.com/c/go/+/367454
Reviewed-by: David Chase <drchase@google.com>
Run-TryBot: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
This commit is contained in:
Patrick Pokatilo 2021-11-29 07:22:15 +00:00 committed by Gopher Robot
parent 831f116828
commit 0ad74fd1dc

View file

@ -811,6 +811,7 @@ func (p *Package) rewriteCall(f *File, call *Call) (string, bool) {
params := name.FuncType.Params params := name.FuncType.Params
args := call.Call.Args args := call.Call.Args
end := call.Call.End()
// Avoid a crash if the number of arguments doesn't match // Avoid a crash if the number of arguments doesn't match
// the number of parameters. // the number of parameters.
@ -958,7 +959,7 @@ func (p *Package) rewriteCall(f *File, call *Call) (string, bool) {
if nu { if nu {
needsUnsafe = true needsUnsafe = true
} }
sb.WriteString(gofmtLine(m)) sb.WriteString(gofmtPos(m, end))
sb.WriteString("(") sb.WriteString("(")
for i := range params { for i := range params {