More stdlib updates

flimzy · flimzy · commit 64f5453b0a2e · 2022-04-19T17:53:44.000+02:00
diff --git a/compiler/natives/fs_vfsdata.go b/compiler/natives/fs_vfsdata.go
diff --git a/compiler/natives/src/reflect/reflect.go b/compiler/natives/src/reflect/reflect.go
@@ -5,10 +5,11 @@ package reflect
 
 import (
 	"errors"
-	"internal/itoa"
 	"strconv"
 	"unsafe"
 
+	"internal/itoa"
+
 	"github.com/gopherjs/gopherjs/js"
 )
 
@@ -682,58 +683,16 @@ func (iter *mapIter) skipUntilValidKey() {
 	}
 }
 
-func mapiterinit(t *rtype, m unsafe.Pointer) unsafe.Pointer {
+func mapiterinit(t *rtype, m unsafe.Pointer, _ *hiter) unsafe.Pointer {
 	return unsafe.Pointer(&mapIter{t, js.InternalObject(m), js.Global.Call("$keys", js.InternalObject(m)), 0, nil})
 }
 
-func mapiterkey(it unsafe.Pointer) unsafe.Pointer {
-	iter := (*mapIter)(it)
-	var kv *js.Object
-	if iter.last != nil {
-		kv = iter.last
-	} else {
-		iter.skipUntilValidKey()
-		if iter.i == iter.keys.Length() {
-			return nil
-		}
-		k := iter.keys.Index(iter.i)
-		kv = iter.m.Get(k.String())
-
-		// Record the key-value pair for later accesses.
-		iter.last = kv
-	}
-	return unsafe.Pointer(js.Global.Call("$newDataPointer", kv.Get("k"), jsType(PtrTo(iter.t.Key()))).Unsafe())
-}
-
-func mapiterelem(it unsafe.Pointer) unsafe.Pointer {
-	iter := (*mapIter)(it)
-	var kv *js.Object
-	if iter.last != nil {
-		kv = iter.last
-	} else {
-		iter.skipUntilValidKey()
-		if iter.i == iter.keys.Length() {
-			return nil
-		}
-		k := iter.keys.Index(iter.i)
-		kv = iter.m.Get(k.String())
-		iter.last = kv
-	}
-	return unsafe.Pointer(js.Global.Call("$newDataPointer", kv.Get("v"), jsType(PtrTo(iter.t.Elem()))).Unsafe())
-}
-
-func mapiternext(it unsafe.Pointer) {
-	iter := (*mapIter)(it)
-	iter.last = nil
-	iter.i++
-}
-
 func maplen(m unsafe.Pointer) int {
 	return js.Global.Call("$keys", js.InternalObject(m)).Length()
 }
 
 func cvtDirect(v Value, typ Type) Value {
-	var srcVal = v.object()
+	srcVal := v.object()
 	if srcVal == jsType(v.typ).Get("nil") {
 		return makeValue(typ, jsType(typ).Get("nil"), v.flag)
 	}
@@ -1649,7 +1608,7 @@ func deepValueEqualJs(v1, v2 Value, visited [][2]unsafe.Pointer) bool {
 				return true
 			}
 		}
-		var n = v1.Len()
+		n := v1.Len()
 		if n != v2.Len() {
 			return false
 		}
@@ -1667,7 +1626,7 @@ func deepValueEqualJs(v1, v2 Value, visited [][2]unsafe.Pointer) bool {
 	case Ptr:
 		return deepValueEqualJs(v1.Elem(), v2.Elem(), visited)
 	case Struct:
-		var n = v1.NumField()
+		n := v1.NumField()
 		for i := 0; i < n; i++ {
 			if !deepValueEqualJs(v1.Field(i), v2.Field(i), visited) {
 				return false
@@ -1681,7 +1640,7 @@ func deepValueEqualJs(v1, v2 Value, visited [][2]unsafe.Pointer) bool {
 		if v1.object() == v2.object() {
 			return true
 		}
-		var keys = v1.MapKeys()
+		keys := v1.MapKeys()
 		if len(keys) != v2.Len() {
 			return false
 		}
diff --git a/compiler/natives/src/sync/waitgroup.go b/compiler/natives/src/sync/waitgroup.go
@@ -7,7 +7,8 @@ type WaitGroup struct {
 	counter int
 	ch      chan struct{}
 
-	state1 [3]uint32
+	state1 uint64
+	state2 uint32
 }
 
 func (wg *WaitGroup) Add(delta int) {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ type WaitGroup struct {`
`7`	`7`	`counter int`
`8`	`8`	`ch chan struct{}`
`9`	`9`
`10`		`- state1 [3]uint32`
	`10`	`+ state1 uint64`
	`11`	`+ state2 uint32`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`func (wg *WaitGroup) Add(delta int) {`