Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: string-promote-2
Changeset: r47931:846724c06889
Date: 2011-10-09 22:37 +0200
http://bitbucket.org/pypy/pypy/changeset/846724c06889/
Log: adapt to interfaces
diff --git a/pypy/jit/codewriter/jtransform.py
b/pypy/jit/codewriter/jtransform.py
--- a/pypy/jit/codewriter/jtransform.py
+++ b/pypy/jit/codewriter/jtransform.py
@@ -464,8 +464,8 @@
[S, S],
lltype.Signed,
EffectInfo.EF_ELIDABLE_CANNOT_RAISE)
- descr = self.callcontrol.callinfo_for_oopspec(
- EffectInfo.OS_STREQ_NONNULL)
+ descr = self.callcontrol.callinfocollection.callinfo_for_oopspec(
+ EffectInfo.OS_STREQ_NONNULL)[0]
op1 = SpaceOperation('str_guard_value', [op.args[0], descr],
op.result)
return op1
diff --git a/pypy/jit/codewriter/test/test_jtransform.py
b/pypy/jit/codewriter/test/test_jtransform.py
--- a/pypy/jit/codewriter/test/test_jtransform.py
+++ b/pypy/jit/codewriter/test/test_jtransform.py
@@ -99,6 +99,9 @@
if i == oopspecindex:
return True
return False
+ def callinfo_for_oopspec(self, oopspecindex):
+ assert oopspecindex == effectinfo.EffectInfo.OS_STREQ_NONNULL
+ return ('calldescr', None)
class FakeBuiltinCallControl:
def __init__(self):
@@ -141,9 +144,6 @@
return 'calldescr-%d' % oopspecindex
def calldescr_canraise(self, calldescr):
return False
- def callinfo_for_oopspec(self, oopspecindex):
- assert oopspecindex == effectinfo.EffectInfo.OS_STREQ_NONNULL
- return 'calldescr'
def test_optimize_goto_if_not():
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
