[pypy-svn] r69067 - pypy/branch/merge-guards/pypy/jit/metainterp/test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sun Nov  8 16:32:41 2009
New Revision: 69067

Modified:
   pypy/branch/merge-guards/pypy/jit/metainterp/test/test_basic.py
Log:
(arigo around, cfbolz): a more functional test for the last commit


Modified: pypy/branch/merge-guards/pypy/jit/metainterp/test/test_basic.py
==============================================================================
--- pypy/branch/merge-guards/pypy/jit/metainterp/test/test_basic.py	(original)
+++ pypy/branch/merge-guards/pypy/jit/metainterp/test/test_basic.py	Sun Nov  8 16:32:41 2009
@@ -1163,5 +1163,33 @@
         res = self.meta_interp(f, [20], listops=True)
         self.check_loops(getfield_gc=2, getarrayitem_gc=1)
 
+    def test_merge_guardclass_guardvalue(self):
+        from pypy.rlib.objectmodel import instantiate
+        myjitdriver = JitDriver(greens = [], reds = ['x', 'l'])
+
+        class A(object):
+            def g(self, x):
+                return x - 1
+        class B(A):
+            def g(self, y):
+                return y - 2
+
+        a1 = A()
+        a2 = A()
+        b = B()
+        def f(x):
+            l = [a1] * 100 + [a2] * 100 + [b] * 100
+            while x > 0:
+                myjitdriver.can_enter_jit(x=x, l=l)
+                myjitdriver.jit_merge_point(x=x, l=l)
+                a = l[x]
+                x = a.g(x)
+                hint(a, promote=True)
+            return x
+        res = self.meta_interp(f, [299], listops=True)
+        self.check_loops(guard_class=0, guard_value=3)
+
+
+
 class TestLLtype(BaseLLtypeTests, LLJitMixin):
     pass