[pypy-commit] pypy default: Fix for the previous test, and probably for issue #1578.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r66041:06f78c70c495
Date: 2013-08-09 17:56 +0200
http://bitbucket.org/pypy/pypy/changeset/06f78c70c495/

Log:	Fix for the previous test, and probably for issue #1578.

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
@@ -721,12 +721,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)