diff options
| author | Russ Cox <rsc@golang.org> | 2014-11-15 08:00:38 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-11-15 08:00:38 -0500 |
| commit | 8b46a22b652d6e7a4a69b9523d57aff12f9dc945 (patch) | |
| tree | 8f1c3f2d7e06daa3a9ad5721658a31b63519d748 /src/runtime/extern.go | |
| parent | 66fbfa707147ff58e13beed2d4a957a06bede869 (diff) | |
| parent | 0b7f128e76956367ddb4f9ddbee4477d3b462e96 (diff) | |
| download | go-8b46a22b652d6e7a4a69b9523d57aff12f9dc945.tar.gz | |
[dev.garbage] all: merge dev.cc into dev.garbage
The garbage collector is now written in Go.
There is plenty to clean up (just like on dev.cc).
all.bash passes on darwin/amd64, darwin/386, linux/amd64, linux/386.
TBR=rlh
R=austin, rlh, bradfitz
CC=golang-codereviews
https://codereview.appspot.com/173250043
Diffstat (limited to 'src/runtime/extern.go')
| -rw-r--r-- | src/runtime/extern.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/runtime/extern.go b/src/runtime/extern.go index 6cc5df810..34fdeb2b4 100644 --- a/src/runtime/extern.go +++ b/src/runtime/extern.go @@ -112,7 +112,8 @@ func Caller(skip int) (pc uintptr, file string, line int, ok bool) { if xpc > f.entry && (g == nil || g.entry != funcPC(sigpanic)) { xpc-- } - line = int(funcline(f, xpc, &file)) + file, line32 := funcline(f, xpc) + line = int(line32) ok = true return } |