Author: Maciej Fijalkowski <[email protected]>
Branch: vmprof
Changeset: r75798:7af23468be1c
Date: 2015-02-10 14:51 +0200
http://bitbucket.org/pypy/pypy/changeset/7af23468be1c/
Log: fix the tests
diff --git a/rpython/jit/backend/llsupport/codemap.py
b/rpython/jit/backend/llsupport/codemap.py
--- a/rpython/jit/backend/llsupport/codemap.py
+++ b/rpython/jit/backend/llsupport/codemap.py
@@ -21,10 +21,10 @@
def stack_depth_at_loc(loc):
_memmngr = asmmemmgr._memmngr
- pos = bisect(_memmngr.jit_addr_map, loc)
+ pos = bisect(_memmngr.jit_addr_map, loc + 1)
if pos == 0 or pos == len(_memmngr.jit_addr_map):
return -1
- return _memmngr.jit_frame_depth_map[pos-1]
+ return _memmngr.jit_frame_depth_map[pos - 1]
@jit_entrypoint([], lltype.Signed, c_name='pypy_jit_start_addr')
def jit_start_addr():
@@ -76,7 +76,8 @@
def unpack_traceback(addr):
codemap_pos = find_codemap_at_addr(addr)
- assert codemap_pos >= 0
+ if codemap_pos == -1:
+ return [] # no codemap for that position
storage = lltype.malloc(rffi.CArray(lltype.Signed), 1, flavor='raw')
storage[0] = 0
res = []
diff --git a/rpython/jit/backend/llsupport/test/test_asmmemmgr.py
b/rpython/jit/backend/llsupport/test/test_asmmemmgr.py
--- a/rpython/jit/backend/llsupport/test/test_asmmemmgr.py
+++ b/rpython/jit/backend/llsupport/test/test_asmmemmgr.py
@@ -3,6 +3,7 @@
from rpython.jit.backend.llsupport.asmmemmgr import MachineDataBlockWrapper
from rpython.jit.backend.llsupport.asmmemmgr import BlockBuilderMixin
from rpython.jit.backend.llsupport import asmmemmgr
+from rpython.jit.backend.llsupport.codemap import stack_depth_at_loc
from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.rlib import debug
@@ -271,9 +272,9 @@
mgr.register_frame_depth_map(30, [0, 5, 10], [4, 5, 6])
mgr.register_frame_depth_map(0, [0, 5, 10], [7, 8, 9])
asmmemmgr._memmngr = mgr
- assert asmmemmgr.stack_depth_at_loc(13) == 1
- assert asmmemmgr.stack_depth_at_loc(-3) == -1
- assert asmmemmgr.stack_depth_at_loc(41) == -1
- assert asmmemmgr.stack_depth_at_loc(5) == 8
- assert asmmemmgr.stack_depth_at_loc(17) == 2
- assert asmmemmgr.stack_depth_at_loc(38) == 5
+ assert stack_depth_at_loc(13) == 1
+ assert stack_depth_at_loc(-3) == -1
+ assert stack_depth_at_loc(41) == -1
+ assert stack_depth_at_loc(5) == 8
+ assert stack_depth_at_loc(17) == 2
+ assert stack_depth_at_loc(38) == 5
diff --git a/rpython/jit/backend/llsupport/test/test_gc.py
b/rpython/jit/backend/llsupport/test/test_gc.py
--- a/rpython/jit/backend/llsupport/test/test_gc.py
+++ b/rpython/jit/backend/llsupport/test/test_gc.py
@@ -197,14 +197,6 @@
assert is_valid_int(wbdescr.jit_wb_if_flag_byteofs)
assert is_valid_int(wbdescr.jit_wb_if_flag_singlebyte)
- def test_get_rid_of_debug_merge_point(self):
- operations = [
- ResOperation(rop.DEBUG_MERGE_POINT, ['dummy', 2], None),
- ]
- gc_ll_descr = self.gc_ll_descr
- operations = gc_ll_descr.rewrite_assembler(None, operations, [])
- assert len(operations) == 0
-
def test_record_constptrs(self):
class MyFakeCPU(object):
def cast_adr_to_int(self, adr):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
