[pypy-commit] pypy default: disable the optimization until we find a better way

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r58538:c7efa45ae2a5
Date: 2012-10-28 18:38 +0100
http://bitbucket.org/pypy/pypy/changeset/c7efa45ae2a5/

Log:	disable the optimization until we find a better way

diff --git a/pypy/jit/metainterp/optimizeopt/rewrite.py b/pypy/jit/metainterp/optimizeopt/rewrite.py
--- a/pypy/jit/metainterp/optimizeopt/rewrite.py
+++ b/pypy/jit/metainterp/optimizeopt/rewrite.py
@@ -431,15 +431,16 @@
         length = self.get_constant_box(op.getarg(5))
         if (source_start_box and dest_start_box
             and length and (dest_value.is_virtual() or length.getint() <= 8) and
-            (source_value.is_virtual() or length.getint() <= 8)):
+            (source_value.is_virtual())): # or length.getint() <= 8)):
             from pypy.jit.metainterp.optimizeopt.virtualize import VArrayValue
             source_start = source_start_box.getint()
             dest_start = dest_start_box.getint()
             for index in range(length.getint()):
                 # XXX fish fish fish
-                arraydescr = op.getdescr().get_extra_info().write_descrs_arrays[0]
+                #arraydescr = op.getdescr().get_extra_info().write_descrs_arrays[0]
+                assert isinstance(source_value, VArrayValue)
+                arraydescr = source_value.arraydescr
                 if source_value.is_virtual():
-                    assert isinstance(source_value, VArrayValue)
                     val = source_value.getitem(index + source_start)
                 else:
                     if arraydescr.is_array_of_pointers():