From: Russ Cox <rsc@golang.org>
Date: Mon, 29 Jun 2015 02:26:35 +0000 (-0400)
Subject: cmd/link: record missing pcdata tables correctly
X-Git-Tag: go1.5beta1~59
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=434e0bc0a06afa124a6d9167fa51b5d02ff4db14;p=gostls13.git

cmd/link: record missing pcdata tables correctly

The old code was recording the current table output offset,
so the table from the next function would be used instead of
the runtime realizing that there was no table at all.

Add debug constant in runtime to check this for every function
at startup. It's too expensive to do that by default, but we can
do the last five functions. The end of the table is usually where
the C symbols end up, so that's where the problems typically are.

Fixes #10747.
Fixes #11396.

Change-Id: I13592e78017969fc22979fa902e19e1b151d41b1
Reviewed-on: https://go-review.googlesource.com/11657
Reviewed-by: Keith Randall <khr@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
---

diff --git a/src/cmd/link/internal/ld/pcln.go b/src/cmd/link/internal/ld/pcln.go
index 56d813bfde..669776244c 100644
--- a/src/cmd/link/internal/ld/pcln.go
+++ b/src/cmd/link/internal/ld/pcln.go
@@ -122,10 +122,12 @@ func addvarint(d *Pcdata, val uint32) {
 }
 
 func addpctab(ftab *LSym, off int32, d *Pcdata) int32 {
-	start := int32(len(ftab.P))
-	Symgrow(Ctxt, ftab, int64(start)+int64(len(d.P)))
-	copy(ftab.P[start:], d.P)
-
+	var start int32
+	if len(d.P) > 0 {
+		start = int32(len(ftab.P))
+		Symgrow(Ctxt, ftab, int64(start)+int64(len(d.P)))
+		copy(ftab.P[start:], d.P)
+	}
 	return int32(setuint32(Ctxt, ftab, int64(off), uint32(start)))
 }
 
diff --git a/src/runtime/symtab.go b/src/runtime/symtab.go
index 687f067cb9..f02f592413 100644
--- a/src/runtime/symtab.go
+++ b/src/runtime/symtab.go
@@ -98,6 +98,8 @@ func moduledataverify() {
 	}
 }
 
+const debugPcln = false
+
 func moduledataverify1(datap *moduledata) {
 	// See golang.org/s/go12symtab for header: 0xfffffffb,
 	// two zero bytes, a byte giving the PC quantum,
@@ -126,6 +128,13 @@ func moduledataverify1(datap *moduledata) {
 			}
 			throw("invalid runtime symbol table")
 		}
+
+		if debugPcln || nftab-i < 5 {
+			f := (*_func)(unsafe.Pointer(&datap.pclntable[datap.ftab[i].funcoff]))
+			pcvalue(f, f.pcfile, datap.ftab[i+1].entry-1, true)
+			pcvalue(f, f.pcln, datap.ftab[i+1].entry-1, true)
+			pcvalue(f, f.pcsp, datap.ftab[i+1].entry-1, true)
+		}
 	}
 
 	if datap.minpc != datap.ftab[0].entry ||
@@ -275,7 +284,7 @@ func funcline(f *_func, targetpc uintptr) (file string, line int32) {
 func funcspdelta(f *_func, targetpc uintptr) int32 {
 	x := pcvalue(f, f.pcsp, targetpc, true)
 	if x&(ptrSize-1) != 0 {
-		print("invalid spdelta ", hex(f.entry), " ", hex(targetpc), " ", hex(f.pcsp), " ", x, "\n")
+		print("invalid spdelta ", funcname(f), " ", hex(f.entry), " ", hex(targetpc), " ", hex(f.pcsp), " ", x, "\n")
 	}
 	return x
 }