Adding more overrides

grantnelson-wf · grantnelson-wf · commit a0eb8927f06f · 2024-05-15T10:33:20.000-06:00
diff --git a/compiler/natives/src/internal/godebug/godebug.go b/compiler/natives/src/internal/godebug/godebug.go
@@ -44,10 +44,9 @@ func (s *Setting) Value() string {
 // again each time the environment variable changes
 // (due to use of os.Setenv, for example).
 //
-// GOPHERJS: For JS we currently will not be able
-// to access $GODEBUG via process.env nor watch
-// for changes via syscall.runtimeSetenv and
-// syscall.runtimeUnsetenv
+// GOPHERJS: Currently we don't inject a proxy into process.env to watch
+// for changes via syscall.runtimeSetenv and syscall.runtimeUnsetenv.
+// We may want to look into this in the future.
 func setUpdate(update func(string, string)) {}
 
 func update(def, env string) {
diff --git a/compiler/natives/src/net/http/client_test.go b/compiler/natives/src/net/http/client_test.go
@@ -6,14 +6,14 @@ import (
 	"testing"
 )
 
-func testClientTimeout(t *testing.T, h2 bool) {
+func testClientTimeout(t *testing.T, mode testMode) {
 	// The original test expects Client.Timeout error to be returned, but under
 	// GopherJS an "i/o timeout" error is frequently returned. Otherwise the test
 	// seems to be working correctly.
 	t.Skip("Flaky test under GopherJS.")
 }
 
-func testClientTimeout_Headers(t *testing.T, h2 bool) {
+func testClientTimeout_Headers(t *testing.T, mode testMode) {
 	// The original test expects Client.Timeout error to be returned, but under
 	// GopherJS an "i/o timeout" error is frequently returned. Otherwise the test
 	// seems to be working correctly.
diff --git a/compiler/natives/src/net/http/clientserver_test.go b/compiler/natives/src/net/http/clientserver_test.go
@@ -7,10 +7,10 @@ import (
 	"testing"
 )
 
-func testTransportGCRequest(t *testing.T, h2, body bool) {
+func testTransportGCRequest(t *testing.T, mode testMode, body bool) {
 	t.Skip("The test relies on runtime.SetFinalizer(), which is not supported by GopherJS.")
 }
 
-func testWriteHeaderAfterWrite(t *testing.T, h2, hijack bool) {
+func testWriteHeaderAfterWrite(t *testing.T, mode testMode, hijack bool) {
 	t.Skip("GopherJS source maps don't preserve original function names in stack traces, which this test relied on.")
 }
diff --git a/compiler/natives/src/net/http/http.go b/compiler/natives/src/net/http/http.go
@@ -6,10 +6,15 @@ package http
 import (
 	"bufio"
 	"bytes"
+	"context"
+	"crypto/tls"
 	"errors"
 	"io"
+	"net"
 	"net/textproto"
 	"strconv"
+	"sync"
+	"sync/atomic"
 
 	"github.com/gopherjs/gopherjs/js"
 )
@@ -113,3 +118,30 @@ func (t *XHRTransport) CancelRequest(req *Request) {
 		xhr.Call("abort")
 	}
 }
+
+type conn struct {
+	server     *Server
+	cancelCtx  context.CancelFunc
+	rwc        net.Conn
+	remoteAddr string
+	tlsState   *tls.ConnectionState
+	werr       error
+	r          *connReader
+	bufr       *bufio.Reader
+	bufw       *bufio.Writer
+	lastMethod string
+
+	// temporarily replacement of `atomic.Pointer[response]` for go1.20 without generics.
+	curReq atomicResponsePointer
+
+	curState  atomic.Uint64
+	mu        sync.Mutex
+	hijackedv bool
+}
+
+type atomicResponsePointer struct {
+	v *response
+}
+
+func (x *atomicResponsePointer) Load() *response     { return x.v }
+func (x *atomicResponsePointer) Store(val *response) { x.v = val }
diff --git a/compiler/natives/src/strings/strings_test.go b/compiler/natives/src/strings/strings_test.go
@@ -18,5 +18,9 @@ func TestCompareStrings(t *testing.T) {
 }
 
 func TestClone(t *testing.T) {
-	t.Skip("conversion to reflect.StringHeader is not supported in GopherJS")
+	t.Skip("conversion to unsafe.StringData is not supported in GopherJS")
+}
+
+func TestMap(t *testing.T) {
+	t.Skip("identity test uses unsafe.StringData is not supported in GopherJS")
 }
diff --git a/compiler/natives/src/sync/atomic/atomic.go b/compiler/natives/src/sync/atomic/atomic.go
@@ -221,5 +221,19 @@ func sameType(x, y interface{}) bool {
 	return js.InternalObject(x).Get("constructor") == js.InternalObject(y).Get("constructor")
 }
 
-//gopherjs:purge for go1.19 without generics
+// Override pointer so that the type check in the source code is satisfied
+// but remove the fields and methods for go1.20 without generics.
+// See https://cs.opensource.google/go/go/+/refs/tags/go1.20.14:src/sync/atomic/type.go;l=40
 type Pointer[T any] struct{}
+
+//gopherjs:purge for go1.20 without generics
+func (x *Pointer[T]) Load() *T
+
+//gopherjs:purge for go1.20 without generics
+func (x *Pointer[T]) Store(val *T)
+
+//gopherjs:purge for go1.20 without generics
+func (x *Pointer[T]) Swap(new *T) (old *T)
+
+//gopherjs:purge for go1.20 without generics
+func (x *Pointer[T]) CompareAndSwap(old, new *T) (swapped bool)
diff --git a/compiler/natives/src/syscall/syscall_js_wasm.go b/compiler/natives/src/syscall/syscall_js_wasm.go
@@ -22,6 +22,14 @@ func runtime_envs() []string {
 	return envs
 }
 
+func runtimeSetenv(k, v string) {
+	setenv_c(k, v)
+}
+
+func runtimeUnsetenv(k string) {
+	unsetenv_c(k)
+}
+
 func setenv_c(k, v string) {
 	process := js.Global().Get("process")
 	if process.IsUndefined() {
diff --git a/compiler/natives/src/time/export_test.go b/compiler/natives/src/time/export_test.go
@@ -0,0 +1,7 @@
+//go:build js
+// +build js
+
+package time
+
+// replaced for go1.20 temporarily without generics.
+var ParseRFC3339 = parseRFC3339

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,10 @@ import (`
`7`	`7`	`"testing"`
`8`	`8`	`)`
`9`	`9`
`10`		`-func testTransportGCRequest(t *testing.T, h2, body bool) {`
	`10`	`+func testTransportGCRequest(t *testing.T, mode testMode, body bool) {`
`11`	`11`	`t.Skip("The test relies on runtime.SetFinalizer(), which is not supported by GopherJS.")`
`12`	`12`	`}`
`13`	`13`
`14`		`-func testWriteHeaderAfterWrite(t *testing.T, h2, hijack bool) {`
	`14`	`+func testWriteHeaderAfterWrite(t *testing.T, mode testMode, hijack bool) {`
`15`	`15`	`t.Skip("GopherJS source maps don't preserve original function names in stack traces, which this test relied on.")`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,9 @@ func TestCompareStrings(t *testing.T) {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`func TestClone(t *testing.T) {`
`21`		`- t.Skip("conversion to reflect.StringHeader is not supported in GopherJS")`
	`21`	`+ t.Skip("conversion to unsafe.StringData is not supported in GopherJS")`
	`22`	`+}`
	`23`	`+`
	`24`	`+func TestMap(t *testing.T) {`
	`25`	`+ t.Skip("identity test uses unsafe.StringData is not supported in GopherJS")`
`22`	`26`	`}`