Skip to content

Commit

Permalink
Merge pull request #553 from microsoft/dev/auto-sync/microsoft/releas…
Browse files Browse the repository at this point in the history
…e-branch.go1.18

Update submodule to latest `release-branch.go1.18` in `microsoft/release-branch.go1.18`
  • Loading branch information
microsoft-golang-review-bot authored May 10, 2022
2 parents 360330e + 9f9ff20 commit 5f7ae4e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion go
Submodule go updated 47 files
+1 −1 VERSION
+16 −4 src/cmd/compile/internal/noder/stencil.go
+8 −8 src/cmd/compile/internal/reflectdata/reflect.go
+5 −3 src/cmd/compile/internal/ssa/rewrite.go
+53 −0 src/cmd/compile/internal/types2/api_test.go
+4 −3 src/cmd/compile/internal/types2/context.go
+40 −19 src/cmd/compile/internal/types2/decl.go
+2 −1 src/cmd/compile/internal/types2/instantiate.go
+36 −27 src/cmd/compile/internal/types2/lookup.go
+15 −0 src/cmd/compile/internal/types2/testdata/fixedbugs/issue52529.go2
+6 −0 src/cmd/go/internal/modload/load.go
+35 −0 src/cmd/go/testdata/script/mod_run_issue52331.txt
+55 −1 src/go/types/api_test.go
+4 −3 src/go/types/context.go
+35 −16 src/go/types/decl.go
+2 −1 src/go/types/instantiate.go
+36 −27 src/go/types/lookup.go
+7 −12 src/go/types/methodset.go
+59 −8 src/go/types/methodset_test.go
+15 −0 src/go/types/testdata/fixedbugs/issue52529.go2
+6 −0 src/net/dial_test.go
+11 −18 src/net/http/httptest/server.go
+54 −0 src/net/http/httptest/server_test.go
+12 −0 src/reflect/all_test.go
+4 −2 src/reflect/value.go
+198 −0 src/runtime/asm_arm64.s
+1 −1 src/runtime/debug_test.go
+1 −1 src/runtime/debugcall.go
+132 −0 src/runtime/export_debug_amd64_test.go
+135 −0 src/runtime/export_debug_arm64_test.go
+0 −15 src/runtime/export_debug_regabiargs_off_test.go
+0 −45 src/runtime/export_debug_regabiargs_on_test.go
+17 −51 src/runtime/export_debug_test.go
+1 −0 src/runtime/runtime2.go
+4 −3 src/runtime/signal_amd64.go
+3 −2 src/runtime/signal_arm64.go
+1 −1 src/runtime/traceback.go
+4 −4 src/sync/atomic/value.go
+1 −1 src/syscall/syscall_linux.go
+49 −0 test/fixedbugs/issue52612.go
+2 −3 test/run.go
+26 −0 test/typeparam/issue51700.go
+50 −0 test/typeparam/issue52026.go
+15 −0 test/typeparam/issue52117.dir/a.go
+7 −0 test/typeparam/issue52117.dir/b.go
+7 −0 test/typeparam/issue52117.go
+30 −0 test/typeparam/issue52228.go
8 changes: 4 additions & 4 deletions patches/0002-net-Skip-TestDialCancel-on-linux-arm64.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The test is flaky on our linux-arm64 builder and gets "network is unreachable".
1 file changed, 4 insertions(+)

diff --git a/src/net/dial_test.go b/src/net/dial_test.go
index b9aead0371..f4f383a365 100644
index 3cce444e5c..d001fc36af 100644
--- a/src/net/dial_test.go
+++ b/src/net/dial_test.go
@@ -758,6 +758,10 @@ func TestDialerKeepAlive(t *testing.T) {
Expand All @@ -20,6 +20,6 @@ index b9aead0371..f4f383a365 100644
+ t.Skip("skipping on linux-arm64-*; incompatible network config? issue 37330")
+ }
+
blackholeIPPort := JoinHostPort(slowDst4, "1234")
if !supportsIPv4() {
blackholeIPPort = JoinHostPort(slowDst6, "1234")
if strings.HasPrefix(testenv.Builder(), "darwin-arm64") {
// The darwin-arm64 machines run in an environment that's not
// compatible with this test.

0 comments on commit 5f7ae4e

Please sign in to comment.