[dev.boringcrypto] crypto/hmac: merge up to 2a206c7 and skip test

[gostls13.git] / src / cmd / compile / internal / gc / reflect.go

diff --git a/src/cmd/compile/internal/gc/reflect.go b/src/cmd/compile/internal/gc/reflect.go
index 93dbb9f69029e163aa751a43672bcc1dfe3b5a9d..d16a00b7873bb06bb31f80206cee69ab31419b2d 100644 (file)
--- a/src/cmd/compile/internal/gc/reflect.go
+++ b/src/cmd/compile/internal/gc/reflect.go
@@ -61,8 +61,9 @@ const (
        MAXELEMSIZE = 128
 )
 
-func structfieldSize() int { return 3 * Widthptr } // Sizeof(runtime.structfield{})
-func imethodSize() int     { return 4 + 4 }        // Sizeof(runtime.imethod{})
+func structfieldSize() int { return 3 * Widthptr }       // Sizeof(runtime.structfield{})
+func imethodSize() int     { return 4 + 4 }              // Sizeof(runtime.imethod{})
+func commonSize() int      { return 4*Widthptr + 8 + 8 } // Sizeof(runtime._type{})
 
 func uncommonSize(t *types.Type) int { // Sizeof(runtime.uncommontype{})
        if t.Sym == nil && len(methods(t)) == 0 {
@@ -510,6 +511,7 @@ func dimportpath(p *types.Pkg) {
        s := Ctxt.Lookup("type..importpath." + p.Prefix + ".")
        ot := dnameData(s, 0, str, "", nil, false)
        ggloblsym(s, int32(ot), obj.DUPOK|obj.RODATA)
+       s.Set(obj.AttrContentAddressable, true)
        p.Pathsym = s
 }
 
@@ -637,6 +639,7 @@ func dname(name, tag string, pkg *types.Pkg, exported bool) *obj.LSym {
        }
        ot := dnameData(s, 0, name, tag, pkg, exported)
        ggloblsym(s, int32(ot), obj.DUPOK|obj.RODATA)
+       s.Set(obj.AttrContentAddressable, true)
        return s
 }
 
@@ -1272,8 +1275,9 @@ func dtypesym(t *types.Type) *obj.LSym {
                }
                ot = dgopkgpath(lsym, ot, tpkg)
 
+               xcount := sort.Search(n, func(i int) bool { return !types.IsExported(m[i].name.Name) })
                ot = dsymptr(lsym, ot, lsym, ot+3*Widthptr+uncommonSize(t))
-               ot = duintptr(lsym, ot, uint64(n))
+               ot = duintptr(lsym, ot, uint64(xcount))
                ot = duintptr(lsym, ot, uint64(n))
                dataAdd := imethodSize() * n
                ot = dextratype(lsym, ot, t, dataAdd)
@@ -1449,6 +1453,20 @@ func dtypesym(t *types.Type) *obj.LSym {
        return lsym
 }
 
+// ifaceMethodOffset returns the offset of the i-th method in the interface
+// type descriptor, ityp.
+func ifaceMethodOffset(ityp *types.Type, i int64) int64 {
+       // interface type descriptor layout is struct {
+       //   _type        // commonSize
+       //   pkgpath      // 1 word
+       //   []imethod    // 3 words (pointing to [...]imethod below)
+       //   uncommontype // uncommonSize
+       //   [...]imethod
+       // }
+       // The size of imethod is 8.
+       return int64(commonSize()+4*Widthptr+uncommonSize(ityp)) + i*8
+}
+
 // for each itabEntry, gather the methods on
 // the concrete type that implement the interface
 func peekitabs() {