Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: fast-newarray
Changeset: r63453:992520ae6986
Date: 2013-04-16 14:34 +0200
http://bitbucket.org/pypy/pypy/changeset/992520ae6986/
Log: Fix tests now that we're slightly more pedantic about descrs
diff --git a/rpython/jit/backend/llsupport/test/test_rewrite.py
b/rpython/jit/backend/llsupport/test/test_rewrite.py
--- a/rpython/jit/backend/llsupport/test/test_rewrite.py
+++ b/rpython/jit/backend/llsupport/test/test_rewrite.py
@@ -109,6 +109,8 @@
class BaseFakeCPU(object):
JITFRAME_FIXED_SIZE = 0
+ can_inline_varsize_malloc = True
+
def __init__(self):
self.tracker = FakeTracker()
self._cache = {}
diff --git a/rpython/jit/backend/test/runner_test.py
b/rpython/jit/backend/test/runner_test.py
--- a/rpython/jit/backend/test/runner_test.py
+++ b/rpython/jit/backend/test/runner_test.py
@@ -2833,7 +2833,7 @@
def test_assembler_call_propagate_exc(self):
from rpython.jit.backend.llsupport.llmodel import AbstractLLCPU
-
+
if not isinstance(self.cpu, AbstractLLCPU):
py.test.skip("llgraph can't fake exceptions well enough, give up")
@@ -3477,10 +3477,10 @@
ops = """
[i0]
i1 = int_force_ge_zero(i0) # but forced to be in a register
- finish(i1, descr=1)
+ finish(i1, descr=descr)
"""
+ descr = BasicFinalDescr()
loop = parse(ops, self.cpu, namespace=locals())
- descr = loop.operations[-1].getdescr()
looptoken = JitCellToken()
self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
for inp, outp in [(2,2), (-3, 0)]:
@@ -3493,21 +3493,20 @@
py.test.skip("pointless test on non-asm")
from rpython.jit.backend.tool.viewcode import machine_code_dump
import ctypes
+ targettoken = TargetToken()
ops = """
[i2]
i0 = same_as(i2) # but forced to be in a register
- label(i0, descr=1)
+ label(i0, descr=targettoken)
i1 = int_add(i0, i0)
- guard_true(i1, descr=faildesr) [i1]
- jump(i1, descr=1)
+ guard_true(i1, descr=faildescr) [i1]
+ jump(i1, descr=targettoken)
"""
faildescr = BasicFailDescr(2)
loop = parse(ops, self.cpu, namespace=locals())
- faildescr = loop.operations[-2].getdescr()
- jumpdescr = loop.operations[-1].getdescr()
bridge_ops = """
[i0]
- jump(i0, descr=jumpdescr)
+ jump(i0, descr=targettoken)
"""
bridge = parse(bridge_ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
diff --git a/rpython/jit/metainterp/test/test_logger.py
b/rpython/jit/metainterp/test/test_logger.py
--- a/rpython/jit/metainterp/test/test_logger.py
+++ b/rpython/jit/metainterp/test/test_logger.py
@@ -93,7 +93,7 @@
[p0]
setfield_gc(p0, 3, descr=somedescr)
'''
- Descr()
+ somedescr = Descr()
self.reparse(inp, namespace=locals())
def test_guard(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
