diff --git a/src/cmd/compile/internal/gc/ssa.go b/src/cmd/compile/internal/gc/ssa.go index 220e266cca..b1745a9fc0 100644 --- a/src/cmd/compile/internal/gc/ssa.go +++ b/src/cmd/compile/internal/gc/ssa.go @@ -180,6 +180,7 @@ func buildssa(fn *Node) *ssa.Func { s.stmts(s.exitCode) m := s.mem() b := s.endBlock() + b.Line = fn.Func.Endlineno b.Kind = ssa.BlockRet b.Control = m } diff --git a/test/fixedbugs/issue14646.go b/test/fixedbugs/issue14646.go new file mode 100644 index 0000000000..96a685464f --- /dev/null +++ b/test/fixedbugs/issue14646.go @@ -0,0 +1,23 @@ +// run + +// Copyright 2016 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package main + +import "runtime" + +func main() { + var file string + var line int + func() { + defer func() { + _, file, line, _ = runtime.Caller(1) + }() + }() // this is the expected line + const EXPECTED = 18 + if line != EXPECTED { + println("Expected line =", EXPECTED, "but got line =", line, "and file =", file) + } +}