From 7467ddbfab383860ae6730e48b2b9a73282718c6 Mon Sep 17 00:00:00 2001 From: microsoft-golang-bot Date: Wed, 12 Jun 2024 22:06:43 +0000 Subject: [PATCH 1/2] Update submodule to latest master (ca5ba146): cmd/compile/internal: add a PGO devirt post-lookup cleanup hook --- go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go b/go index 0b72631a822..ca5ba146da7 160000 --- a/go +++ b/go @@ -1 +1 @@ -Subproject commit 0b72631a8229bcb86913f4855e217ddedbfbbb46 +Subproject commit ca5ba146da7a9d4e2a8cbe1715a78be42b45a745 From 6b004dec7c8ecc38b96202cf938cd30789299b55 Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 13 Jun 2024 10:47:25 +0100 Subject: [PATCH 2/2] fix patches --- patches/0008-Update-default-go.env.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/0008-Update-default-go.env.patch b/patches/0008-Update-default-go.env.patch index 6749ac135c4..89184135112 100644 --- a/patches/0008-Update-default-go.env.patch +++ b/patches/0008-Update-default-go.env.patch @@ -24,7 +24,7 @@ index 6ff2b921d464bc..4aca2ff2c63dbc 100644 -GOTOOLCHAIN=auto +GOTOOLCHAIN=local diff --git a/src/cmd/go/testdata/script/env_changed.txt b/src/cmd/go/testdata/script/env_changed.txt -index a3d368cd39e480..2253bb202d8397 100644 +index 37d6571938cba6..204c39c5b18891 100644 --- a/src/cmd/go/testdata/script/env_changed.txt +++ b/src/cmd/go/testdata/script/env_changed.txt @@ -1,5 +1,8 @@ @@ -33,6 +33,6 @@ index a3d368cd39e480..2253bb202d8397 100644 +# See https://github.com/golang/go/issues/67793 +skip 'test relies on the standard go.env file, but Microsoft Go has a modified go.env file' + + env GOROOT=./a env GOTOOLCHAIN=local env GOSUMDB=nodefault - env GOPROXY=nodefault