Skip to content

Update submodule to latest master in microsoft/main #2450

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 2 commits into from
Aug 14, 2026
+23 −23
Merged

Update submodule to latest master in microsoft/main #2450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
105e791
Update submodule to latest master (65bbc74a): net/http/internal/httpc…
bot-for-go[bot] Aug 14, 2026
bb5049d
resolve 3-way merge conflicts
gdams Aug 14, 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 85 files
+1 −1 src/cmd/cgo/internal/test/issue76861/a.go
+1 −1 src/cmd/cgo/out.go
+245 −5 src/cmd/compile/internal/arm64/ssa.go
+4 −0 src/cmd/compile/internal/base/flag.go
+2 −6 src/cmd/compile/internal/gc/compile.go
+2 −2 src/cmd/compile/internal/loong64/ssa.go
+6 −2 src/cmd/compile/internal/reflectdata/reflect.go
+16 −1 src/cmd/compile/internal/ssa/_gen/ARM64.rules
+43 −1 src/cmd/compile/internal/ssa/_gen/ARM64Ops.go
+49 −49 src/cmd/compile/internal/ssa/_gen/LOONG64Ops.go
+5 −0 src/cmd/compile/internal/ssa/_gen/LOONG64latelower.rules
+9 −4 src/cmd/compile/internal/ssa/_gen/generic.rules
+7 −0 src/cmd/compile/internal/ssa/_gen/genericOps.go
+1 −0 src/cmd/compile/internal/ssa/config.go
+526 −250 src/cmd/compile/internal/ssa/opGen.go
+6 −0 src/cmd/compile/internal/ssa/regalloc.go
+218 −2 src/cmd/compile/internal/ssa/rewriteARM64.go
+51 −0 src/cmd/compile/internal/ssa/rewriteLOONG64latelower.go
+152 −36 src/cmd/compile/internal/ssa/rewritegeneric.go
+17 −0 src/cmd/compile/internal/ssagen/intrinsics.go
+15 −1 src/cmd/compile/internal/types/size.go
+1 −1 src/cmd/go.mod
+2 −2 src/cmd/go.sum
+1 −1 src/cmd/go/internal/doc/pkgsite.go
+61 −18 src/cmd/go/internal/load/test.go
+28 −13 src/cmd/go/internal/modload/load.go
+3 −3 src/cmd/internal/obj/wasm/wasmobj.go
+1 −1 src/cmd/link/internal/ld/data.go
+1 −1 src/cmd/link/link_test.go
+1 −1 src/cmd/vendor/golang.org/x/mod/sumdb/client.go
+30 −11 src/cmd/vendor/golang.org/x/mod/sumdb/tlog/tile.go
+1 −1 src/cmd/vendor/modules.txt
+29 −2 src/crypto/ecdh/x25519.go
+41 −0 src/crypto/internal/fips140/edwards25519/edwards25519.go
+1 −1 src/crypto/md5/md5block_decl.go
+1 −1 src/crypto/md5/md5block_generic.go
+0 −180 src/crypto/md5/md5block_loong64.s
+0 −212 src/crypto/md5/md5block_ppc64x.s
+15 −6 src/encoding/asn1/asn1.go
+87 −0 src/encoding/asn1/asn1_test.go
+2 −1 src/encoding/json/internal/internal.go
+14 −21 src/encoding/json/v2/arshal_funcs.go
+44 −0 src/encoding/json/v2/arshal_methods.go
+14 −4 src/encoding/json/v2/options.go
+1 −1 src/go.mod
+2 −2 src/go.sum
+1 −0 src/internal/cpu/cpu.go
+5 −0 src/internal/cpu/cpu_arm64.go
+2 −0 src/internal/cpu/cpu_arm64_hwcap.go
+13 −12 src/internal/strconv/atof.go
+32 −12 src/internal/strconv/atof_test.go
+1 −1 src/net/http/http_test.go
+19 −6 src/net/http/internal/http2/server.go
+151 −4 src/net/http/internal/http2/server_test.go
+7 −0 src/net/http/internal/httpcommon/README.md
+53 −0 src/net/http/internal/httpcommon/ascii.go
+115 −0 src/net/http/internal/httpcommon/headermap.go
+37 −0 src/net/http/internal/httpcommon/httpcommon_test.go
+34 −157 src/net/http/internal/httpcommon/request.go
+726 −0 src/net/http/internal/httpcommon/request_test.go
+1 −0 src/runtime/cpuflags.go
+59 −1 src/runtime/mkpreempt.go
+48 −32 src/runtime/preempt_arm64.go
+124 −0 src/runtime/preempt_arm64.s
+4 −0 src/simd/archsimd/cpu_other.go
+35 −0 src/simd/archsimd/internal/simd_test/simd_arm64_test.go
+52 −0 src/simd/archsimd/ops_other_arm64.go
+57 −0 src/simd/archsimd/types_other_arm64.go
+5 −3 src/testing/fstest/mapfs.go
+21 −0 src/testing/fstest/mapfs_test.go
+44 −29 src/vendor/golang.org/x/net/http3/http3.go
+9 −21 src/vendor/golang.org/x/net/internal/http3/quic.go
+54 −91 src/vendor/golang.org/x/net/internal/http3/server.go
+44 −28 src/vendor/golang.org/x/net/internal/http3/transport.go
+1 −0 src/vendor/golang.org/x/net/quic/conn_close.go
+1 −1 src/vendor/golang.org/x/net/quic/conn_send.go
+4 −2 src/vendor/golang.org/x/net/quic/endpoint.go
+45 −29 src/vendor/golang.org/x/net/quic/idle.go
+2 −2 src/vendor/golang.org/x/net/quic/udp_msg.go
+2 −2 src/vendor/golang.org/x/net/quic/udp_other.go
+2 −2 src/vendor/golang.org/x/net/quic/udp_packetconn.go
+1 −1 src/vendor/modules.txt
+11 −0 test/codegen/arithmetic.go
+18 −0 test/codegen/noextend.go
+68 −0 test/codegen/scaledidx.go
30 changes: 15 additions & 15 deletions patches/0001-Vendor-external-dependencies.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,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 72d17b6d37c14b..4be5038f5b021f 100644
index f55f0768249d4c..608aca7971a87e 100644
--- a/src/cmd/go.mod
+++ b/src/cmd/go.mod
@@ -4,6 +4,8 @@ go 1.28
Expand All @@ -842,9 +842,9 @@ index 72d17b6d37c14b..4be5038f5b021f 100644
+ github.com/microsoft/go-infra/telemetry/config v0.0.0-20260526160655-aa04f117b3ce
golang.org/x/arch v0.29.0
golang.org/x/build v0.0.0-20260715183034-a43f90886f2e
golang.org/x/mod v0.38.0
golang.org/x/mod v0.39.1-0.20260813190000-57549bfb0d25
diff --git a/src/cmd/go.sum b/src/cmd/go.sum
index 97bbb0b963d9ce..1c7a8b32afa17a 100644
index b803eee2622670..f701430f92a369 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 @@ -2670,7 +2670,7 @@ index 00000000000000..016de9bdd95956
+ return filtered
+}
diff --git a/src/cmd/vendor/modules.txt b/src/cmd/vendor/modules.txt
index e543d18b3bb23d..eaef8375c4522b 100644
index 843d5e7e81fd41..0ce155ac5b1c9c 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 @@ -2738,15 +2738,15 @@ index 00000000000000..d4671e1584dfa8
+// 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 5cd65aa1cd3b98..6c38eb85ec32be 100644
index d9c91d7b0dbcbb..607c4dded38695 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -3,11 +3,17 @@ module std
go 1.28

require (
- golang.org/x/crypto v0.54.1-0.20260714033321-10b54ffa51b1
- golang.org/x/net v0.57.1-0.20260720200444-a02ddfa7eacb
- golang.org/x/net v0.57.1-0.20260723204303-5a920b1a8090
+ github.com/microsoft/go-crypto-darwin v0.0.3-0.20260619075948-e554deeefa9f // indirect
+ github.com/microsoft/go-crypto-openssl v0.5.1-0.20260731132607-9fc2a2ab131d // indirect
+ github.com/microsoft/go-crypto-winnative v0.0.0-20260605073512-713d2add0825 // indirect
Expand All @@ -2759,12 +2759,12 @@ index 5cd65aa1cd3b98..6c38eb85ec32be 100644
- golang.org/x/text v0.40.0 // indirect
+ github.com/microsoft/go/cryptobackend v0.0.0
+ golang.org/x/crypto v0.54.1-0.20260714033321-10b54ffa51b1
+ golang.org/x/net v0.57.1-0.20260720200444-a02ddfa7eacb
+ golang.org/x/net v0.57.1-0.20260723204303-5a920b1a8090
)
+
+replace github.com/microsoft/go/cryptobackend => ../../cryptobackend
diff --git a/src/go.sum b/src/go.sum
index f540571ca5387d..363dffe7c44517 100644
index 2d4171d08a2857..504df8a325c78a 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,3 +1,9 @@
Expand All @@ -2776,9 +2776,9 @@ index f540571ca5387d..363dffe7c44517 100644
+github.com/microsoft/go-crypto-winnative v0.0.0-20260605073512-713d2add0825/go.mod h1:a1Z07CJIuWa8WT/pzFIGNTTKS96s8o1B1TPOziAHUxw=
golang.org/x/crypto v0.54.1-0.20260714033321-10b54ffa51b1 h1:vGPAn+SBeT/HVkWqXTwgapJgtGQJztG0WR0OTuHzMAI=
golang.org/x/crypto v0.54.1-0.20260714033321-10b54ffa51b1/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk=
golang.org/x/net v0.57.1-0.20260720200444-a02ddfa7eacb h1:4Zpnuj4Vkh1c0wOa1MvxIp+I66KR18NRN08y9bN5zL0=
golang.org/x/net v0.57.1-0.20260723204303-5a920b1a8090 h1:XtR9OCj3sl60bQa861zXyA2fXGYcpmj8o8fGZe8iCtQ=
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index 4959a421892996..67627cdb93ff22 100644
index 314608372954ce..6ddb9afc7f82a4 100644
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -153,6 +153,13 @@ var depsRules = `
Expand All @@ -2795,7 +2795,7 @@ index 4959a421892996..67627cdb93ff22 100644
# TIME is SYSCALL plus the core packages about time, including context.
SYSCALL
< time/tzdata
@@ -540,16 +547,46 @@ var depsRules = `
@@ -541,16 +548,46 @@ var depsRules = `
NONE < crypto/internal/boring/sig, crypto/internal/boring/syso;
sync/atomic < crypto/internal/boring/bcache;

Expand Down Expand Up @@ -2847,7 +2847,7 @@ index 4959a421892996..67627cdb93ff22 100644
< crypto/internal/boring
< crypto/boring
< crypto/internal/rand
@@ -575,6 +612,10 @@ var depsRules = `
@@ -576,6 +613,10 @@ var depsRules = `

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

Expand All @@ -2858,7 +2858,7 @@ index 4959a421892996..67627cdb93ff22 100644
CRYPTO, FMT, math/big, internal/saferio
< crypto/internal/boring/bbig
< crypto/internal/fips140cache
@@ -954,7 +995,7 @@ var buildIgnore = []byte("\n//go:build ignore")
@@ -955,7 +996,7 @@ var buildIgnore = []byte("\n//go:build ignore")

func findImports(pkg string) ([]string, error) {
vpkg := pkg
Expand All @@ -2867,7 +2867,7 @@ index 4959a421892996..67627cdb93ff22 100644
vpkg = "vendor/" + pkg
}
dir := filepath.Join(Default.GOROOT, "src", vpkg)
@@ -964,7 +1005,7 @@ func findImports(pkg string) ([]string, error) {
@@ -965,7 +1006,7 @@ func findImports(pkg string) ([]string, error) {
}
var imports []string
var haveImport = map[string]bool{}
Expand Down Expand Up @@ -45321,7 +45321,7 @@ index 00000000000000..b7ffeea07c6b8d
+ panic("cryptobackend: not available")
+}
diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
index 6a02c35f7fafa9..d46e368a70e8f2 100644
index 87a2fc95544420..63bd2e1385fcdb 100644
--- a/src/vendor/modules.txt
+++ b/src/vendor/modules.txt
@@ -1,3 +1,57 @@
Expand Down
14 changes: 7 additions & 7 deletions patches/0002-Add-crypto-backends.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@ index b7ff79c0958bab..c86ccff3e325b2 100644
"crypto/internal/boring/syso",
"crypto/x509",
diff --git a/src/cmd/link/link_test.go b/src/cmd/link/link_test.go
index e7c406c4ad1eb8..7574d1b069807d 100644
index aca1ac0008b036..5e7d03cf74a713 100644
--- a/src/cmd/link/link_test.go
+++ b/src/cmd/link/link_test.go
@@ -14,6 +14,7 @@ import (
Expand Down Expand Up @@ -2115,10 +2115,10 @@ index 13865ea7012989..81a6b5a9fb1ef9 100644
return c.sharedSecret(local.fips, remote.fips)
}
diff --git a/src/crypto/ecdh/x25519.go b/src/crypto/ecdh/x25519.go
index 21a921aa12d44d..075b2f679d2238 100644
index 80ed77f6fd7ddc..939f1439557610 100644
--- a/src/crypto/ecdh/x25519.go
+++ b/src/crypto/ecdh/x25519.go
@@ -11,6 +11,9 @@ import (
@@ -12,6 +12,9 @@ import (
"crypto/internal/rand"
"errors"
"io"
Expand All @@ -2128,7 +2128,7 @@ index 21a921aa12d44d..075b2f679d2238 100644
)

var (
@@ -38,6 +41,23 @@ func (c *x25519Curve) GenerateKey(r io.Reader) (*PrivateKey, error) {
@@ -39,6 +42,23 @@ func (c *x25519Curve) GenerateKey(r io.Reader) (*PrivateKey, error) {
if fips140only.Enforced() {
return nil, errors.New("crypto/ecdh: use of X25519 is not allowed in FIPS 140-only mode")
}
Expand All @@ -2152,7 +2152,7 @@ index 21a921aa12d44d..075b2f679d2238 100644
r = rand.CustomReader(r)
key := make([]byte, x25519PrivateKeySize)
if _, err := io.ReadFull(r, key); err != nil {
@@ -53,6 +73,23 @@ func (c *x25519Curve) NewPrivateKey(key []byte) (*PrivateKey, error) {
@@ -54,6 +74,23 @@ func (c *x25519Curve) NewPrivateKey(key []byte) (*PrivateKey, error) {
if len(key) != x25519PrivateKeySize {
return nil, errors.New("crypto/ecdh: invalid private key size")
}
Expand All @@ -2174,8 +2174,8 @@ index 21a921aa12d44d..075b2f679d2238 100644
+ return k, nil
+ }
publicKey := make([]byte, x25519PublicKeySize)
x25519Basepoint := [32]byte{9}
x25519ScalarMult(publicKey, key, x25519Basepoint[:])
x25519ScalarBaseMult(publicKey, key)
// We don't check for the all-zero public key here because the scalar is
@@ -73,6 +110,17 @@ func (c *x25519Curve) NewPublicKey(key []byte) (*PublicKey, error) {
if len(key) != x25519PublicKeySize {
return nil, errors.New("crypto/ecdh: invalid public key")
Expand Down
Loading