Merge pull request #1565 from microsoft/dev/auto-sync/microsoft/main

Update submodule to latest `master` in `microsoft/main`
microsoft · Feb 20, 2025 · 7d38014 · 7d38014
2 parents da8693c + 852dadc
commit 7d38014
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/go b/go
diff --git a/patches/0003-Implement-crypto-internal-backend.patch b/patches/0003-Implement-crypto-internal-backend.patch
@@ -2672,10 +2672,10 @@ index 00000000000000..5e4b436554d44d
 +// from complaining about the missing body
 +// (because the implementation might be here).
 diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
-index 72e56b5da8e582..45ceb3e2b4ce11 100644
+index 065ddf6ab67c9a..1889403cac91e0 100644
 --- a/src/go/build/deps_test.go
 +++ b/src/go/build/deps_test.go
-@@ -511,6 +511,11 @@ var depsRules = `
+@@ -515,6 +515,11 @@ var depsRules = `
  	< github.com/microsoft/go-crypto-winnative/internal/bcrypt
  	< github.com/microsoft/go-crypto-winnative/cng;
 
@@ -2687,7 +2687,7 @@ index 72e56b5da8e582..45ceb3e2b4ce11 100644
  	FIPS, internal/godebug < crypto/fips140;
 
  	crypto, hash !< FIPS;
-@@ -521,16 +526,28 @@ var depsRules = `
+@@ -525,16 +530,28 @@ var depsRules = `
  	NONE < crypto/internal/boring/sig, crypto/internal/boring/syso;
  	sync/atomic < crypto/internal/boring/bcache;
 
@@ -2718,7 +2718,7 @@ index 72e56b5da8e582..45ceb3e2b4ce11 100644
  	< crypto/boring
  	< crypto/aes,
  	  crypto/des,
-@@ -554,8 +571,12 @@ var depsRules = `
+@@ -558,8 +575,12 @@ 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;
 
@@ -2763,7 +2763,7 @@ index 00000000000000..8d0c3fde9ab5e8
 +const AllowCryptoFallback = true
 +const AllowCryptoFallbackInt = 1
 diff --git a/src/internal/goexperiment/flags.go b/src/internal/goexperiment/flags.go
-index e6c9b7d5e62dc0..65d339be7dde32 100644
+index 4d0fbdffd44957..12ff4499f3be50 100644
 --- a/src/internal/goexperiment/flags.go
 +++ b/src/internal/goexperiment/flags.go
 @@ -78,6 +78,14 @@ type Flags struct {
@@ -3085,13 +3085,13 @@ index 00000000000000..95be7ad8d38cae
 +	`
 +}
 diff --git a/src/runtime/runtime_boring.go b/src/runtime/runtime_boring.go
-index 5a98b20253181c..9042f2c2795e19 100644
+index 831ee67afc952d..d2f00d57c10286 100644
 --- a/src/runtime/runtime_boring.go
 +++ b/src/runtime/runtime_boring.go
-@@ -17,3 +17,8 @@ func boring_runtime_arg0() string {
-
- //go:linkname fipstls_runtime_arg0 crypto/internal/boring/fipstls.runtime_arg0
- func fipstls_runtime_arg0() string { return boring_runtime_arg0() }
+@@ -14,3 +14,8 @@ func boring_runtime_arg0() string {
+ 	}
+ 	return argslice[0]
+ }
 +
 +//go:linkname crypto_backend_runtime_arg0 crypto/internal/backend.runtime_arg0
 +func crypto_backend_runtime_arg0() string {
+41 −0		src/cmd/cgo/internal/testcshared/cshared_test.go
+15 −0		src/cmd/cgo/internal/testcshared/testdata/issue68411/issue68411.go
+12 −7		src/cmd/cgo/out.go
+2 −17		src/cmd/compile/internal/escape/solve.go
+25 −0		src/cmd/compile/internal/inline/inl.go
+1 −1		src/cmd/compile/internal/inline/inlheur/dumpscores_test.go
+2 −2		src/cmd/compile/internal/ir/expr.go
+15 −0		src/cmd/compile/internal/ir/func.go
+2 −1		src/cmd/compile/internal/ir/sizeof_test.go
+2 −2		src/cmd/go/internal/modload/buildlist.go
+1 −1		src/compress/flate/deflate.go
+33 −27		src/crypto/internal/fips140deps/cpu/cpu.go
+1 −1		src/crypto/x509/parser.go
+11 −12		src/go/format/benchmark_test.go
+1 −1		src/internal/syscall/unix/faccessat_bsd.go
+1 −1		src/internal/syscall/unix/faccessat_openbsd.go
+1 −1		src/log/syslog/syslog.go
+1 −1		src/net/http/example_filesystem_test.go
+1 −1		src/net/http/request.go
+1 −1		src/net/rpc/jsonrpc/client.go
+11 −0		src/os/os_test.go
+1 −0		src/os/root.go
+6 −2		src/os/root_test.go
+1 −1		src/os/stat_windows.go
+1 −1		src/os/user/cgo_lookup_unix.go
+50 −0		src/runtime/asm_arm64.s
+14 −4		src/runtime/proc.go
+0 −3		src/runtime/runtime_boring.go
+10 −0		src/runtime/stubs.go
+22 −1		src/runtime/symtab.go
+23 −8		src/syscall/fs_js.go
+17 −5		src/syscall/syscall_windows.go
+2 −2		src/syscall/zsyscall_windows.go
+28 −0		test/fixedbugs/issue71680.go