[pypy-svn] r69469 - in pypy/branch/compress-virtuals-resumedata/pypy/jit/metainterp: . test

cfbolz at codespeak.net cfbolz at codespeak.net
Fri Nov 20 15:29:47 CET 2009


Author: cfbolz
Date: Fri Nov 20 15:29:46 2009
New Revision: 69469

Modified:
   pypy/branch/compress-virtuals-resumedata/pypy/jit/metainterp/resume.py
   pypy/branch/compress-virtuals-resumedata/pypy/jit/metainterp/test/test_virtual.py
Log:
(pedronis, cfbolz): kill the test again, it was not helping. conservatively clear caches when we force.


Modified: pypy/branch/compress-virtuals-resumedata/pypy/jit/metainterp/resume.py
==============================================================================
--- pypy/branch/compress-virtuals-resumedata/pypy/jit/metainterp/resume.py	(original)
+++ pypy/branch/compress-virtuals-resumedata/pypy/jit/metainterp/resume.py	Fri Nov 20 15:29:46 2009
@@ -191,7 +191,7 @@
     def forget_numberings(self, virtualbox):
         # XXX ideally clear only the affected numberings
         self.numberings.clear()
-        # XXX clear cached_*
+        self.clear_box_virtual_numbers()
 
     # caching for virtuals and boxes inside them
 

Modified: pypy/branch/compress-virtuals-resumedata/pypy/jit/metainterp/test/test_virtual.py
==============================================================================
--- pypy/branch/compress-virtuals-resumedata/pypy/jit/metainterp/test/test_virtual.py	(original)
+++ pypy/branch/compress-virtuals-resumedata/pypy/jit/metainterp/test/test_virtual.py	Fri Nov 20 15:29:46 2009
@@ -329,33 +329,6 @@
             return 0
         self.meta_interp(f, [50])
 
-    def test_guards_around_forcing_of_virtual_in_virtual(self):
-        class A(object):
-            def __init__(self, x):
-                self.x = x
-        mydriver = JitDriver(reds = ['n'], greens = [])
-        global_a = A(0)
-
-        def g(b):
-            n = b.x
-            if n < 10:
-                n += 1
-            global_a.forced = b.next
-            if n < 20:
-                assert global_a.forced is b.next
-
-        def f(n):
-            while n > 0:
-                mydriver.can_enter_jit(n=n)
-                mydriver.jit_merge_point(n=n)
-                a = A(n)
-                b = A(n)
-                b.next = a
-                g(b)
-                n -= 1
-            return 0
-        self.meta_interp(f, [50])
-
 # ____________________________________________________________
 # Run 1: all the tests instantiate a real RPython class
 



More information about the Pypy-commit mailing list