Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: fast-slowpath
Changeset: r65709:4f3394996060
Date: 2013-07-27 14:48 +0200
http://bitbucket.org/pypy/pypy/changeset/4f3394996060/
Log: fix test flatten
diff --git a/rpython/jit/codewriter/test/test_flatten.py
b/rpython/jit/codewriter/test/test_flatten.py
--- a/rpython/jit/codewriter/test/test_flatten.py
+++ b/rpython/jit/codewriter/test/test_flatten.py
@@ -4,6 +4,7 @@
from rpython.jit.codewriter.flatten import GraphFlattener, ListOfKind, Register
from rpython.jit.codewriter.format import assert_format
from rpython.jit.codewriter import longlong
+from rpython.jit.codewriter.effectinfo import EffectInfo
from rpython.jit.metainterp.history import AbstractDescr
from rpython.rtyper.lltypesystem import lltype, rclass, rstr, rffi
from rpython.flowspace.model import SpaceOperation, Variable, Constant
@@ -71,8 +72,8 @@
callinfocollection = FakeCallInfoCollection()
def guess_call_kind(self, op):
return 'residual'
- def getcalldescr(self, op, oopspecindex=None, extraeffect=None,
- extradescrs=None):
+ def getcalldescr(self, op, oopspecindex=EffectInfo.OS_NONE,
+ extraeffect=None, extradescrs=None):
try:
name = op.args[0].value._obj._name
if 'cannot_raise' in name or name.startswith('cast_'):
@@ -81,7 +82,7 @@
pass
return FakeDescr(oopspecindex)
def calldescr_canraise(self, calldescr):
- return calldescr is not self._descr_cannot_raise and
calldescr.oopspecindex is None
+ return calldescr is not self._descr_cannot_raise and
calldescr.oopspecindex == EffectInfo.OS_NONE
def get_vinfo(self, VTYPEPTR):
return None
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
