Revert "cmd/compile: move hiter, hmap, and scase definitions into builtin.go"
This reverts commit f28bbb776a050cc3edca2bbe1241d81217a7a251.
Change-Id: I82fb81dcff3ddcaefef72949f1ef3a41bcd22301
Reviewed-on: https://go-review.googlesource.com/19849
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
diff --git a/src/cmd/compile/internal/gc/builtin/runtime.go b/src/cmd/compile/internal/gc/builtin/runtime.go
index e067d0b..0fe6242 100644
--- a/src/cmd/compile/internal/gc/builtin/runtime.go
+++ b/src/cmd/compile/internal/gc/builtin/runtime.go
@@ -12,49 +12,6 @@
// emitted by compiler, not referred to by go programs
-type hbucket byte // placeholder
-
-// Changes here must also be made in src/runtime/hashmap.go.
-type hmap struct {
- count int
- flags uint8
- B uint8
- hash0 uint32
- buckets *hbucket
- oldbuckets *hbucket
- nevacuate uintptr
- overflow *[2]*[]*hbucket
-}
-
-// Changes here must also be made in src/runtime/hashmap.go.
-type hiter struct {
- key *byte // field name known to walkrange
- value *byte // field name known to walkrange
- t *byte // *maptype
- h *hmap
- buckets *hbucket
- bptr *hbucket
- overflow [2]*[]*hbucket
- startBucket uintptr
- offset uint8
- wrapped bool
- B uint8
- i uint8
- bucket uintptr
- checkBucket uintptr
-}
-
-// Changes here must also be made in src/runtime/select.go.
-type scase struct {
- elem *byte
- c *byte
- pc uintptr
- kind uint16
- so uint16
- receivedp *bool
- releasetime int64
-}
-
func newobject(typ *byte) *any
func panicindex()
func panicslice()
@@ -128,7 +85,7 @@
func efaceeq(i1 any, i2 any) (ret bool)
// *byte is really *runtime.Type
-func makemap(mapType *byte, hint int64, mapbuf *hmap, bucketbuf *any) (hmap map[any]any)
+func makemap(mapType *byte, hint int64, mapbuf *any, bucketbuf *any) (hmap map[any]any)
func mapaccess1(mapType *byte, hmap map[any]any, key *any) (val *any)
func mapaccess1_fast32(mapType *byte, hmap map[any]any, key any) (val *any)
func mapaccess1_fast64(mapType *byte, hmap map[any]any, key any) (val *any)
@@ -138,9 +95,9 @@
func mapaccess2_fast64(mapType *byte, hmap map[any]any, key any) (val *any, pres bool)
func mapaccess2_faststr(mapType *byte, hmap map[any]any, key any) (val *any, pres bool)
func mapassign1(mapType *byte, hmap map[any]any, key *any, val *any)
-func mapiterinit(mapType *byte, hmap map[any]any, hiter *hiter)
+func mapiterinit(mapType *byte, hmap map[any]any, hiter *any)
func mapdelete(mapType *byte, hmap map[any]any, key *any)
-func mapiternext(hiter *hiter)
+func mapiternext(hiter *any)
// *byte is really *runtime.Type
func makechan(chanType *byte, hint int64) (hchan chan any)
