diff options
Diffstat (limited to 'dev-python/pypy3-exe/files')
| -rw-r--r-- | dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch | 64 | ||||
| -rw-r--r-- | dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch | 61 |
2 files changed, 125 insertions, 0 deletions
diff --git a/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch b/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch new file mode 100644 index 000000000000..c143a3765cdf --- /dev/null +++ b/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch @@ -0,0 +1,64 @@ +From 913e0dae8ac7ce8219a5f31126fee8a794cc314c Mon Sep 17 00:00:00 2001 +From: Armin Rigo <arigo@tunes.org> +Date: Sat, 26 Sep 2020 09:26:24 +0200 +Subject: [PATCH] oops, fix for test_gc_indexed_box_plus_large_offset + +--- + rpython/jit/backend/ppc/opassembler.py | 16 +++++++++++----- + rpython/jit/backend/ppc/regalloc.py | 4 ++-- + 2 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/rpython/jit/backend/ppc/opassembler.py b/rpython/jit/backend/ppc/opassembler.py +index b79b18e530..4bbfbba93a 100644 +--- a/rpython/jit/backend/ppc/opassembler.py ++++ b/rpython/jit/backend/ppc/opassembler.py +@@ -755,13 +755,19 @@ class FieldOpAssembler(object): + def _apply_offset(self, index_loc, ofs_loc): + # If offset != 0 then we have to add it here. Note that + # mc.addi() would not be valid with operand r0. +- assert ofs_loc.is_imm() # must be an immediate... +- assert _check_imm_arg(ofs_loc.getint()) # ...that fits 16 bits + assert index_loc.is_core_reg() + assert index_loc is not r.SCRATCH2 +- # (simplified version of _apply_scale()) +- if ofs_loc.value > 0: +- self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value) ++ if ofs_loc.is_imm(): ++ # if it is an immediate, it must fit into 16 bits ++ assert _check_imm_arg(ofs_loc.getint()) ++ # (simplified version of _apply_scale()) ++ if ofs_loc.value != 0: ++ self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value) ++ index_loc = r.SCRATCH2 ++ else: ++ # larger immediates are loaded into a register in regalloc.py ++ assert ofs_loc.is_core_reg() ++ self.mc.add(r.SCRATCH2.value, index_loc.value, ofs_loc.value) + index_loc = r.SCRATCH2 + return index_loc + +diff --git a/rpython/jit/backend/ppc/regalloc.py b/rpython/jit/backend/ppc/regalloc.py +index f3ee1129e4..827953cf12 100644 +--- a/rpython/jit/backend/ppc/regalloc.py ++++ b/rpython/jit/backend/ppc/regalloc.py +@@ -771,7 +771,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc): + value_loc = self.ensure_reg(op.getarg(2)) + assert op.getarg(3).getint() == 1 # scale + ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(4)) +- assert ofs_loc.is_imm() # the arg(4) should always be a small constant ++ # the arg(4) is often a small constant, but it may be too large + size_loc = self.ensure_reg_or_any_imm(op.getarg(5)) + return [base_loc, index_loc, value_loc, ofs_loc, size_loc] + +@@ -780,7 +780,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc): + index_loc = self.ensure_reg(op.getarg(1)) + assert op.getarg(2).getint() == 1 # scale + ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(3)) +- assert ofs_loc.is_imm() # the arg(3) should always be a small constant ++ # the arg(3) is often a small constant, but it may be too large + self.free_op_vars() + res_loc = self.force_allocate_reg(op) + size_box = op.getarg(4) +-- +GitLab + diff --git a/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch b/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch new file mode 100644 index 000000000000..68025600b1f5 --- /dev/null +++ b/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch @@ -0,0 +1,61 @@ +From 5ee2925459372a8af805e952f433acd75e426325 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Sun, 4 Oct 2020 15:46:23 +0200 +Subject: [PATCH] Fix sethostname() failure when passed bytes + +My implementation of sethostname() was broken and failed when passed +bytes on Python 3. Update the implementation to match CPython -- that +is, use bytes if provided, or fsencode() when str is provided. + +--HG-- +branch : py3.6 +--- + pypy/module/_socket/interp_func.py | 8 +++++++- + pypy/module/_socket/test/test_sock_app.py | 12 ++++++++++++ + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/pypy/module/_socket/interp_func.py b/pypy/module/_socket/interp_func.py +index bdc4f1293f..1727e51d51 100644 +--- a/pypy/module/_socket/interp_func.py ++++ b/pypy/module/_socket/interp_func.py +@@ -392,7 +392,13 @@ if hasattr(rsocket, 'sethostname'): + + Set the host name. + """ +- hostname = space.text_w(w_hostname) ++ if space.isinstance_w(w_hostname, space.w_bytes): ++ hostname = space.bytes_w(w_hostname) ++ elif space.isinstance_w(w_hostname, space.w_unicode): ++ hostname = space.fsencode_w(w_hostname) ++ else: ++ raise oefmt(space.w_TypeError, ++ "sethostname() argument 1 must be str or bytes") + try: + res = rsocket.sethostname(hostname) + except SocketError as e: +diff --git a/pypy/module/_socket/test/test_sock_app.py b/pypy/module/_socket/test/test_sock_app.py +index fe3efec8e3..355fb8a2a9 100644 +--- a/pypy/module/_socket/test/test_sock_app.py ++++ b/pypy/module/_socket/test/test_sock_app.py +@@ -210,6 +210,18 @@ def test_getaddrinfo(space, w_socket): + assert space.unwrap(w_l) == True + + ++def test_sethostname(space, w_socket): ++ space.raises_w(space.w_OSError, space.appexec, ++ [w_socket], ++ "(_socket): _socket.sethostname(_socket.gethostname())") ++ ++ ++def test_sethostname_bytes(space, w_socket): ++ space.raises_w(space.w_OSError, space.appexec, ++ [w_socket], ++ "(_socket): _socket.sethostname(_socket.gethostname().encode())") ++ ++ + def test_unknown_addr_as_object(space, ): + from pypy.module._socket.interp_socket import addr_as_object + c_addr = lltype.malloc(rsocket._c.sockaddr, flavor='raw', track_allocation=False) +-- +GitLab + |