From efe0a86551c30ceaf71361645023cbea913249d3 Mon Sep 17 00:00:00 2001 From: Xiaolin Zhao Date: Mon, 18 Nov 2024 16:15:36 +0800 Subject: [PATCH] cmd/compile/internal/ssa: make _gen an actual submodule and skip it in TestStdlib After tools CL 612038, the package astutil stops being vendored, but _gen/rulegen.go needs to import this package. In particular, after update golang.org/x/tools, the package astutil is deleted from the vendor directory, and got error when run TestStdlib in longtest. So in this CL, we make _gen an actual submodule and skip it in TestStdlib. Change-Id: I76f77b66427f6490b4746698711a6e307ad2ba79 Reviewed-on: https://go-review.googlesource.com/c/go/+/629015 LUCI-TryBot-Result: Go LUCI Reviewed-by: Cherry Mui Reviewed-by: Dmitri Shuralyov Reviewed-by: abner chenc --- src/cmd/compile/internal/ssa/_gen/go.mod | 5 +++++ src/cmd/compile/internal/ssa/_gen/go.sum | 2 ++ src/cmd/compile/internal/types2/stdlib_test.go | 3 ++- src/go/types/stdlib_test.go | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 src/cmd/compile/internal/ssa/_gen/go.mod create mode 100644 src/cmd/compile/internal/ssa/_gen/go.sum diff --git a/src/cmd/compile/internal/ssa/_gen/go.mod b/src/cmd/compile/internal/ssa/_gen/go.mod new file mode 100644 index 00000000000..6f750a5618a --- /dev/null +++ b/src/cmd/compile/internal/ssa/_gen/go.mod @@ -0,0 +1,5 @@ +module _gen + +go 1.24 + +require golang.org/x/tools v0.27.0 diff --git a/src/cmd/compile/internal/ssa/_gen/go.sum b/src/cmd/compile/internal/ssa/_gen/go.sum new file mode 100644 index 00000000000..6c355a67c3a --- /dev/null +++ b/src/cmd/compile/internal/ssa/_gen/go.sum @@ -0,0 +1,2 @@ +golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o= +golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q= diff --git a/src/cmd/compile/internal/types2/stdlib_test.go b/src/cmd/compile/internal/types2/stdlib_test.go index 0c63e5d77c8..6966bb94b00 100644 --- a/src/cmd/compile/internal/types2/stdlib_test.go +++ b/src/cmd/compile/internal/types2/stdlib_test.go @@ -354,7 +354,8 @@ func TestStdKen(t *testing.T) { // Package paths of excluded packages. var excluded = map[string]bool{ - "builtin": true, + "builtin": true, + "cmd/compile/internal/ssa/_gen": true, } // printPackageMu synchronizes the printing of type-checked package files in diff --git a/src/go/types/stdlib_test.go b/src/go/types/stdlib_test.go index 3b9b2852c46..ec76f8ee172 100644 --- a/src/go/types/stdlib_test.go +++ b/src/go/types/stdlib_test.go @@ -356,7 +356,8 @@ func TestStdKen(t *testing.T) { // Package paths of excluded packages. var excluded = map[string]bool{ - "builtin": true, + "builtin": true, + "cmd/compile/internal/ssa/_gen": true, } // printPackageMu synchronizes the printing of type-checked package files in