Author: Alex Gaynor <[email protected]>
Branch: virtualref-virtualizable
Changeset: r63332:bf771453745d
Date: 2013-04-13 18:24 -0700
http://bitbucket.org/pypy/pypy/changeset/bf771453745d/
Log: fix test
diff --git a/rpython/jit/codewriter/jtransform.py
b/rpython/jit/codewriter/jtransform.py
--- a/rpython/jit/codewriter/jtransform.py
+++ b/rpython/jit/codewriter/jtransform.py
@@ -1753,7 +1753,12 @@
return SpaceOperation('libffi_save_result_%s' % kind, op.args[1:],
None)
def rewrite_op_jit_force_virtual(self, op):
- return [SpaceOperation('-live-', [], None)] + self._do_builtin_call(op)
+ op0 = SpaceOperation('-live-', [], None)
+ op1 = self._do_builtin_call(op)
+ if isinstance(op, list):
+ return [op0] + op1
+ else:
+ return [op0, op1]
def rewrite_op_jit_is_virtual(self, op):
raise Exception("'vref.virtual' should not be used from jit-visible
code")
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
@@ -689,6 +689,7 @@
self.encoding_test(f, [], """
new_with_vtable <Descr> -> %r0
virtual_ref %r0 -> %r1
+ -live-
residual_call_r_r $<* fn jit_force_virtual>, R[%r1], <Descr> -> %r2
ref_return %r2
""", transform=True, cc=FakeCallControlWithVRefInfo())
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
