[pypy-commit] pypy default: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r50858:44b0e2106e2d
Date: 2011-12-25 18:55 +0200
http://bitbucket.org/pypy/pypy/changeset/44b0e2106e2d/

Log:	merge

diff --git a/pypy/jit/metainterp/optimizeopt/unroll.py b/pypy/jit/metainterp/optimizeopt/unroll.py
--- a/pypy/jit/metainterp/optimizeopt/unroll.py
+++ b/pypy/jit/metainterp/optimizeopt/unroll.py
@@ -269,6 +269,8 @@
                 # in case it does, we would prefer to be suboptimal in asm
                 # to a fatal RPython exception.
                 if newresult is not op.result and not newvalue.is_constant():
+                    # XXX fix me?
+                    #self.short_boxes.alias(newresult, op.result)
                     op = ResOperation(rop.SAME_AS, [op.result], newresult)
                     self.optimizer._newoperations = [op] + self.optimizer._newoperations
         self.optimizer.flush()