From 9a6b5285ae7925465ef2e9829a83307b3d29ba57 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 14 May 2024 21:14:02 +0200 Subject: Adding upstream version 1.22.3. Signed-off-by: Daniel Baumann --- src/cmd/internal/moddeps/moddeps_test.go | 2 -- src/cmd/internal/obj/ppc64/obj9.go | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/cmd/internal') diff --git a/src/cmd/internal/moddeps/moddeps_test.go b/src/cmd/internal/moddeps/moddeps_test.go index 8adc653..3d4c99e 100644 --- a/src/cmd/internal/moddeps/moddeps_test.go +++ b/src/cmd/internal/moddeps/moddeps_test.go @@ -33,8 +33,6 @@ import ( // See issues 36852, 41409, and 43687. // (Also see golang.org/issue/27348.) func TestAllDependencies(t *testing.T) { - t.Skip("TODO(#65051): 1.22.2 contains unreleased changes from vendored modules") - goBin := testenv.GoToolPath(t) // Ensure that all packages imported within GOROOT diff --git a/src/cmd/internal/obj/ppc64/obj9.go b/src/cmd/internal/obj/ppc64/obj9.go index 7e26118..6fa0f84 100644 --- a/src/cmd/internal/obj/ppc64/obj9.go +++ b/src/cmd/internal/obj/ppc64/obj9.go @@ -175,8 +175,8 @@ func progedit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) { // Is this a shifted 16b constant? If so, rewrite it to avoid a creating and loading a constant. val := p.From.Offset shift := bits.TrailingZeros64(uint64(val)) - mask := 0xFFFF << shift - if val&int64(mask) == val || (val>>(shift+16) == -1 && (val>>shift)<>(shift+16) == -1 && (val>>shift)<>shift, Rto; SLD $shift, Rto q := obj.Appendp(p, c.newprog) q.As = ASLD -- cgit v1.2.3