diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:14:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:14:03 +0000 |
| commit | e9c64d7b331228dddf1b7c3d18c88a464896c6d1 (patch) | |
| tree | 448abe42291439d1720df9769d0cfc266cc1ac7f /src/cmd/internal | |
| parent | Releasing progress-linux version 1.22.2-2~progress7.99u1. (diff) | |
| download | golang-1.22-e9c64d7b331228dddf1b7c3d18c88a464896c6d1.tar.xz golang-1.22-e9c64d7b331228dddf1b7c3d18c88a464896c6d1.zip | |
Merging upstream version 1.22.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | src/cmd/internal/moddeps/moddeps_test.go | 2 | ||||
| -rw-r--r-- | src/cmd/internal/obj/ppc64/obj9.go | 4 |
2 files changed, 2 insertions, 4 deletions
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 == val) { + mask := int64(0xFFFF) << shift + if val&mask == val || (val>>(shift+16) == -1 && (val>>shift)<<shift == val) { // Rewrite this value into MOVD $const>>shift, Rto; SLD $shift, Rto q := obj.Appendp(p, c.newprog) q.As = ASLD |