[dev.boringcrypto] all: merge master into dev.boringcrypto

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

diff --git a/src/cmd/compile/internal/reflectdata/reflect.go b/src/cmd/compile/internal/reflectdata/reflect.go
index 1137101650116c34e34209fa712f47a625122f20..affc6799abbedf4406d8196c44078ba8c5434ee7 100644 (file)
--- a/src/cmd/compile/internal/reflectdata/reflect.go
+++ b/src/cmd/compile/internal/reflectdata/reflect.go
@@ -667,10 +667,10 @@ var kinds = []int{
 // tflag is documented in reflect/type.go.
 //
 // tflag values must be kept in sync with copies in:
-//     - cmd/compile/internal/reflectdata/reflect.go
-//     - cmd/link/internal/ld/decodesym.go
-//     - reflect/type.go
-//     - runtime/type.go
+//   - cmd/compile/internal/reflectdata/reflect.go
+//   - cmd/link/internal/ld/decodesym.go
+//   - reflect/type.go
+//   - runtime/type.go
 const (
        tflagUncommon      = 1 << 0
        tflagExtraStar     = 1 << 1
@@ -1355,21 +1355,21 @@ func writeITab(lsym *obj.LSym, typ, iface *types.Type, allowNonImplement bool) {
        // type itab struct {
        //   inter  *interfacetype
        //   _type  *_type
-       //   hash   uint32
+       //   hash   uint32 // copy of _type.hash. Used for type switches.
        //   _      [4]byte
-       //   fun    [1]uintptr // variable sized
+       //   fun    [1]uintptr // variable sized. fun[0]==0 means _type does not implement inter.
        // }
        o := objw.SymPtr(lsym, 0, writeType(iface), 0)
        o = objw.SymPtr(lsym, o, writeType(typ), 0)
        o = objw.Uint32(lsym, o, types.TypeHash(typ)) // copy of type hash
        o += 4                                        // skip unused field
+       if !completeItab {
+               // If typ doesn't implement iface, make method entries be zero.
+               o = objw.Uintptr(lsym, o, 0)
+               entries = entries[:0]
+       }
        for _, fn := range entries {
-               if !completeItab {
-                       // If typ doesn't implement iface, make method entries be zero.
-                       o = objw.Uintptr(lsym, o, 0)
-               } else {
-                       o = objw.SymPtrWeak(lsym, o, fn, 0) // method pointer for each method
-               }
+               o = objw.SymPtrWeak(lsym, o, fn, 0) // method pointer for each method
        }
        // Nothing writes static itabs, so they are read only.
        objw.Global(lsym, int32(o), int16(obj.DUPOK|obj.RODATA))
@@ -1821,13 +1821,17 @@ func NeedEmit(typ *types.Type) bool {
 // Also wraps methods on instantiated generic types for use in itab entries.
 // For an instantiated generic type G[int], we generate wrappers like:
 // G[int] pointer shaped:
+//
 //     func (x G[int]) f(arg) {
 //             .inst.G[int].f(dictionary, x, arg)
-//     }
+//     }
+//
 // G[int] not pointer shaped:
+//
 //     func (x *G[int]) f(arg) {
 //             .inst.G[int].f(dictionary, *x, arg)
-//     }
+//     }
+//
 // These wrappers are always fully stenciled.
 func methodWrapper(rcvr *types.Type, method *types.Field, forItab bool) *obj.LSym {
        orig := rcvr