Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update submodule to latest master in microsoft/main #1072

Merged
merged 3 commits into from
Oct 31, 2023
Merged

Update submodule to latest master in microsoft/main #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7163bb
Update submodule to latest master (b46aec07): bytes,internal/bytealg:…
microsoft-golang-bot Oct 27, 2023
82ecded
Resolve patches: nearby line change
dagood Oct 27, 2023
8b707b4
Update to commit before Windows CI failure
dagood Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go
Open in desktop
Submodule go updated 83 files
+1 −1 src/cmd/compile/internal/ir/expr.go
+185 −150 src/cmd/compile/internal/reflectdata/reflect.go
+177 −86 src/cmd/compile/internal/rttype/rttype.go
+1 −1 src/cmd/compile/internal/typecheck/expr.go
+15 −0 src/cmd/compile/internal/types/type.go
+2 −1 src/cmd/compile/internal/types2/gcsizes.go
+4 −2 src/cmd/compile/internal/types2/sizes.go
+7 −9 src/cmd/compile/internal/walk/expr.go
+12 −10 src/cmd/compile/internal/walk/switch.go
+1 −1 src/cmd/go.mod
+2 −2 src/cmd/go.sum
+0 −61 src/cmd/go/go_test.go
+1 −1 src/cmd/go/internal/modload/modfile.go
+4 −2 src/cmd/go/internal/toolchain/select.go
+13 −0 src/cmd/go/testdata/script/gotoolchain_local.txt
+21 −5 src/cmd/go/testdata/script/work_init_path.txt
+6 −6 src/cmd/vendor/golang.org/x/mod/modfile/rule.go
+1 −1 src/cmd/vendor/modules.txt
+2 −0 src/crypto/subtle/xor_amd64.s
+9 −0 src/debug/elf/file.go
+1 −1 src/go.mod
+2 −2 src/go.sum
+2 −1 src/go/types/gcsizes.go
+4 −2 src/go/types/sizes.go
+0 −133 src/internal/abi/compiletype.go
+10 −6 src/internal/poll/sendfile_bsd.go
+10 −6 src/internal/poll/sendfile_solaris.go
+4 −1 src/internal/profile/encode.go
+26 −26 src/log/log.go
+3 −3 src/log/slog/attr.go
+1 −1 src/log/slog/doc.go
+1 −1 src/log/slog/handler.go
+5 −5 src/log/slog/json_handler.go
+7 −7 src/log/slog/level.go
+24 −24 src/log/slog/logger.go
+5 −5 src/log/slog/record.go
+5 −5 src/log/slog/text_handler.go
+22 −22 src/log/slog/value.go
+15 −15 src/log/syslog/syslog.go
+1 −0 src/net/http/h2_bundle.go
+0 −4 src/net/http/request.go
+86 −0 src/net/sendfile_test.go
+5 −5 src/net/sendfile_unix_alt.go
+5 −4 src/runtime/defs_dragonfly.go
+5 −4 src/runtime/defs_dragonfly_amd64.go
+4 −3 src/runtime/defs_openbsd.go
+4 −3 src/runtime/defs_openbsd_386.go
+4 −3 src/runtime/defs_openbsd_amd64.go
+4 −3 src/runtime/defs_openbsd_arm.go
+4 −3 src/runtime/defs_openbsd_arm64.go
+4 −3 src/runtime/defs_openbsd_mips64.go
+4 −3 src/runtime/defs_openbsd_ppc64.go
+4 −3 src/runtime/defs_openbsd_riscv64.go
+3 −5 src/runtime/export_test.go
+1 −1 src/runtime/internal/atomic/atomic_andor_test.go
+1 −6 src/runtime/internal/atomic/atomic_mipsx.go
+1 −0 src/runtime/internal/atomic/atomic_mipsx.s
+18 −0 src/runtime/internal/atomic/atomic_riscv64.go
+40 −0 src/runtime/internal/atomic/atomic_riscv64.s
+1 −3 src/runtime/memmove_test.go
+1 −3 src/runtime/mfixalloc.go
+1 −3 src/runtime/mgcmark.go
+3 −9 src/runtime/mgcpacer.go
+11 −14 src/runtime/mgcscavenge.go
+3 −5 src/runtime/mksizeclasses.go
+4 −9 src/runtime/mpagealloc.go
+9 −12 src/runtime/mpallocbits.go
+3 −0 src/runtime/mprof.go
+4 −1 src/runtime/netpoll_kqueue.go
+34 −3 src/runtime/pprof/pprof_test.go
+2 −6 src/runtime/pprof/proto_test.go
+8 −0 src/runtime/proc.go
+1 −1 src/runtime/race/output_test.go
+3 −5 src/runtime/symtab.go
+2 −2 src/runtime/testdata/testprog/syscall_windows.go
+2 −2 src/runtime/testdata/testprogcgo/stack_windows.go
+42 −1 src/runtime/testdata/testprogcgo/stackswitch.c
+5 −7 src/testing/benchmark.go
+2 −0 src/testing/fuzz.go
+11 −0 src/testing/slogtest/slogtest.go
+107 −13 src/testing/testing.go
+344 −1 src/testing/testing_test.go
+1 −1 src/vendor/modules.txt
8 changes: 4 additions & 4 deletions patches/0004-Add-OpenSSL-crypto-backend.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ index c83a7272c9f01f..a0548a7f9179c5 100644
package x509

diff --git a/src/go.mod b/src/go.mod
index 7116fd3d724946..7543d20c516759 100644
index 003d6a96a90ccf..9007bbea016970 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -3,6 +3,7 @@ module std
Expand All @@ -715,18 +715,18 @@ index 7116fd3d724946..7543d20c516759 100644
require (
+ github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20231017103527-08f07a7a41c3
golang.org/x/crypto v0.14.1-0.20231011220222-8779cbd1c995
golang.org/x/net v0.17.1-0.20231011215812-d23d9bc54922
golang.org/x/net v0.17.1-0.20231025180729-4c7a5b64f145
)
diff --git a/src/go.sum b/src/go.sum
index bcaeab575880dc..a2bd8ff5e7e285 100644
index 22519d7febbfbc..e0259476a377c2 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,3 +1,5 @@
+github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20231017103527-08f07a7a41c3 h1:EUdE8vQSqj5vTtLHwomurgliWNAO5A7GpCfUa0S1AtU=
+github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20231017103527-08f07a7a41c3/go.mod h1:7tuBqX2Zov8Yq5mJ2yzlKhpnxOnWyEzi38AzeWRuQdg=
golang.org/x/crypto v0.14.1-0.20231011220222-8779cbd1c995 h1:fwu25/DhiXr/++jtzz2gHfC/FL/FimAGVxczaK4pjR8=
golang.org/x/crypto v0.14.1-0.20231011220222-8779cbd1c995/go.mod h1:aSyBXtGhRzSMdne9jbl3+PPMVS0IgOWF6Llc+HB5uUU=
golang.org/x/net v0.17.1-0.20231011215812-d23d9bc54922 h1:5dPkjItO/mhqL4dWOB/ERHdeNKAe0YXhUnCOLpn/nwI=
golang.org/x/net v0.17.1-0.20231025180729-4c7a5b64f145 h1:b50rfQxeg+jm4ud87SAQt4escws56zdE+/rT1oKU4oU=
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index f10ecff5168acc..79d02564926b37 100644
--- a/src/go/build/deps_test.go
Expand Down
8 changes: 4 additions & 4 deletions patches/0005-Add-CNG-crypto-backend.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,7 @@ index a0548a7f9179c5..ae6117a1554b7f 100644
package x509

diff --git a/src/go.mod b/src/go.mod
index 7543d20c516759..20516381c7c818 100644
index 9007bbea016970..25b6931f65a635 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -4,6 +4,7 @@ go 1.22
Expand All @@ -1096,10 +1096,10 @@ index 7543d20c516759..20516381c7c818 100644
github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20231017103527-08f07a7a41c3
+ github.com/microsoft/go-crypto-winnative v0.0.0-20231013074141-ebaf9de20b54
golang.org/x/crypto v0.14.1-0.20231011220222-8779cbd1c995
golang.org/x/net v0.17.1-0.20231011215812-d23d9bc54922
golang.org/x/net v0.17.1-0.20231025180729-4c7a5b64f145
)
diff --git a/src/go.sum b/src/go.sum
index a2bd8ff5e7e285..a6327968ba387c 100644
index e0259476a377c2..9ca88aa880198d 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,5 +1,7 @@
Expand All @@ -1109,7 +1109,7 @@ index a2bd8ff5e7e285..a6327968ba387c 100644
+github.com/microsoft/go-crypto-winnative v0.0.0-20231013074141-ebaf9de20b54/go.mod h1:fveERXKbeK+XLmOyU24caKnIT/S5nniAX9XCRHfnrM4=
golang.org/x/crypto v0.14.1-0.20231011220222-8779cbd1c995 h1:fwu25/DhiXr/++jtzz2gHfC/FL/FimAGVxczaK4pjR8=
golang.org/x/crypto v0.14.1-0.20231011220222-8779cbd1c995/go.mod h1:aSyBXtGhRzSMdne9jbl3+PPMVS0IgOWF6Llc+HB5uUU=
golang.org/x/net v0.17.1-0.20231011215812-d23d9bc54922 h1:5dPkjItO/mhqL4dWOB/ERHdeNKAe0YXhUnCOLpn/nwI=
golang.org/x/net v0.17.1-0.20231025180729-4c7a5b64f145 h1:b50rfQxeg+jm4ud87SAQt4escws56zdE+/rT1oKU4oU=
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index 79d02564926b37..f66f834ca76528 100644
--- a/src/go/build/deps_test.go
Expand Down