]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/compile: unify a Linksym call in dcommontype
authorJosh Bleecher Snyder <josharian@gmail.com>
Fri, 21 Apr 2017 21:40:05 +0000 (14:40 -0700)
committerJosh Bleecher Snyder <josharian@gmail.com>
Fri, 21 Apr 2017 23:16:12 +0000 (23:16 +0000)
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>
src/cmd/compile/internal/gc/reflect.go

index 42278f360785bebf906edfa4c0a683e095c14b49..2c1f5a1151d8df0042033e47643d3f2c3ccca63a 100644 (file)
@@ -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