Merge remote-tracking branch 'upstream/master'

Author: actions-user

src/cmd/asm/internal/asm/testdata/loong64enc1.s

@@ -937,3 +937,26 @@ lable2:
 	XVSHUF4IV	$0, X1, X2	// 22009c77
 	XVSHUF4IV	$8, X1, X2	// 22209c77
 	XVSHUF4IV	$15, X1, X2	// 223c9c77
+
+	// [X]VSETEQZ.V, [X]VSETNEZ.V
+	VSETEQV		V1, FCC0	// 20989c72
+	VSETNEV		V1, FCC0	// 209c9c72
+	XVSETEQV	X1, FCC0	// 20989c76
+	XVSETNEV	X1, FCC0	// 209c9c76
+	// [X]VSETANYEQZ.{B/H/W/D} instructions
+	VSETANYEQB	V1, FCC0	// 20a09c72
+	VSETANYEQH	V1, FCC0	// 20a49c72
+	VSETANYEQW	V1, FCC0	// 20a89c72
+	VSETANYEQV	V1, FCC0	// 20ac9c72
+	VSETALLNEB	V1, FCC0	// 20b09c72
+	VSETALLNEH	V1, FCC0	// 20b49c72
+	VSETALLNEW	V1, FCC0	// 20b89c72
+	VSETALLNEV	V1, FCC0	// 20bc9c72
+	XVSETANYEQB	X1, FCC0	// 20a09c76
+	XVSETANYEQH	X1, FCC0	// 20a49c76
+	XVSETANYEQW	X1, FCC0	// 20a89c76
+	XVSETANYEQV	X1, FCC0	// 20ac9c76
+	XVSETALLNEB	X1, FCC0	// 20b09c76
+	XVSETALLNEH	X1, FCC0	// 20b49c76
+	XVSETALLNEW	X1, FCC0	// 20b89c76
+	XVSETALLNEV	X1, FCC0	// 20bc9c76

src/cmd/compile/internal/importer/gcimporter_test.go

@@ -164,7 +164,7 @@ func TestVersionHandling(t *testing.T) {
 		_, err := Import(make(map[string]*types2.Package), pkgpath, dir, nil)
 		if err != nil {
 			// ok to fail if it fails with a 'not the start of an archive file' error for select files
-			if strings.Contains(err.Error(), "no longer supported") {
+			if strings.Contains(err.Error(), "not the start of an archive file") {
 				switch name {
 				case "test_go1.8_4.a",
 					"test_go1.8_5.a":

src/cmd/go/internal/imports/scan_test.go

@@ -17,40 +17,40 @@ import (
 func TestScan(t *testing.T) {
 	testenv.MustHaveGoBuild(t)
 
-	imports, testImports, err := ScanDir(filepath.Join(testenv.GOROOT(t), "src/encoding/json"), Tags())
+	imports, testImports, err := ScanDir(filepath.Join(testenv.GOROOT(t), "src/cmd/go/internal/imports/testdata/test"), Tags())
 	if err != nil {
 		t.Fatal(err)
 	}
-	foundBase64 := false
+	foundFmt := false
 	for _, p := range imports {
-		if p == "encoding/base64" {
-			foundBase64 = true
+		if p == "fmt" {
+			foundFmt = true // test package imports fmt directly
 		}
 		if p == "encoding/binary" {
 			// A dependency but not an import
-			t.Errorf("json reported as importing encoding/binary but does not")
+			t.Errorf("testdata/test reported as importing encoding/binary but does not")
 		}
 		if p == "net/http" {
 			// A test import but not an import
-			t.Errorf("json reported as importing net/http but does not")
+			t.Errorf("testdata/test reported as importing net/http but does not")
 		}
 	}
-	if !foundBase64 {
-		t.Errorf("json missing import encoding/base64 (%q)", imports)
+	if !foundFmt {
+		t.Errorf("testdata/test missing import fmt (%q)", imports)
 	}
 
 	foundHTTP := false
 	for _, p := range testImports {
 		if p == "net/http" {
 			foundHTTP = true
 		}
-		if p == "unicode/utf16" {
+		if p == "fmt" {
 			// A package import but not a test import
-			t.Errorf("json reported as test-importing unicode/utf16  but does not")
+			t.Errorf("testdata/test reported as test-importing fmt  but does not")
 		}
 	}
 	if !foundHTTP {
-		t.Errorf("json missing test import net/http (%q)", testImports)
+		t.Errorf("testdata/test missing test import net/http (%q)", testImports)
 	}
 }
 func TestScanDir(t *testing.T) {

src/cmd/go/internal/imports/testdata/test/child/child.go

@@ -0,0 +1,5 @@
+package child
+
+import "encoding/binary"
+
+var V = binary.MaxVarintLen16

src/cmd/go/internal/imports/testdata/test/tags.txt

@@ -0,0 +1,10 @@
+package test
+
+import (
+	"cmd/go/internal/imports/testdata/test/child"
+	"fmt"
+)
+
+func F() {
+	fmt.Println(child.V)
+}

src/cmd/go/internal/imports/testdata/test/test.go

@@ -0,0 +1,9 @@
+package test_test
+
+import (
+	_ "net/http"
+	"testing"
+)
+
+func Test(t *testing.T) {
+}

src/cmd/go/internal/imports/testdata/test/test_test.go

@@ -0,0 +1,2 @@
+cmd/go/internal/imports/testdata/test/child
+fmt

src/cmd/go/internal/imports/testdata/test/want.txt

@@ -1019,6 +1019,27 @@ const (
 	AXVSHUF4IW
 	AXVSHUF4IV
 
+	AVSETEQV
+	AVSETNEV
+	AVSETANYEQB
+	AVSETANYEQH
+	AVSETANYEQW
+	AVSETANYEQV
+	AVSETALLNEB
+	AVSETALLNEH
+	AVSETALLNEW
+	AVSETALLNEV
+	AXVSETEQV
+	AXVSETNEV
+	AXVSETANYEQB
+	AXVSETANYEQH
+	AXVSETANYEQW
+	AXVSETANYEQV
+	AXVSETALLNEB
+	AXVSETALLNEH
+	AXVSETALLNEW
+	AXVSETALLNEV
+
 	ALAST
 
 	// aliases