[pypy-svn] r66605 - pypy/branch/pyjitpl5/pypy/jit/metainterp/test

[arigo at codespeak.net]

Author: arigo
Date: Fri Jul 24 18:16:35 2009
New Revision: 66605

Added:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_basic.py.merge.tmp
      - copied, changed from r66600, pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_basic.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/test/test_basic.py
revisions 66237 to 66600:

    ------------------------------------------------------------------------
    r66562 | arigo | 2009-07-23 22:19:08 +0200 (Thu, 23 Jul 2009) | 3 lines
    
    Link optimize.py with the rest of the code.
    Still some failures to investigate.
    
    ------------------------------------------------------------------------
    r66241 | arigo | 2009-07-15 18:36:01 +0200 (Wed, 15 Jul 2009) | 4 lines
    
    A branch in which to attempt refactoring of optimize4
    to take optimize3's idea of separating InstanceNodes and
    InstanceValues.
    
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_basic.py.merge.tmp (from r66600, pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_basic.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_basic.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_basic.py.merge.tmp	Fri Jul 24 18:16:35 2009
@@ -75,6 +75,7 @@
             graph_key, called_from = cw.unfinished_graphs.pop()
             cw.make_one_bytecode(graph_key, False, called_from)
         metainterp.staticdata.portal_code = maingraph
+        metainterp.staticdata._class_sizes = cw.class_sizes
         metainterp.staticdata.state = FakeWarmRunnerDesc()
         metainterp.staticdata.DoneWithThisFrameInt = DoneWithThisFrame
         metainterp.staticdata.DoneWithThisFramePtr = DoneWithThisFrame