[pypy-commit] pypy jitypes2: fix some tests broken by the merge

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: jitypes2
Changeset: r44728:0639234676d2
Date: 2011-06-03 18:47 +0200
http://bitbucket.org/pypy/pypy/changeset/0639234676d2/

Log:	fix some tests broken by the merge

diff --git a/pypy/jit/metainterp/optimizeopt/fficall.py b/pypy/jit/metainterp/optimizeopt/fficall.py
--- a/pypy/jit/metainterp/optimizeopt/fficall.py
+++ b/pypy/jit/metainterp/optimizeopt/fficall.py
@@ -104,7 +104,7 @@
         # we immediately set funcinfo to None to prevent recursion when
         # calling emit_op
         if self.logops is not None:
-            debug_print('rollback: ' + msg + ': ', self.logops.repr_of_op(op))
+            debug_print('rollback: ' + msg + ': ', self.logops.repr_of_resop(op))
         funcinfo = self.funcinfo
         self.funcinfo = None
         self.emit_operation(funcinfo.prepare_op)
@@ -202,7 +202,7 @@
 
     def propagate_forward(self, op):
         if self.logops is not None:
-            debug_print(self.logops.repr_of_op(op))
+            debug_print(self.logops.repr_of_resop(op))
         opnum = op.getopnum()
         for value, func in optimize_ops:
             if opnum == value:
diff --git a/pypy/jit/metainterp/test/test_compile.py b/pypy/jit/metainterp/test/test_compile.py
--- a/pypy/jit/metainterp/test/test_compile.py
+++ b/pypy/jit/metainterp/test/test_compile.py
@@ -37,7 +37,7 @@
     def log_loop(self, inputargs, operations, number=0, type=None, ops_offset=None):
         pass
 
-    def repr_of_op(self, op):
+    def repr_of_resop(self, op):
         return repr(op)
 
 class FakeState(object):