Update goja

.tc39_test262_checkout.sh

@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/sh -e
 # this is just the commit it was last tested with
-sha=634933a489f1bb8cf074a2a9b8616ade5f2f5cac
+sha=cb4a6c8074671c00df8cbc17a620c0f9462b312a
 
 mkdir -p testdata/test262
 cd testdata/test262

builtin_regexp.go

@@ -688,8 +688,7 @@ func (r *Runtime) regExpExec(execFn func(FunctionCall) Value, rxObj *Object, arg
 	return res
 }
 
-func (r *Runtime) getGlobalRegexpMatches(rxObj *Object, s String) []Value {
-	fullUnicode := nilSafe(rxObj.self.getStr("unicode", nil)).ToBoolean()
+func (r *Runtime) getGlobalRegexpMatches(rxObj *Object, s String, fullUnicode bool) []Value {
 	rxObj.self.setOwnStr("lastIndex", intToValue(0), true)
 	execFn, ok := r.toObject(rxObj.self.getStr("exec", nil)).self.assertCallable()
 	if !ok {
@@ -714,9 +713,10 @@ func (r *Runtime) getGlobalRegexpMatches(rxObj *Object, s String) []Value {
 
 func (r *Runtime) regexpproto_stdMatcherGeneric(rxObj *Object, s String) Value {
 	rx := rxObj.self
-	global := rx.getStr("global", nil)
-	if global != nil && global.ToBoolean() {
-		a := r.getGlobalRegexpMatches(rxObj, s)
+	flags := nilSafe(rx.getStr("flags", nil)).String()
+	global := strings.ContainsRune(flags, 'g')
+	if global {
+		a := r.getGlobalRegexpMatches(rxObj, s, strings.ContainsRune(flags, 'u'))
 		if len(a) == 0 {
 			return _null
 		}
@@ -1092,8 +1092,11 @@ RETURN:
 
 func (r *Runtime) regexpproto_stdReplacerGeneric(rxObj *Object, s, replaceStr String, rcall func(FunctionCall) Value) Value {
 	var results []Value
-	if nilSafe(rxObj.self.getStr("global", nil)).ToBoolean() {
-		results = r.getGlobalRegexpMatches(rxObj, s)
+	flags := nilSafe(rxObj.self.getStr("flags", nil)).String()
+	isGlobal := strings.ContainsRune(flags, 'g')
+	isUnicode := strings.ContainsRune(flags, 'u')
+	if isGlobal {
+		results = r.getGlobalRegexpMatches(rxObj, s, isUnicode)
 	} else {
 		execFn := toMethod(rxObj.self.getStr("exec", nil)) // must be non-nil
 		result := r.regExpExec(execFn, rxObj, s)

builtin_typedarrays.go

@@ -14,17 +14,25 @@ type typedArraySortCtx struct {
 	ta           *typedArrayObject
 	compare      func(FunctionCall) Value
 	needValidate bool
+	detached     bool
 }
 
 func (ctx *typedArraySortCtx) Len() int {
 	return ctx.ta.length
 }
 
-func (ctx *typedArraySortCtx) Less(i, j int) bool {
-	if ctx.needValidate {
-		ctx.ta.viewedArrayBuf.ensureNotDetached(true)
+func (ctx *typedArraySortCtx) checkDetached() {
+	if !ctx.detached && ctx.needValidate {
+		ctx.detached = !ctx.ta.viewedArrayBuf.ensureNotDetached(false)
 		ctx.needValidate = false
 	}
+}
+
+func (ctx *typedArraySortCtx) Less(i, j int) bool {
+	ctx.checkDetached()
+	if ctx.detached {
+		return false
+	}
 	offset := ctx.ta.offset
 	if ctx.compare != nil {
 		x := ctx.ta.typedArray.get(offset + i)
@@ -54,9 +62,9 @@ func (ctx *typedArraySortCtx) Less(i, j int) bool {
 }
 
 func (ctx *typedArraySortCtx) Swap(i, j int) {
-	if ctx.needValidate {
-		ctx.ta.viewedArrayBuf.ensureNotDetached(true)
-		ctx.needValidate = false
+	ctx.checkDetached()
+	if ctx.detached {
+		return
 	}
 	offset := ctx.ta.offset
 	ctx.ta.typedArray.swap(offset+i, offset+j)
@@ -146,7 +154,6 @@ func (r *Runtime) newDataView(args []Value, newTarget *Object) *Object {
 	if newTarget == nil {
 		panic(r.needNew("DataView"))
 	}
-	proto := r.getPrototypeFromCtor(newTarget, r.getDataView(), r.getDataViewPrototype())
 	var bufArg Value
 	if len(args) > 0 {
 		bufArg = args[0]
@@ -177,6 +184,14 @@ func (r *Runtime) newDataView(args []Value, newTarget *Object) *Object {
 	} else {
 		byteLen = len(buffer.data) - byteOffset
 	}
+	proto := r.getPrototypeFromCtor(newTarget, r.getDataView(), r.getDataViewPrototype())
+	buffer.ensureNotDetached(true)
+	if byteOffset > len(buffer.data) {
+		panic(r.newError(r.getRangeError(), "Start offset %d is outside the bounds of the buffer", byteOffset))
+	}
+	if byteOffset+byteLen > len(buffer.data) {
+		panic(r.newError(r.getRangeError(), "Invalid DataView length %d", byteLen))
+	}
 	o := &Object{runtime: r}
 	b := &dataViewObject{
 		baseObject: baseObject{
@@ -1007,7 +1022,6 @@ func (r *Runtime) typedArrayProto_set(call FunctionCall) Value {
 			}
 			for i := 0; i < srcLen; i++ {
 				val := nilSafe(srcObj.self.getIdx(valueInt(i), nil))
-				ta.viewedArrayBuf.ensureNotDetached(true)
 				if ta.isValidIntegerIndex(i) {
 					ta.typedArray.set(targetOffset+i, val)
 				}
@@ -1270,7 +1284,7 @@ func (r *Runtime) typedArray_from(call FunctionCall) Value {
 			for idx, val := range values {
 				fc.Arguments[0], fc.Arguments[1] = val, intToValue(int64(idx))
 				val = mapFc(fc)
-				ta.typedArray.set(idx, val)
+				ta._putIdx(idx, val)
 			}
 		}
 		return ta.val
@@ -1417,8 +1431,6 @@ func (r *Runtime) _newTypedArrayFromTypedArray(src *typedArrayObject, newTarget
 	src.viewedArrayBuf.ensureNotDetached(true)
 	l := src.length
 
-	arrayBuffer := r.getArrayBuffer()
-	dst.viewedArrayBuf.prototype = r.getPrototypeFromCtor(r.speciesConstructorObj(src.viewedArrayBuf.val, arrayBuffer), arrayBuffer, r.getArrayBufferPrototype())
 	dst.viewedArrayBuf.data = allocByteSlice(toIntStrict(int64(l) * int64(dst.elemSize)))
 	src.viewedArrayBuf.ensureNotDetached(true)
 	if src.defaultCtor == dst.defaultCtor {

compiler_test.go

@@ -3135,18 +3135,6 @@ func TestDeleteGlobalEval(t *testing.T) {
 	testScript(SCRIPT, valueTrue, t)
 }
 
-func TestGlobalVarNames(t *testing.T) {
-	vm := New()
-	_, err := vm.RunString("(0,eval)('var x')")
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = vm.RunString("let x")
-	if err == nil {
-		t.Fatal("Expected error")
-	}
-}
-
 func TestTryResultEmpty(t *testing.T) {
 	const SCRIPT = `
 	1; try { } finally { }

date_parser.go

@@ -123,6 +123,10 @@ func parseDate(layout, value string, defaultLocation *time.Location) (time.Time,
 				p, value = value[1:7], value[7:]
 				year, err = atoi(p)
 				if neg {
+					if year == 0 {
+						err = errBad
+						break
+					}
 					year = -year
 				}
 			} else {

go.mod

@@ -3,6 +3,7 @@ module github.com/grafana/sobek
 go 1.20
 
 require (
+	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/dlclark/regexp2 v1.11.4
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible
 	github.com/google/pprof v0.0.0-20230207041349-798e818bf904

go.sum

@@ -1,3 +1,5 @@
+github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
+github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
 github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
 github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=

runtime.go

@@ -45,8 +45,7 @@ const (
 )
 
 type global struct {
-	stash    stash
-	varNames map[unistring.String]struct{}
+	stash stash
 
 	Object   *Object
 	Array    *Object

runtime_test.go

@@ -2968,6 +2968,17 @@ func ExampleRuntime_ForOf() {
 	// Output: a=1,b=2,
 }
 
+func TestDestructAssignToSymbol(t *testing.T) {
+	const SCRIPT = `
+	const s = Symbol('s');
+	const target = {};
+
+	({a: target[s]} = {a: 42});
+	assert.sameValue(target[s], 42);
+`
+	testScriptWithTestLib(SCRIPT, _undefined, t)
+}
+
 /*
 func TestArrayConcatSparse(t *testing.T) {
 function foo(a,b,c)

string_ascii.go

@@ -114,15 +114,22 @@ func isRangeErr(err error) bool {
 }
 
 func (s asciiString) _toFloat() (float64, error) {
-	ss := strings.TrimSpace(string(s))
+	ss := strings.ToLower(strings.TrimSpace(string(s)))
 	if ss == "" {
 		return 0, nil
 	}
 	if ss == "-0" {
 		var f float64
 		return -f, nil
 	}
+
 	f, err := strconv.ParseFloat(ss, 64)
+	if err == nil && math.IsInf(f, 0) {
+		if strings.HasPrefix(ss, "inf") || strings.HasPrefix(ss, "-inf") || strings.HasPrefix(ss, "+inf") {
+			// We handle "Infinity" separately, prevent from being parsed as Infinity due to strconv.ParseFloat() permissive syntax
+			return 0, strconv.ErrSyntax
+		}
+	}
 	if isRangeErr(err) {
 		err = nil
 	}

tc39_test.go

@@ -6,12 +6,14 @@ import (
 	"io"
 	"os"
 	"path"
+	"runtime/debug"
 	"sort"
 	"strings"
 	"sync"
 	"testing"
 	"time"
 
+	"github.com/Masterminds/semver/v3"
 	"gopkg.in/yaml.v2"
 )
 
@@ -184,14 +186,27 @@ var (
 		"test/built-ins/TypedArray/prototype/toReversed/this-value-invalid.js":     true,
 		"test/built-ins/TypedArray/prototype/toSorted/comparefn-not-a-function.js": true,
 		"test/built-ins/TypedArray/prototype/toSorted/this-value-invalid.js":       true,
+		"test/built-ins/RegExp/prototype/sticky/this-val-non-obj.js":               true,
+		"test/built-ins/RegExp/prototype/source/this-val-non-obj.js":               true,
+		"test/built-ins/RegExp/prototype/multiline/this-val-non-obj.js":            true,
+		"test/built-ins/RegExp/prototype/ignoreCase/this-val-non-obj.js":           true,
+		"test/built-ins/RegExp/prototype/unicode/this-val-non-obj.js":              true,
 		"test/built-ins/RegExp/prototype/dotAll/this-val-non-obj.js":               true,
+		"test/built-ins/RegExp/prototype/global/this-val-non-obj.js":               true,
+		"test/built-ins/RegExp/prototype/flags/this-val-non-obj.js":                true,
+		"test/built-ins/Iterator/prototype/Symbol.iterator/return-val.js":          true,
+		"test/built-ins/DataView/prototype/setBigUint64/not-a-constructor.js":      true,
+		"test/built-ins/DataView/prototype/getBigUint64/not-a-constructor.js":      true,
 
 		// Regexp
 		"test/language/literals/regexp/invalid-range-negative-lookbehind.js":    true,
 		"test/language/literals/regexp/invalid-range-lookbehind.js":             true,
 		"test/language/literals/regexp/invalid-optional-negative-lookbehind.js": true,
 		"test/language/literals/regexp/invalid-optional-lookbehind.js":          true,
 
+		// unicode full case folding
+		"test/built-ins/RegExp/unicode_full_case_folding.js": true,
+
 		// FIXME bugs
 
 		// Left-hand side as a CoverParenthesizedExpression
@@ -217,31 +232,8 @@ var (
 		// Skip due to regexp named groups
 		"test/built-ins/String/prototype/replaceAll/searchValue-replacer-RegExp-call.js": true,
 
-		// uncathegorized yet
-		"test/built-ins/TypedArrayConstructors/ctors/no-species.js":                                            true,
-		"test/built-ins/TypedArray/prototype/set/array-arg-targetbuffer-detached-on-get-src-value-no-throw.js": true,
-		"test/built-ins/TypedArray/prototype/sort/sort-tonumber.js":                                            true,
-		"test/built-ins/RegExp/prototype/ignoreCase/this-val-non-obj.js":                                       true,
-		"test/built-ins/RegExp/prototype/Symbol.replace/flags-tostring-error.js":                               true,
-		"test/built-ins/RegExp/prototype/global/this-val-non-obj.js":                                           true,
-		"test/built-ins/RegExp/prototype/flags/this-val-non-obj.js":                                            true,
-		"test/built-ins/RegExp/prototype/unicode/this-val-non-obj.js":                                          true,
-		"test/built-ins/RegExp/prototype/Symbol.match/get-unicode-error.js":                                    true,
-		"test/built-ins/RegExp/prototype/Symbol.match/get-flags-err.js":                                        true,
-		"test/built-ins/RegExp/prototype/Symbol.match/flags-tostring-error.js":                                 true,
-		"test/built-ins/RegExp/prototype/Symbol.replace/get-flags-err.js":                                      true,
-		"test/built-ins/RegExp/prototype/sticky/this-val-non-obj.js":                                           true,
-		"test/built-ins/RegExp/prototype/source/this-val-non-obj.js":                                           true,
-		"test/built-ins/RegExp/prototype/multiline/this-val-non-obj.js":                                        true,
-		"test/built-ins/RegExp/unicode_full_case_folding.js":                                                   true,
-		"test/built-ins/RegExp/prototype/Symbol.replace/get-unicode-error.js":                                  true,
-		"test/built-ins/RegExp/lookahead-quantifier-match-groups.js":                                           true,
-		"test/built-ins/Number/S15.7.1.1_A1.js":                                                                true,
-		"test/built-ins/Date/year-zero.js":                                                                     true,
-		"test/built-ins/DataView/prototype/setBigUint64/not-a-constructor.js":                                  true,
-		"test/built-ins/Date/parse/year-zero.js":                                                               true,
-		"test/built-ins/DataView/prototype/getBigUint64/not-a-constructor.js":                                  true,
-		"test/language/expressions/unary-plus/S11.4.6_A3_T3.js":                                                true,
+		"test/built-ins/RegExp/nullable-quantifier.js":               true,
+		"test/built-ins/RegExp/lookahead-quantifier-match-groups.js": true,
 	}
 
 	featuresBlackList = []string{
@@ -250,15 +242,19 @@ var (
 		"BigInt",
 		"resizable-arraybuffer",
 		"regexp-named-groups",
+		"regexp-duplicate-named-groups",
 		"regexp-unicode-property-escapes",
 		"regexp-match-indices",
+		"regexp-modifiers",
+		"RegExp.escape",
 		"legacy-regexp",
 		"tail-call-optimization",
 		"Temporal",
 		"import-assertions",
 		"logical-assignment-operators",
 		"Atomics",
 		"Atomics.waitAsync",
+		"Atomics.pause",
 		"FinalizationRegistry",
 		"WeakRef",
 		"numeric-separator-literal",
@@ -270,36 +266,52 @@ var (
 
 		"regexp-duplicate-named-groups",
 		"regexp-v-flag",
+		"iterator-helpers",
+		"symbols-as-weakmap-keys",
+		"uint8array-base64",
+		"String.prototype.toWellFormed",
+		"explicit-resource-management",
+		"set-methods",
 		"promise-try",
 		"promise-with-resolvers",
-		"import-attributes",
-		"iterator-helpers",
-		"Symbol.iterator",
+		"array-grouping",
+		"Math.sumPrecise",
 		"Float16Array",
+		"arraybuffer-transfer",
 		"Array.fromAsync",
-		"array-grouping",
-		"String.prototype.toWellFormed",
 		"String.prototype.isWellFormed",
-		"change-array-by-copy",
-		"arraybuffer-transfer",
-		"symbols-as-weakmap-keys",
-		"set-methods",
-		"regexp-modifiers",
+
+		"source-phase-imports",
+		"import-attributes",
 	}
 )
 
+var goVersion *semver.Version
+
 func init() {
+	if info, ok := debug.ReadBuildInfo(); ok {
+		goVersion = semver.MustParse(strings.TrimPrefix(info.GoVersion, "go"))
+	} else {
+		panic("Could not read build info")
+	}
+
 	skip := func(prefixes ...string) {
 		for _, prefix := range prefixes {
 			skipPrefixes.Add(prefix)
 		}
 	}
 
-	skip(
-		// Go 1.16 only supports unicode 13
-		"test/language/identifiers/start-unicode-14.",
-		"test/language/identifiers/part-unicode-14.",
+	if goVersion.LessThan(semver.MustParse("1.21")) {
+		skip(
+			// Go <1.21 only supports Unicode 13
+			"test/language/identifiers/start-unicode-14.",
+			"test/language/identifiers/part-unicode-14.",
+			"test/language/identifiers/start-unicode-15.",
+			"test/language/identifiers/part-unicode-15.",
+		)
+	}
 
+	skip(
 		// generators and async generators (harness/hidden-constructors.js)
 		"test/built-ins/Async",