[dev.cc] all: merge dev.power64 (7667e41f3ced) into dev.cc

[gostls13.git] / src / runtime / gcinfo_test.go

diff --git a/src/runtime/gcinfo_test.go b/src/runtime/gcinfo_test.go
index 2c6d4d662f195b80d2e61f01cc6724652d1ac7f5..2b45c8184d5882bb8b8374806320cca5be1241f6 100644 (file)
--- a/src/runtime/gcinfo_test.go
+++ b/src/runtime/gcinfo_test.go
@@ -62,12 +62,10 @@ func verifyGCInfo(t *testing.T, name string, p interface{}, mask0 []byte) {
 func nonStackInfo(mask []byte) []byte {
        // BitsDead is replaced with BitsScalar everywhere except stacks.
        mask1 := make([]byte, len(mask))
-       mw := false
        for i, v := range mask {
-               if !mw && v == BitsDead {
+               if v == BitsDead {
                        v = BitsScalar
                }
-               mw = !mw && v == BitsMultiWord
                mask1[i] = v
        }
        return mask1
@@ -84,7 +82,6 @@ const (
        BitsDead = iota
        BitsScalar
        BitsPointer
-       BitsMultiWord
 )
 
 const (
@@ -188,6 +185,6 @@ var (
 
        infoString = []byte{BitsPointer, BitsDead}
        infoSlice  = []byte{BitsPointer, BitsDead, BitsDead}
-       infoEface  = []byte{BitsMultiWord, BitsEface}
-       infoIface  = []byte{BitsMultiWord, BitsIface}
+       infoEface  = []byte{BitsPointer, BitsPointer}
+       infoIface  = []byte{BitsPointer, BitsPointer}
 )