[pypy-svn] r53236 - in pypy/branch/jit-hotpath/pypy/jit: rainbow/test timeshifter

[antocuni at codespeak.net]

Author: antocuni
Date: Tue Apr  1 19:35:28 2008
New Revision: 53236

Modified:
   pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_vlist.py
   pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py
Log:
two more test pass



Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_vlist.py
==============================================================================
--- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_vlist.py	(original)
+++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_vlist.py	Tue Apr  1 19:35:28 2008
@@ -189,17 +189,12 @@
         assert res == -7
 
 
-class TestLLType(VListTest):
-    type_system = "lltype"
-
 class TestOOType(VListTest):
     type_system = "ootype"
 
     def _skip(self):
         py.test.skip('in progress')
 
-    test_merge = _skip
-    test_replace = _skip
     test_force = _skip
     test_oop_vlist = _skip
     test_alloc_and_set = _skip
@@ -207,3 +202,7 @@
     test_frozen_list = _skip
     test_frozen_list_indexerror = _skip
     test_bogus_index_while_compiling = _skip
+
+
+class TestLLType(VListTest):
+    type_system = "lltype"

Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py
==============================================================================
--- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py	(original)
+++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py	Tue Apr  1 19:35:28 2008
@@ -662,7 +662,7 @@
 class FrozenPtrVirtual(FrozenValue):
 
     def exactmatch(self, box, outgoingvarboxes, memo):
-        assert isinstance(box, PtrRedBox)
+        assert isinstance(box, AbstractPtrRedBox)
         if box.genvar:
             # XXX should we consider self.access_info here too?
             raise DontMerge
@@ -695,7 +695,7 @@
 PtrRedBox.FrozenPtrVar = FrozenPtrVar
 PtrRedBox.FrozenPtrVarWithPartialData = FrozenPtrVarWithPartialData
 
-InstanceRedBox.FrozenPtrVirtual = None
+InstanceRedBox.FrozenPtrVirtual = FrozenPtrVirtual
 InstanceRedBox.FrozenPtrConst = FrozenInstanceConst
 InstanceRedBox.FrozenPtrVar = FrozenInstanceVar
 InstanceRedBox.FrozenPtrVarWithPartialData = None