Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/compile: remove most uses of duintxx

Browse source 
The only remaining uses of duintxx
are in the implementation of duintNN.
I hope to inline those once I figure out why
CL 40864 is broken.

Note that some uses of duintxx with width Widthint
were converted into duintptr.
I did that, since #19954 is officially going to move forward.

Passes toolstash-check.

Change-Id: Id25253b711ea589d0199b51be9a3c18ca1af59ce
Reviewed-on: https://go-review.googlesource.com/41398
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
Josh Bleecher Snyder 2017-04-21 14:06:42 -07:00
parent a544df33fd
commit bea8ffdbb1
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/compile/internal/gc/obj.go
View file

@ -332,8 +332,8 @@ func slicebytes(nam *Node, s string, len int) {
} }
off = int(nam.Xoffset) off = int(nam.Xoffset)
off = dsymptr(nam.Sym.Linksym(), off, sym.Linksym(), 0) off = dsymptr(nam.Sym.Linksym(), off, sym.Linksym(), 0)
off = duintxx(nam.Sym.Linksym(), off, uint64(len), Widthint) off = duintptr(nam.Sym.Linksym(), off, uint64(len))
duintxx(nam.Sym.Linksym(), off, uint64(len), Widthint) duintptr(nam.Sym.Linksym(), off, uint64(len))
} }
func dsname(s *obj.LSym, off int, t string) int { func dsname(s *obj.LSym, off int, t string) int {

18
src/cmd/compile/internal/gc/reflect.go
View file

@ -459,7 +459,7 @@ func dgopkgpath(s *types.Sym, ot int, pkg *types.Pkg) int {
func dgopkgpathLSym(s *obj.LSym, ot int, pkg *types.Pkg) int { func dgopkgpathLSym(s *obj.LSym, ot int, pkg *types.Pkg) int {
if pkg == nil { if pkg == nil {
return duintxx(s, ot, 0, Widthptr) return duintptr(s, ot, 0)
} }
if pkg == localpkg && myimportpath == "" { if pkg == localpkg && myimportpath == "" {
@ -479,7 +479,7 @@ func dgopkgpathLSym(s *obj.LSym, ot int, pkg *types.Pkg) int {
// dgopkgpathOffLSym writes an offset relocation in s at offset ot to the pkg path symbol. // dgopkgpathOffLSym writes an offset relocation in s at offset ot to the pkg path symbol.
func dgopkgpathOffLSym(s *obj.LSym, ot int, pkg *types.Pkg) int { func dgopkgpathOffLSym(s *obj.LSym, ot int, pkg *types.Pkg) int {
if pkg == nil { if pkg == nil {
return duintxx(s, ot, 0, 4) return duint32(s, ot, 0)
} }
if pkg == localpkg && myimportpath == "" { if pkg == localpkg && myimportpath == "" {
// If we don't know the full import path of the package being compiled // If we don't know the full import path of the package being compiled
@ -673,7 +673,7 @@ func dextratypeData(s *types.Sym, ot int, t *types.Type) int {
} }
func dmethodptrOffLSym(s *obj.LSym, ot int, x *obj.LSym) int { func dmethodptrOffLSym(s *obj.LSym, ot int, x *obj.LSym) int {
duintxx(s, ot, 0, 4) duint32(s, ot, 0)
r := obj.Addrel(s) r := obj.Addrel(s)
r.Off = int32(ot) r.Off = int32(ot)
r.Siz = 4 r.Siz = 4
@ -1204,8 +1204,8 @@ ok:
ot = dgopkgpath(s, ot, tpkg) ot = dgopkgpath(s, ot, tpkg)
ot = dsymptr(s.Linksym(), ot, s.Linksym(), ot+Widthptr+2*Widthint+uncommonSize(t)) ot = dsymptr(s.Linksym(), ot, s.Linksym(), ot+Widthptr+2*Widthint+uncommonSize(t))
ot = duintxx(s.Linksym(), ot, uint64(n), Widthint) ot = duintptr(s.Linksym(), ot, uint64(n))
ot = duintxx(s.Linksym(), ot, uint64(n), Widthint) ot = duintptr(s.Linksym(), ot, uint64(n))
dataAdd := imethodSize() * n dataAdd := imethodSize() * n
ot = dextratype(s, ot, t, dataAdd) ot = dextratype(s, ot, t, dataAdd)
@ -1297,8 +1297,8 @@ ok:
} }
ot = dgopkgpath(s, ot, pkg) ot = dgopkgpath(s, ot, pkg)
ot = dsymptr(s.Linksym(), ot, s.Linksym(), ot+Widthptr+2*Widthint+uncommonSize(t)) ot = dsymptr(s.Linksym(), ot, s.Linksym(), ot+Widthptr+2*Widthint+uncommonSize(t))
ot = duintxx(s.Linksym(), ot, uint64(n), Widthint) ot = duintptr(s.Linksym(), ot, uint64(n))
ot = duintxx(s.Linksym(), ot, uint64(n), Widthint) ot = duintptr(s.Linksym(), ot, uint64(n))
dataAdd := n * structfieldSize() dataAdd := n * structfieldSize()
ot = dextratype(s, ot, t, dataAdd) ot = dextratype(s, ot, t, dataAdd)
@ -1575,7 +1575,7 @@ func dalgsym(t *types.Type) *types.Sym {
ot := 0 ot := 0
ot = dsymptr(hashfunc.Linksym(), ot, Runtimepkg.Lookup("memhash_varlen").Linksym(), 0) ot = dsymptr(hashfunc.Linksym(), ot, Runtimepkg.Lookup("memhash_varlen").Linksym(), 0)
ot = duintxx(hashfunc.Linksym(), ot, uint64(t.Width), Widthptr) // size encoded in closure ot = duintptr(hashfunc.Linksym(), ot, uint64(t.Width)) // size encoded in closure
ggloblsym(hashfunc, int32(ot), obj.DUPOK|obj.RODATA) ggloblsym(hashfunc, int32(ot), obj.DUPOK|obj.RODATA)
// make equality closure // make equality closure
@ -1585,7 +1585,7 @@ func dalgsym(t *types.Type) *types.Sym {
ot = 0 ot = 0
ot = dsymptr(eqfunc.Linksym(), ot, Runtimepkg.Lookup("memequal_varlen").Linksym(), 0) ot = dsymptr(eqfunc.Linksym(), ot, Runtimepkg.Lookup("memequal_varlen").Linksym(), 0)
ot = duintxx(eqfunc.Linksym(), ot, uint64(t.Width), Widthptr) ot = duintptr(eqfunc.Linksym(), ot, uint64(t.Width))
ggloblsym(eqfunc, int32(ot), obj.DUPOK|obj.RODATA) ggloblsym(eqfunc, int32(ot), obj.DUPOK|obj.RODATA)
} else { } else {
// generate an alg table specific to this type // generate an alg table specific to this type