[pypy-svn] r70392 - pypy/branch/virtual-forcing/pypy/jit/metainterp/test
arigo at codespeak.net
arigo at codespeak.net
Sun Jan 3 18:04:52 CET 2010
Author: arigo
Date: Sun Jan 3 18:04:51 2010
New Revision: 70392
Modified:
pypy/branch/virtual-forcing/pypy/jit/metainterp/test/test_optimizefindnode.py
pypy/branch/virtual-forcing/pypy/jit/metainterp/test/test_optimizeopt.py
Log:
More fixes.
Modified: pypy/branch/virtual-forcing/pypy/jit/metainterp/test/test_optimizefindnode.py
==============================================================================
--- pypy/branch/virtual-forcing/pypy/jit/metainterp/test/test_optimizefindnode.py (original)
+++ pypy/branch/virtual-forcing/pypy/jit/metainterp/test/test_optimizefindnode.py Sun Jan 3 18:04:51 2010
@@ -123,7 +123,8 @@
virtualtokendescr = vrefinfo.descr_virtual_token
virtualrefindexdescr = vrefinfo.descr_virtualref_index
virtualforceddescr = vrefinfo.descr_forced
- jvr_vtable_adr = llmemory.cast_ptr_to_adr(vrefinfo.jit_virtual_ref_vtable)
+ jit_virtual_ref_vtable = vrefinfo.jit_virtual_ref_vtable
+ jvr_vtable_adr = llmemory.cast_ptr_to_adr(jit_virtual_ref_vtable)
cpu.class_sizes = {
cpu.cast_adr_to_int(node_vtable_adr): cpu.sizeof(NODE),
Modified: pypy/branch/virtual-forcing/pypy/jit/metainterp/test/test_optimizeopt.py
==============================================================================
--- pypy/branch/virtual-forcing/pypy/jit/metainterp/test/test_optimizeopt.py (original)
+++ pypy/branch/virtual-forcing/pypy/jit/metainterp/test/test_optimizeopt.py Sun Jan 3 18:04:51 2010
@@ -249,7 +249,10 @@
loop.token.specnodes = self.unpack_specnodes(spectext)
#
self.loop = loop
- optimize_loop_1(FakeMetaInterpStaticData(self.cpu), loop)
+ metainterp_sd = FakeMetaInterpStaticData(self.cpu)
+ if hasattr(self, 'vrefinfo'):
+ metainterp_sd.virtualref_info = self.vrefinfo
+ optimize_loop_1(metainterp_sd, loop)
#
expected = self.parse(optops)
self.assert_equal(loop, expected)
More information about the Pypy-commit
mailing list