[pypy-svn] r61863 - in pypy/branch/pyjitpl5/pypy/jit/metainterp: . test

[fijal at codespeak.net]

Author: fijal
Date: Sat Feb 14 01:02:15 2009
New Revision: 61863

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_vable_optimize.py
Log:
Oops, fix the test.
As of now, test_tl and test_tlc does not work (for obscure reasons), but
everything else works. We need more tests about lazy things


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py	Sat Feb 14 01:02:15 2009
@@ -380,7 +380,7 @@
                     rev_boxes[fieldbox] = len(liveboxes)
                     liveboxes.append(fieldbox)
                 fieldindex = ~rev_boxes[fieldbox]
-                if isinstance(node.cls.source, ListDescr):
+                if node.cls is not None and isinstance(node.cls.source, ListDescr):
                     f = node.cls.source.setfunc
                     storage.setitems.append((f, index, ofs, fieldindex))
                 else:

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_vable_optimize.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_vable_optimize.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_vable_optimize.py	Sat Feb 14 01:02:15 2009
@@ -1,3 +1,5 @@
+import py
+
 from pypy.rpython.lltypesystem import lltype, rclass, llmemory
 from pypy.rpython.lltypesystem.rvirtualizable2 import VABLERTIPTR
 from pypy.rpython.lltypesystem.rvirtualizable2 import VirtualizableAccessor
@@ -192,7 +194,7 @@
     assert isinstance(spec.specnodes[0], VirtualizableSpecNode)
     assert len(spec.specnodes[0].fields) == 1
     assert spec.specnodes[0].fields[0][0] == C.ofs_node
-    assert isinstance(spec.specnodes[0].fields[0][1], NotSpecNode)
+    assert isinstance(spec.specnodes[0].fields[0][1], VirtualInstanceSpecNode)
 
 
 # ____________________________________________________________
@@ -220,7 +222,7 @@
     ops[1].vdesc = xy_desc
 
 def test_D_intersect_input_and_output():
-    py.test.skip("not yet")
+    py.test.skip("XXX")
     spec = PerfectSpecializer(Loop(D.ops))
     spec.find_nodes()
     spec.intersect_input_and_output()