summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Clements <austin@google.com>2014-10-31 16:58:12 -0400
committerAustin Clements <austin@google.com>2014-10-31 16:58:12 -0400
commitcedcc14ea2c8723cfa165376dca9fdb75195167e (patch)
treee048c53566f487b63f06b2c61835630a355d8a17
parent80d520fcf0ef4c98f3da5f49b45e6559fd31be11 (diff)
downloadgo-cedcc14ea2c8723cfa165376dca9fdb75195167e.tar.gz
[dev.power64] runtime: fix gcinfo_test on power64x
The GC info masks for slices and strings were changed in commit caab29a25f68, but the reference masks used by gcinfo_test for power64x hadn't caught up. Now they're identical to amd64, so this CL fixes this test by combining the reference masks for these platforms. LGTM=rsc R=rsc, dave CC=golang-codereviews https://codereview.appspot.com/162620044
-rw-r--r--src/runtime/gcinfo_test.go8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/runtime/gcinfo_test.go b/src/runtime/gcinfo_test.go
index 7d432983b..2c6d4d662 100644
--- a/src/runtime/gcinfo_test.go
+++ b/src/runtime/gcinfo_test.go
@@ -137,7 +137,7 @@ func infoBigStruct() []byte {
BitsScalar, BitsScalar, BitsScalar, BitsScalar, // t int; y uint16; u uint64
BitsPointer, BitsDead, // i string
}
- case "amd64":
+ case "amd64", "power64", "power64le":
return []byte{
BitsPointer, // q *int
BitsScalar, BitsScalar, BitsScalar, // w byte; e [17]byte
@@ -153,12 +153,6 @@ func infoBigStruct() []byte {
BitsScalar, BitsScalar, BitsDead, BitsScalar, BitsScalar, // t int; y uint16; u uint64
BitsPointer, BitsDead, // i string
}
- case "power64", "power64le":
- return []byte{
- BitsPointer, BitsScalar, BitsScalar, BitsScalar,
- BitsMultiWord, BitsSlice, BitsScalar, BitsScalar,
- BitsScalar, BitsScalar, BitsMultiWord, BitsString,
- }
default:
panic("unknown arch")
}