[pypy-commit] pypy conditional_call_value_2: Fix

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: conditional_call_value_2
Changeset: r86995:f3ea6663fd04
Date: 2016-09-11 11:58 +0200
http://bitbucket.org/pypy/pypy/changeset/f3ea6663fd04/

Log:	Fix

diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
@@ -7592,7 +7592,7 @@
         ops = """
         [i0]
         p1 = new_with_vtable(descr=nodesize)
-        cond_call_n(1, 1, 123, p1, descr=clear_vable)
+        cond_call_n(i0, 1, 123, p1, descr=clear_vable)
         jump(i0)
         """
         expected = """
diff --git a/rpython/jit/metainterp/optimizeopt/virtualize.py b/rpython/jit/metainterp/optimizeopt/virtualize.py
--- a/rpython/jit/metainterp/optimizeopt/virtualize.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualize.py
@@ -94,11 +94,11 @@
     optimize_CALL_MAY_FORCE_F = optimize_CALL_MAY_FORCE_I
     optimize_CALL_MAY_FORCE_N = optimize_CALL_MAY_FORCE_I
 
-    def XXXoptimize_COND_CALL(self, op):
+    def optimize_COND_CALL_N(self, op):
         effectinfo = op.getdescr().get_extra_info()
         oopspecindex = effectinfo.oopspecindex
         if oopspecindex == EffectInfo.OS_JIT_FORCE_VIRTUALIZABLE:
-            opinfo = self.getptrinfo(op.getarg(2))
+            opinfo = self.getptrinfo(op.getarg(3))
             if opinfo and opinfo.is_virtual():
                 return
         self.emit_operation(op)
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -904,7 +904,7 @@
                                        history.CONST_NULL)
         funcbox = ConstInt(rffi.cast(lltype.Signed, vinfo.clear_vable_ptr))
         calldescr = vinfo.clear_vable_descr
-        self.execute_varargs(rop.COND_CALL_I, [condbox, history.CONST_TRUE,
+        self.execute_varargs(rop.COND_CALL_N, [condbox, history.CONST_TRUE,
                                                funcbox, box],
                              calldescr, False, False)