Skip to content

Update submodule to latest master in microsoft/main #2541

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

Merged
bot-for-go merged 1 commit into from
Oct 5, 2026
Merged

Update submodule to latest master in microsoft/main #2541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 248 files
14 changes: 7 additions & 7 deletions patches/0001-Vendor-external-dependencies.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@ Use a 'go' that was recently built by the current branch to ensure stable result
create mode 100644 src/vendor/github.com/microsoft/go/cryptobackend/tls13/tls13_windows.go

diff --git a/src/cmd/go.mod b/src/cmd/go.mod
index 03541ad3a52c4a..cf4d5855dd03ba 100644
index b69ed87ac99bf9..1be3467a59db1f 100644
--- a/src/cmd/go.mod
+++ b/src/cmd/go.mod
@@ -4,6 +4,8 @@ go 1.28
Expand All @@ -932,7 +932,7 @@ index 03541ad3a52c4a..cf4d5855dd03ba 100644
golang.org/x/build v0.0.0-20260715183034-a43f90886f2e
golang.org/x/mod v0.41.0
diff --git a/src/cmd/go.sum b/src/cmd/go.sum
index 35fd52fc7759f2..73fbf59ca65352 100644
index 550a982c5176cd..a12b0d138050d0 100644
--- a/src/cmd/go.sum
+++ b/src/cmd/go.sum
@@ -4,6 +4,10 @@ github.com/google/pprof v0.0.0-20260507013755-92041b743c96 h1:YDDnaZ9afWajDboPMt
Expand Down Expand Up @@ -2758,7 +2758,7 @@ index 00000000000000..016de9bdd95956
+ return filtered
+}
diff --git a/src/cmd/vendor/modules.txt b/src/cmd/vendor/modules.txt
index 85e719f614e371..ee086e775a94e9 100644
index 0be16ea83c91cc..e8097c291b83c7 100644
--- a/src/cmd/vendor/modules.txt
+++ b/src/cmd/vendor/modules.txt
@@ -16,6 +16,17 @@ github.com/google/pprof/third_party/svgpan
Expand Down Expand Up @@ -2825,7 +2825,7 @@ index 00000000000000..976264657a3ea8
+// This file is here just to declare cryptobackend dependencies.
+// This allows tracking their versions in a single patch file.
diff --git a/src/go.mod b/src/go.mod
index 87000a93e5e4cd..61fa6e65650e9b 100644
index 12b6b39c9e4cf8..e7da02ed590169 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -3,12 +3,18 @@ module std
Expand All @@ -2835,7 +2835,7 @@ index 87000a93e5e4cd..61fa6e65650e9b 100644
+ github.com/microsoft/go/cryptobackend v0.0.0
golang.org/x/crypto v0.57.1-0.20260921070245-7a4a4d6beae2
golang.org/x/net v0.59.0
golang.org/x/tools v0.50.1-0.20260909225150-e75ea804503b
golang.org/x/tools v0.50.1-0.20260929192349-98444708d405
)

require (
Expand All @@ -2848,7 +2848,7 @@ index 87000a93e5e4cd..61fa6e65650e9b 100644
+
+replace github.com/microsoft/go/cryptobackend => ../../cryptobackend
diff --git a/src/go.sum b/src/go.sum
index 733b8366454e04..0f2591f68c7228 100644
index 4d2c4120ca2482..92814f15456a8e 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,3 +1,9 @@
Expand Down Expand Up @@ -48758,7 +48758,7 @@ index 00000000000000..b7ffeea07c6b8d
+ panic("cryptobackend: not available")
+}
diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
index 7e4995d7459461..d3c9c589c6d936 100644
index 26fd3c0df44eb0..5f6411c33685f4 100644
--- a/src/vendor/modules.txt
+++ b/src/vendor/modules.txt
@@ -1,3 +1,56 @@
Expand Down
34 changes: 17 additions & 17 deletions patches/0002-Add-crypto-backends.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ index 1d9d3fc288663c..12a1e07950ef04 100644
"internal/types/errors",
"internal/unsafeheader",
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 4fe2ec49413476..1557af667bc8e6 100644
index f24291e76bba1f..ad9ba0a5e1e0b7 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -158,10 +158,12 @@ func (t *tester) run() {
Expand Down Expand Up @@ -364,7 +364,7 @@ index 4fe2ec49413476..1557af667bc8e6 100644
}
}

@@ -717,7 +719,7 @@ func (t *tester) registerTests() {
@@ -719,7 +721,7 @@ func (t *tester) registerTests() {
})

// Check that all crypto packages compile (and test correctly, in longmode) with fips.
Expand All @@ -373,7 +373,7 @@ index 4fe2ec49413476..1557af667bc8e6 100644
// Test standard crypto packages with fips140=on.
t.registerTest("GOFIPS140=latest go test crypto/...", &goTest{
variant: "gofips140",
@@ -781,7 +783,9 @@ func (t *tester) registerTests() {
@@ -783,7 +785,9 @@ func (t *tester) registerTests() {
}

// Test ios/amd64 for the iOS simulator.
Expand All @@ -384,7 +384,7 @@ index 4fe2ec49413476..1557af667bc8e6 100644
t.registerTest("GOOS=ios on darwin/amd64",
&goTest{
variant: "amd64ios",
@@ -1018,7 +1022,9 @@ func (t *tester) registerTests() {
@@ -1020,7 +1024,9 @@ func (t *tester) registerTests() {
t.registerRaceTests()
}

Expand All @@ -395,7 +395,7 @@ index 4fe2ec49413476..1557af667bc8e6 100644
// Only start multiple test dir shards on builders,
// where they get distributed to multiple machines.
// See issues 20141 and 31834.
@@ -1374,12 +1380,11 @@ func (t *tester) registerCgoTests(heading string) {
@@ -1376,12 +1382,11 @@ func (t *tester) registerCgoTests(heading string) {
// a C linker warning on Linux.
// in function `bio_ip_and_port_to_socket_and_addr':
// warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
Expand All @@ -409,7 +409,7 @@ index 4fe2ec49413476..1557af667bc8e6 100644
// Static linking tests
if goos != "android" && p != "netbsd/arm" && !t.msan && !t.asan {
// TODO(#56629): Why does this fail on netbsd-arm?
@@ -1907,3 +1912,26 @@ func goexperiments(exps ...string) string {
@@ -1909,3 +1914,26 @@ func goexperiments(exps ...string) string {
return existing + strings.Join(exps, ",")

}
Expand Down Expand Up @@ -464,18 +464,18 @@ index c7acc7dd0b9849..8f94ea4b7dd4b6 100644
package main_test

diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
index 4caea619a35a73..100f5ada1aff48 100644
index a38198345b6c14..b178010181a8ab 100644
--- a/src/cmd/go/go_test.go
+++ b/src/cmd/go/go_test.go
@@ -14,6 +14,7 @@ import (
"go/format"
@@ -15,6 +15,7 @@ import (
"internal/godebug"
"internal/goexperiment"
"internal/platform"
+ "internal/systemcrypto"
"internal/testenv"
"io"
"io/fs"
@@ -110,6 +111,13 @@ func TestMain(m *testing.M) {
@@ -111,6 +112,13 @@ func TestMain(m *testing.M) {
if v := os.Getenv("TESTGO_TOOLCHAIN_VERSION"); v != "" {
work.ToolchainVersion = v
}
Expand All @@ -489,7 +489,7 @@ index 4caea619a35a73..100f5ada1aff48 100644

if testGOROOT := os.Getenv("TESTGO_GOROOT"); testGOROOT != "" {
// Disallow installs to the GOROOT from which testgo was built.
@@ -1726,6 +1734,9 @@ func TestGenerateUsesBuildContext(t *testing.T) {
@@ -1731,6 +1739,9 @@ func TestGenerateUsesBuildContext(t *testing.T) {
}

func TestGoEnv(t *testing.T) {
Expand Down Expand Up @@ -5332,7 +5332,7 @@ index 3091f7a67acede..fa3f0fd82cfd30 100644
}
if !bytes.Equal(enc, tt.golden) {
diff --git a/src/internal/buildcfg/cfg.go b/src/internal/buildcfg/cfg.go
index a8388e00f16b10..ca20bb90366acb 100644
index 3ebd93058886fa..227b9f0144f2a2 100644
Comment thread
gdams marked this conversation as resolved.
--- a/src/internal/buildcfg/cfg.go
+++ b/src/internal/buildcfg/cfg.go
@@ -45,6 +45,8 @@ var (
Expand All @@ -5345,7 +5345,7 @@ index a8388e00f16b10..ca20bb90366acb 100644
var Error error

diff --git a/src/internal/buildcfg/cfg_test.go b/src/internal/buildcfg/cfg_test.go
index 2bbd478280241e..313e39edf7514c 100644
index 34313cad82b2bb..a47171a592c9c8 100644
--- a/src/internal/buildcfg/cfg_test.go
+++ b/src/internal/buildcfg/cfg_test.go
@@ -6,6 +6,8 @@ package buildcfg
Expand All @@ -5357,7 +5357,7 @@ index 2bbd478280241e..313e39edf7514c 100644
"testing"
)

@@ -128,6 +130,53 @@ func TestGogoarchTags(t *testing.T) {
@@ -137,6 +139,53 @@ func TestGogoarchTags(t *testing.T) {
GOARM64 = old_goarm64
}

Expand Down Expand Up @@ -5412,7 +5412,7 @@ index 2bbd478280241e..313e39edf7514c 100644
"v1.0.0",
"v1.0.1",
diff --git a/src/internal/buildcfg/exp.go b/src/internal/buildcfg/exp.go
index cf9fa89497b992..e1dddce0e2a800 100644
index 0ede05787de83f..ce3a0ee6a841c4 100644
--- a/src/internal/buildcfg/exp.go
+++ b/src/internal/buildcfg/exp.go
@@ -10,12 +10,14 @@ import (
Expand All @@ -5430,7 +5430,7 @@ index cf9fa89497b992..e1dddce0e2a800 100644
baseline goexperiment.Flags
}

@@ -130,6 +132,23 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
@@ -131,6 +133,23 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
if strings.HasPrefix(f, "no") {
f, val = f[2:], false
}
Expand All @@ -5454,7 +5454,7 @@ index cf9fa89497b992..e1dddce0e2a800 100644
set, ok := names[f]
if !ok {
return nil, fmt.Errorf("unknown GOEXPERIMENT %s", f)
@@ -151,6 +170,9 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
@@ -152,6 +171,9 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
if flags.RegabiArgs && !flags.RegabiWrappers {
return nil, fmt.Errorf("GOEXPERIMENT regabiargs requires regabiwrappers")
}
Expand Down
Loading