[pypy-svn] r69040 - in pypy/branch/jit-less-inlining/pypy/jit/metainterp: . test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Fri Nov  6 16:51:18 2009
New Revision: 69040

Modified:
   pypy/branch/jit-less-inlining/pypy/jit/metainterp/test/test_warmstate.py
   pypy/branch/jit-less-inlining/pypy/jit/metainterp/warmspot.py
Log:
(cfbolz, antocuni): fix some more tests


Modified: pypy/branch/jit-less-inlining/pypy/jit/metainterp/test/test_warmstate.py
==============================================================================
--- pypy/branch/jit-less-inlining/pypy/jit/metainterp/test/test_warmstate.py	(original)
+++ pypy/branch/jit-less-inlining/pypy/jit/metainterp/test/test_warmstate.py	Fri Nov  6 16:51:18 2009
@@ -165,7 +165,13 @@
     class FakeWarmRunnerDesc:
         can_inline_ptr = None
         get_printable_location_ptr = None
+        green_args_spec = [lltype.Signed, lltype.Float]
+    class FakeCell:
+        dont_trace_here = False
     state = WarmEnterState(FakeWarmRunnerDesc())
+    def jit_getter(*args):
+        return FakeCell()
+    state.jit_getter = jit_getter
     state.make_jitdriver_callbacks()
     res = state.can_inline_callable([BoxInt(5), BoxFloat(42.5)])
     assert res is True
@@ -179,12 +185,17 @@
         return False
     CAN_INLINE = lltype.Ptr(lltype.FuncType([lltype.Signed, lltype.Float],
                                             lltype.Bool))
+    class FakeCell:
+        dont_trace_here = False
     class FakeWarmRunnerDesc:
         rtyper = None
         green_args_spec = [lltype.Signed, lltype.Float]
         can_inline_ptr = llhelper(CAN_INLINE, can_inline)
         get_printable_location_ptr = None
     state = WarmEnterState(FakeWarmRunnerDesc())
+    def jit_getter(*args):
+        return FakeCell()
+    state.jit_getter = jit_getter
     state.make_jitdriver_callbacks()
     res = state.can_inline_callable([BoxInt(5), BoxFloat(42.5)])
     assert res is False

Modified: pypy/branch/jit-less-inlining/pypy/jit/metainterp/warmspot.py
==============================================================================
--- pypy/branch/jit-less-inlining/pypy/jit/metainterp/warmspot.py	(original)
+++ pypy/branch/jit-less-inlining/pypy/jit/metainterp/warmspot.py	Fri Nov  6 16:51:18 2009
@@ -161,13 +161,13 @@
 
         self.build_meta_interp(CPUClass, **kwds)
         self.make_args_specification()
+        if self.jitdriver.virtualizables:
+            from pypy.jit.metainterp.virtualizable import VirtualizableInfo
+            self.metainterp_sd.virtualizable_info = VirtualizableInfo(self)
         self.make_exception_classes()
         self.make_driverhook_graphs()
         self.make_enter_function()
         self.rewrite_jit_merge_point(policy)
-        if self.jitdriver.virtualizables:
-            from pypy.jit.metainterp.virtualizable import VirtualizableInfo
-            self.metainterp_sd.virtualizable_info = VirtualizableInfo(self)
                 
         self.codewriter.generate_bytecode(self.metainterp_sd,
                                           self.portal_graph,