Author: Armin Rigo <ar...@tunes.org>
Branch: 
Changeset: r80498:dfb609e46b95
Date: 2015-11-02 11:16 +0000
http://bitbucket.org/pypy/pypy/changeset/dfb609e46b95/

Log:    Issue #2180: fix. The problem shows up as missing 'same_as', and
        these places pass for some reason an empty list instead of
        'extra_same_as', so I think this fix has chances to be correct. I
        fail completely at designing the correct tests, though.

diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py 
b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -186,12 +186,12 @@
         except InvalidLoop:
             # inlining short preamble failed, jump to preamble
             self.jump_to_preamble(celltoken, end_jump, info)
-            return (UnrollInfo(target_token, label_op, [],
+            return (UnrollInfo(target_token, label_op, extra_same_as,
                                self.optimizer.quasi_immutable_deps),
                     self.optimizer._newoperations)            
         if new_virtual_state is not None:
             self.jump_to_preamble(celltoken, end_jump, info)
-            return (UnrollInfo(target_token, label_op, [],
+            return (UnrollInfo(target_token, label_op, extra_same_as,
                                self.optimizer.quasi_immutable_deps),
                     self.optimizer._newoperations)
 
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to