From: Josh Bleecher Snyder <josharian@gmail.com>
Date: Fri, 21 Apr 2017 21:40:05 +0000 (-0700)
Subject: cmd/compile: unify a Linksym call in dcommontype
X-Git-Tag: go1.9beta1~538
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0d1e903c8a1d6060a1bb82eb8f78fc4de35425b7;p=gostls13.git

cmd/compile: unify a Linksym call in dcommontype

Passes toolstash-check.

Change-Id: I9940909949da58e780696e6de0c21f95be7a8816
Reviewed-on: https://go-review.googlesource.com/41407
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
---

diff --git a/src/cmd/compile/internal/gc/reflect.go b/src/cmd/compile/internal/gc/reflect.go
index 42278f3607..2c1f5a1151 100644
--- a/src/cmd/compile/internal/gc/reflect.go
+++ b/src/cmd/compile/internal/gc/reflect.go
@@ -793,13 +793,13 @@ func dcommontype(lsym *obj.LSym, ot int, t *types.Type) int {
 	}
 
 	sptrWeak := true
-	var sptr *types.Sym
+	var sptr *obj.LSym
 	if !t.IsPtr() || t.PtrBase != nil {
 		tptr := types.NewPtr(t)
 		if t.Sym != nil || methods(tptr) != nil {
 			sptrWeak = false
 		}
-		sptr = dtypesym(tptr)
+		sptr = dtypesym(tptr).Linksym()
 	}
 
 	gcsym, useGCProg, ptrdata := dgcsym(t)
@@ -888,9 +888,9 @@ func dcommontype(lsym *obj.LSym, ot int, t *types.Type) int {
 	if sptr == nil {
 		ot = duint32(lsym, ot, 0)
 	} else if sptrWeak {
-		ot = dsymptrWeakOff(lsym, ot, sptr.Linksym())
+		ot = dsymptrWeakOff(lsym, ot, sptr)
 	} else {
-		ot = dsymptrOff(lsym, ot, sptr.Linksym(), 0)
+		ot = dsymptrOff(lsym, ot, sptr, 0)
 	}
 
 	return ot