Skip to content

Update submodule to latest master in microsoft/main #2287

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 5 commits into from
May 20, 2026
Merged

Update submodule to latest master in microsoft/main #2287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2a3044
Update submodule to latest master (47f26133): cmd/internal/obj/loong6…
bot-for-go[bot] May 20, 2026
44866a7
fix conflicts
qmuntal May 20, 2026
f80de08
fix deps
qmuntal May 20, 2026
2cf4630
skip TestServerKeepAlivesEnabled
qmuntal May 20, 2026
eac548e
fix TestGetClientCertificate
qmuntal May 20, 2026
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 427 files
16 changes: 8 additions & 8 deletions patches/0001-Vendor-external-dependencies.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,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-crypto-winnative/internal/sysdll/sys_windows.go

diff --git a/src/cmd/go.mod b/src/cmd/go.mod
index 930247f4c895b7..080a70ec79a1a7 100644
index 938fdb2955f766..5e8404e1a7e2ea 100644
--- a/src/cmd/go.mod
+++ b/src/cmd/go.mod
@@ -4,6 +4,8 @@ go 1.27
Expand All @@ -544,9 +544,9 @@ index 930247f4c895b7..080a70ec79a1a7 100644
+ github.com/microsoft/go-infra/telemetry/config v0.0.0-20260513084116-8db604e72b76
golang.org/x/arch v0.23.1-0.20260109160903-657d90bd6695
golang.org/x/build v0.0.0-20260122183339-3ba88df37c64
golang.org/x/mod v0.35.0
golang.org/x/mod v0.36.1-0.20260513122029-343ee60345a1
diff --git a/src/cmd/go.sum b/src/cmd/go.sum
index 89e5f334cfffbb..03092e84af8453 100644
index d78128ce1beace..a607cee2c045d6 100644
--- a/src/cmd/go.sum
+++ b/src/cmd/go.sum
@@ -4,6 +4,10 @@ github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/v
Expand Down Expand Up @@ -2226,7 +2226,7 @@ index 00000000000000..e50deaa4189b18
+ return false
+}
diff --git a/src/cmd/vendor/modules.txt b/src/cmd/vendor/modules.txt
index 6ba72c229f6240..52e14e559e925d 100644
index 68ae04853cc802..703836c46ee18e 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 @@ -2304,7 +2304,7 @@ index 43554ff45c183e..143b3063c17042 100644
golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
golang.org/x/net v0.54.1-0.20260509022215-ad8140e0aa2e h1:ITxjUIeFp/ACbvnNlOZLoDmomcET3Yt4lFMgeqBebXk=
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index 752f90091425a8..4adb0db977e5a5 100644
index 25cb06182cae3d..02b52e2ab9c296 100644
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -153,6 +153,13 @@ var depsRules = `
Expand Down Expand Up @@ -2373,7 +2373,7 @@ index 752f90091425a8..4adb0db977e5a5 100644
< crypto/internal/boring
< crypto/boring
< crypto/internal/rand
@@ -570,6 +607,10 @@ var depsRules = `
@@ -571,6 +608,10 @@ var depsRules = `

# CRYPTO-MATH is crypto that exposes math/big APIs - no cgo, net; fmt now ok.

Expand All @@ -2384,7 +2384,7 @@ index 752f90091425a8..4adb0db977e5a5 100644
CRYPTO, FMT, math/big, internal/saferio
< crypto/internal/boring/bbig
< crypto/internal/fips140cache
@@ -940,7 +981,7 @@ var buildIgnore = []byte("\n//go:build ignore")
@@ -947,7 +988,7 @@ var buildIgnore = []byte("\n//go:build ignore")

func findImports(pkg string) ([]string, error) {
vpkg := pkg
Expand All @@ -2393,7 +2393,7 @@ index 752f90091425a8..4adb0db977e5a5 100644
vpkg = "vendor/" + pkg
}
dir := filepath.Join(Default.GOROOT, "src", vpkg)
@@ -950,7 +991,7 @@ func findImports(pkg string) ([]string, error) {
@@ -957,7 +998,7 @@ func findImports(pkg string) ([]string, error) {
}
var imports []string
var haveImport = map[string]bool{}
Expand Down
16 changes: 8 additions & 8 deletions patches/0002-Add-crypto-backend-GOEXPERIMENTs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ maintain this feature. For more information, see the test files.
create mode 100644 src/internal/goexperiment/exp_systemcrypto_on.go

diff --git a/src/cmd/go/alldocs.go b/src/cmd/go/alldocs.go
index 560cdb28fe5e86..7c4bf70b24f9c7 100644
index 74cafe9613917d..31ce076273aba2 100644
--- a/src/cmd/go/alldocs.go
+++ b/src/cmd/go/alldocs.go
@@ -2616,6 +2616,9 @@
Expand Down Expand Up @@ -290,7 +290,7 @@ index 89fd74eb823162..6d266ff641d721 100644
var Error error

diff --git a/src/internal/buildcfg/exp.go b/src/internal/buildcfg/exp.go
index 3c7e2aa7d442d2..87b50da167e5e6 100644
index 8eeef17c1f470e..d474ed1d4d466d 100644
--- a/src/internal/buildcfg/exp.go
+++ b/src/internal/buildcfg/exp.go
@@ -6,6 +6,7 @@ package buildcfg
Expand Down Expand Up @@ -344,11 +344,11 @@ index 3c7e2aa7d442d2..87b50da167e5e6 100644
dwarf5Supported := (goos != "darwin" && goos != "ios" && goos != "aix")

baseline := goexperiment.Flags{
+ SystemCrypto: systemCryptoSupported, // if system crypto is supported, enable it by default
RegabiWrappers: regabiSupported,
RegabiArgs: regabiSupported,
Dwarf5: dwarf5Supported,
@@ -124,6 +151,10 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
+ SystemCrypto: systemCryptoSupported,
RegabiWrappers: regabiSupported,
RegabiArgs: regabiSupported,
Dwarf5: dwarf5Supported,
@@ -126,6 +153,10 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
// to build with any experiment flags.
flags.Flags = goexperiment.Flags{}
continue
Expand All @@ -359,7 +359,7 @@ index 3c7e2aa7d442d2..87b50da167e5e6 100644
}
val := true
if strings.HasPrefix(f, "no") {
@@ -150,6 +181,9 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
@@ -152,6 +183,9 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
if flags.RegabiArgs && !flags.RegabiWrappers {
return nil, fmt.Errorf("GOEXPERIMENT regabiargs requires regabiwrappers")
}
Expand Down
30 changes: 15 additions & 15 deletions patches/0003-Implement-crypto-internal-backend.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ index 0e32e0769ee2e2..eda2d576acc6c6 100644
if doReplacement {
if testCompiler == "" {
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index a0f8d8dd372088..6a1a5258b22dc8 100644
index de2c7be2e833f9..415f4baeff2510 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1398,6 +1398,80 @@ func toolenv() []string {
Expand Down Expand Up @@ -247,7 +247,7 @@ index a0f8d8dd372088..6a1a5258b22dc8 100644
if debug {
run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 2c1cc27d58cc11..7f66bb58d1580f 100644
index aadb1ff52b067f..dab28b6f1ced0a 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 @@ -277,7 +277,7 @@ index 2c1cc27d58cc11..7f66bb58d1580f 100644
}
}

@@ -766,7 +768,9 @@ func (t *tester) registerTests() {
@@ -774,7 +776,9 @@ func (t *tester) registerTests() {
}

// Test ios/amd64 for the iOS simulator.
Expand All @@ -288,7 +288,7 @@ index 2c1cc27d58cc11..7f66bb58d1580f 100644
t.registerTest("GOOS=ios on darwin/amd64",
&goTest{
variant: "amd64ios",
@@ -1015,7 +1019,9 @@ func (t *tester) registerTests() {
@@ -1023,7 +1027,9 @@ func (t *tester) registerTests() {
t.registerRaceTests()
}

Expand Down Expand Up @@ -705,18 +705,18 @@ index 19ed197a20b57e..5e592c7c6697d7 100644
if !strings.Contains(buildVersion, "-") { // See go.dev/issue/75953.
sep = "-"
diff --git a/src/cmd/link/link_test.go b/src/cmd/link/link_test.go
index 941cee36a62a4b..4ccd22da3bcd0a 100644
index e7c406c4ad1eb8..ac36a6dd1ca1a0 100644
--- a/src/cmd/link/link_test.go
+++ b/src/cmd/link/link_test.go
@@ -12,6 +12,7 @@ import (
"debug/pe"
@@ -13,6 +13,7 @@ import (
"errors"
"internal/abi"
"internal/buildcfg"
+ "internal/goexperiment"
"internal/platform"
"internal/testenv"
"internal/xcoff"
@@ -367,6 +368,9 @@ func TestBuildForTvOS(t *testing.T) {
@@ -368,6 +369,9 @@ func TestBuildForTvOS(t *testing.T) {
if runtime.GOOS != "darwin" {
t.Skip("skipping on non-darwin platform")
}
Expand All @@ -726,7 +726,7 @@ index 941cee36a62a4b..4ccd22da3bcd0a 100644
if testing.Short() && testenv.Builder() == "" {
t.Skip("skipping in -short mode with $GO_BUILDER_NAME empty")
}
@@ -597,6 +601,10 @@ func TestIssue34788Android386TLSSequence(t *testing.T) {
@@ -598,6 +602,10 @@ func TestIssue34788Android386TLSSequence(t *testing.T) {
t.Skip("skipping on non-{linux,darwin}/amd64 platform")
}

Expand Down Expand Up @@ -3307,7 +3307,7 @@ index 00000000000000..7500bd3a86472b
+ `
+}
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index 4adb0db977e5a5..0b7d08133be300 100644
index 02b52e2ab9c296..7794e12bc86890 100644
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -368,7 +368,7 @@ var depsRules = `
Expand Down Expand Up @@ -3344,7 +3344,7 @@ index 4adb0db977e5a5..0b7d08133be300 100644
FIPS, internal/godebug, embed,
crypto/internal/boring/sig,
crypto/internal/boring/syso,
@@ -611,8 +622,15 @@ var depsRules = `
@@ -612,8 +623,15 @@ var depsRules = `
math/big, github.com/microsoft/go-crypto-darwin/xcrypto < github.com/microsoft/go-crypto-darwin/bbig;
math/big, github.com/microsoft/go-crypto-winnative/cng < github.com/microsoft/go-crypto-winnative/cng/bbig;

Expand All @@ -3363,7 +3363,7 @@ index 4adb0db977e5a5..0b7d08133be300 100644
< crypto/rand
< crypto/ed25519 # depends on crypto/rand.Reader
diff --git a/src/internal/buildcfg/exp.go b/src/internal/buildcfg/exp.go
index 35b4d011584f52..1029dc8eb4fc83 100644
index d474ed1d4d466d..864f3ab2f05a66 100644
--- a/src/internal/buildcfg/exp.go
+++ b/src/internal/buildcfg/exp.go
@@ -8,9 +8,11 @@ import (
Expand Down Expand Up @@ -3397,7 +3397,7 @@ index 35b4d011584f52..1029dc8eb4fc83 100644

// Older versions (anything before V16) of dsymutil don't handle
// the .debug_rnglists section in DWARF5. See
@@ -159,6 +151,16 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
@@ -162,6 +154,16 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
if strings.HasPrefix(f, "no") {
f, val = f[2:], false
}
Expand All @@ -3414,7 +3414,7 @@ index 35b4d011584f52..1029dc8eb4fc83 100644
set, ok := names[f]
if !ok {
return nil, fmt.Errorf("unknown GOEXPERIMENT %s", f)
@@ -183,6 +185,10 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
@@ -186,6 +188,10 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
if flags.BoringCrypto {
return nil, fmt.Errorf("GOEXPERIMENT boringcrypto is not supported in the Microsoft build of Go")
}
Expand All @@ -3425,7 +3425,7 @@ index 35b4d011584f52..1029dc8eb4fc83 100644
return flags, nil
}

@@ -192,6 +198,26 @@ func (exp *ExperimentFlags) String() string {
@@ -195,6 +201,26 @@ func (exp *ExperimentFlags) String() string {
return strings.Join(expList(&exp.Flags, &exp.baseline, false), ",")
}

Expand Down
Loading
Loading