Merge pull request #1048 from nevkontakte/wip-go1.17

Support go1.17 slice to array pointer conversion.

Author: nevkontakte

circle.yml

@@ -1,28 +1,28 @@
 # CircleCI configuration for GopherJS.
-# 
+#
 # This configuration has one build_and_test workflow designed to run on all commits
 # and pull requests. It consists of three jobs:
-# 
+#
 #  - build: Builds and runs GopherJS unit tests, as well as lits, smoke tests, etc.
 #    This job is designed to provide quickest feedback on the most important
 #    functionality. It should not include anything heavyweight and should be kept
 #    under 2-3 minutes of runtime.
-# 
+#
 #  - gopherjs_tests: Runs standard library and GopherJS package tests using GopherJS
 #    *itself*. This is the most comprehensive test suite we have and it is sharded
 #    into 4 parallel instances for faster execution.
-# 
+#
 #  - gorepo_tests: Runs language tests from the Go compiler test suite. The objective
 #    of these tests is to ensure conformance of GopherJS to the upstream Go to the
 #    highest degree possible, considering differences in the runtime.
-# 
+#
 # If all tests passed, it is reasonably to assume that the version is more or less
 # bug-free (although as of summer 2021 our test coverage is not ideal).
-# 
+#
 # For convenience of upgrades, NVM, Node.js and Go versions are specified as
 # parameters at the top of the config. Increasing the version and ensuring that the
 # workflow passes is sufficient to verify GopherJS compatibility with that version.
-# 
+#
 # Versions of Node modules GopherJS depends on are specified in package.json and can
 # be changed there (remember to run `npm install` to update the lock file).
 
@@ -39,10 +39,10 @@ workflows:
     jobs:
     - build
     - gopherjs_tests:
-        requires: 
+        requires:
           - build
     - gorepo_tests:
-        requires: 
+        requires:
           - build
 
 parameters:
@@ -70,14 +70,14 @@ jobs:
     - run:
         name: Check gofmt
         command: diff -u <(echo -n) <(gofmt -d .)
-    - run: 
+    - run:
         name: Check go vet
         command: |
-          set -e  
+          set -e
           # Go package in root directory.
-          go vet . 
+          go vet .
           # All subdirectories except "doc", "tests", "node*".
-          for d in */; do echo ./$d...; done | grep -v ./doc | grep -v ./tests | grep -v ./node | xargs go vet 
+          for d in */; do echo ./$d...; done | grep -v ./doc | grep -v ./tests | grep -v ./node | xargs go vet
     - run:
         name: Check natives build tags
         command: diff -u <(echo -n) <(go list ./compiler/natives/src/...) # All those packages should have // +build js.
@@ -126,7 +126,7 @@ jobs:
     - run:
         name: Compare GOPATH and Go Modules output
         command: diff -u <(sed 's/todomvc_gomod.js.map/todomvc_ignored.js.map/' /tmp/todomvc_gomod.js) <(sed 's/todomvc_gopath.js.map/todomvc_ignored.js.map/' /tmp/todomvc_gopath.js)
-  
+
   gopherjs_tests:
     executor: gopherjs
     parallelism: 4
@@ -148,8 +148,9 @@ jobs:
           set -e
           # Convert test output into junit format for CircleCI.
           mkdir -p ~/test-reports/
-          go-junit-report --full-class-name < /tmp/test-gopherjs.txt > ~/test-reports/gopherjs.xml
+          go-junit-report --full-class-name < /tmp/test-gopherjs.txt > ~/test-reports/gopherjs-${CIRCLE_NODE_INDEX}.xml
           exit "$status"
+        no_output_timeout: "1h"  # Packages like math/big take a while to run all tests.
     - store_test_results:
         path: ~/test-reports/
 
@@ -203,7 +204,7 @@ commands:
           echo 'export SOURCE_MAP_SUPPORT=true' >> $BASH_ENV
           # Make nodejs able to require installed modules from any working path.
           echo export "NODE_PATH='$(npm root)'" >> "${BASH_ENV}"
-    - run: 
+    - run:
         name: Install required Go packages
         command: go mod download -x
   install_gopherjs:

compiler/expressions.go

@@ -426,10 +426,6 @@ func (fc *funcContext) translateExpr(expr ast.Expr) *expression {
 				return fc.formatExpr("$equal(%e, %e, %s)", e.X, e.Y, fc.typeName(t))
 			case *types.Interface:
 				return fc.formatExpr("$interfaceIsEqual(%s, %s)", fc.translateImplicitConversion(e.X, t), fc.translateImplicitConversion(e.Y, t))
-			case *types.Pointer:
-				if _, ok := u.Elem().Underlying().(*types.Array); ok {
-					return fc.formatExpr("$equal(%s, %s, %s)", fc.translateImplicitConversion(e.X, t), fc.translateImplicitConversion(e.Y, t), fc.typeName(u.Elem()))
-				}
 			case *types.Basic:
 				if isBoolean(u) {
 					if b, ok := analysis.BoolValue(e.X, fc.pkgCtx.Info.Info); ok && b {
@@ -1031,7 +1027,7 @@ func (fc *funcContext) translateConversion(expr ast.Expr, desiredType types.Type
 		case t.Kind() == types.UnsafePointer:
 			if unary, isUnary := expr.(*ast.UnaryExpr); isUnary && unary.Op == token.AND {
 				if indexExpr, isIndexExpr := unary.X.(*ast.IndexExpr); isIndexExpr {
-					return fc.formatExpr("$sliceToArray(%s)", fc.translateConversionToSlice(indexExpr.X, types.NewSlice(types.Typ[types.Uint8])))
+					return fc.formatExpr("$sliceToNativeArray(%s)", fc.translateConversionToSlice(indexExpr.X, types.NewSlice(types.Typ[types.Uint8])))
 				}
 				if ident, isIdent := unary.X.(*ast.Ident); isIdent && ident.Name == "_zero" {
 					return fc.formatExpr("new Uint8Array(0)")
@@ -1075,8 +1071,14 @@ func (fc *funcContext) translateConversion(expr ast.Expr, desiredType types.Type
 			break
 		}
 
-		switch u := t.Elem().Underlying().(type) {
+		switch ptrElType := t.Elem().Underlying().(type) {
 		case *types.Array: // (*[N]T)(expr) — converting expr to a pointer to an array.
+			if _, ok := exprType.Underlying().(*types.Slice); ok {
+				// GopherJS interprets pointer to an array as the array object itself
+				// due to its reference semantics, so the bellow coversion is correct.
+				return fc.formatExpr("$sliceToGoArray(%e, %s)", expr, fc.typeName(t))
+			}
+			// TODO(nevkontakte): Is this just for aliased types (e.g. `type a [4]byte`)?
 			return fc.translateExpr(expr)
 		case *types.Struct: // (*StructT)(expr) — converting expr to a pointer to a struct.
 			if fc.pkgCtx.Pkg.Path() == "syscall" && types.Identical(exprType, types.Typ[types.UnsafePointer]) {
@@ -1086,7 +1088,7 @@ func (fc *funcContext) translateConversion(expr ast.Expr, desiredType types.Type
 				// indeed pointing at a byte array.
 				array := fc.newVariable("_array")
 				target := fc.newVariable("_struct")
-				return fc.formatExpr("(%s = %e, %s = %e, %s, %s)", array, expr, target, fc.zeroValue(t.Elem()), fc.loadStruct(array, target, u), target)
+				return fc.formatExpr("(%s = %e, %s = %e, %s, %s)", array, expr, target, fc.zeroValue(t.Elem()), fc.loadStruct(array, target, ptrElType), target)
 			}
 			// Convert between structs of different types but identical layouts,
 			// for example:
@@ -1152,7 +1154,7 @@ func (fc *funcContext) translateImplicitConversion(expr ast.Expr, desiredType ty
 
 	switch desiredType.Underlying().(type) {
 	case *types.Slice:
-		return fc.formatExpr("$subslice(new %1s(%2e.$array), %2e.$offset, %2e.$offset + %2e.$length)", fc.typeName(desiredType), expr)
+		return fc.formatExpr("$convertSliceType(%1e, %2s)", expr, fc.typeName(desiredType))
 
 	case *types.Interface:
 		if typesutil.IsJsObject(exprType) {