aboutsummaryrefslogtreecommitdiff
path: root/src/pkg/runtime/runtime.c
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2013-07-16 09:41:38 -0400
committerRuss Cox <rsc@golang.org>2013-07-16 09:41:38 -0400
commit5d363c6357ebcacc8ba7c24420f7cfd2e530591a (patch)
treebc168c1cbd6483edd35aa74cdab1481812cdfc3c /src/pkg/runtime/runtime.c
parent63e0ddc7bf0c7523d826331ff51a551c5040b50b (diff)
downloadgo-5d363c6357ebcacc8ba7c24420f7cfd2e530591a.tar.xz
cmd/ld, runtime: new in-memory symbol table format
Design at http://golang.org/s/go12symtab. This enables some cleanup of the garbage collector metadata that will be done in future CLs. This CL does not move the old symtab and pclntab back into an unmapped section of the file. That's a bit tricky and will be done separately. Fixes #4020. R=golang-dev, dave, cshapiro, iant, r CC=golang-dev, nigeltao https://golang.org/cl/11085043
Diffstat (limited to 'src/pkg/runtime/runtime.c')
-rw-r--r--src/pkg/runtime/runtime.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pkg/runtime/runtime.c b/src/pkg/runtime/runtime.c
index f0571f1899..9b5f6c8ca3 100644
--- a/src/pkg/runtime/runtime.c
+++ b/src/pkg/runtime/runtime.c
@@ -294,12 +294,11 @@ runtime·Caller(intgo skip, uintptr retpc, String retfile, intgo retline, bool r
retbool = true; // have retpc at least
} else {
retpc = rpc[1];
- retfile = f->src;
pc = retpc;
g = runtime·findfunc(rpc[0]);
if(pc > f->entry && (g == nil || g->entry != (uintptr)runtime·sigpanic))
pc--;
- retline = runtime·funcline(f, pc);
+ retline = runtime·funcline(f, pc, &retfile);
retbool = true;
}
FLUSH(&retpc);