Author: Armin Rigo <[email protected]>
Branch: release-2.1.x
Changeset: r66045:7adac6b730fd
Date: 2013-08-09 18:58 +0200
http://bitbucket.org/pypy/pypy/changeset/7adac6b730fd/
Log: Manually merge the fix '06f78c70c495'.
diff --git a/rpython/jit/backend/llsupport/llmodel.py
b/rpython/jit/backend/llsupport/llmodel.py
--- a/rpython/jit/backend/llsupport/llmodel.py
+++ b/rpython/jit/backend/llsupport/llmodel.py
@@ -723,12 +723,8 @@
def bh_raw_load_i(self, addr, offset, descr):
ofs, size, sign = self.unpack_arraydescr_size(descr)
- items = addr + offset
- for TYPE, _, itemsize in unroll_basic_sizes:
- if size == itemsize:
- items = rffi.cast(rffi.CArrayPtr(TYPE), items)
- return rffi.cast(lltype.Signed, items[0])
- assert False # unreachable code
+ assert ofs == 0 # otherwise, 'descr' is not a raw length-less array
+ return self.read_int_at_mem(addr, offset, size, sign)
def bh_raw_load_f(self, addr, offset, descr):
items = rffi.cast(rffi.CArrayPtr(longlong.FLOATSTORAGE), addr + offset)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
