From: Keith Randall <khr@golang.org>
Date: Tue, 12 Apr 2016 23:25:48 +0000 (-0700)
Subject: cmd/compile: fix arg to getcallerpc
X-Git-Tag: go1.7beta1~723
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=260b7daf0a3fa1548d976f2484325240d4bdb73a;p=gostls13.git

cmd/compile: fix arg to getcallerpc

getcallerpc's arg needs to point to the first argument slot.
I believe this bug was introduced by Michel's itab changes
(specifically https://go-review.googlesource.com/c/20902).

Fixes #15145

Change-Id: Ifb2e17f3658e2136c7950dfc789b4d5706320683
Reviewed-on: https://go-review.googlesource.com/21931
Reviewed-by: Michel Lespinasse <walken@google.com>
---

diff --git a/src/runtime/iface.go b/src/runtime/iface.go
index 3ce1e237d3..a4c962fb7a 100644
--- a/src/runtime/iface.go
+++ b/src/runtime/iface.go
@@ -173,7 +173,7 @@ func convT2E(t *_type, elem unsafe.Pointer, x unsafe.Pointer) (e eface) {
 func convT2I(tab *itab, elem unsafe.Pointer, x unsafe.Pointer) (i iface) {
 	t := tab._type
 	if raceenabled {
-		raceReadObjectPC(t, elem, getcallerpc(unsafe.Pointer(&t)), funcPC(convT2I))
+		raceReadObjectPC(t, elem, getcallerpc(unsafe.Pointer(&tab)), funcPC(convT2I))
 	}
 	if msanenabled {
 		msanread(elem, t.size)