[pypy-commit] pypy force-virtual-state: Explicitly pass force_boxes arg in all cases (suggested by cfbolz)

[sbauman]

Author: Spenser Andrew Bauman <sabauma at gmail.com>
Branch: force-virtual-state
Changeset: r86884:3ae2ff6dceac
Date: 2016-09-05 11:18 -0400
http://bitbucket.org/pypy/pypy/changeset/3ae2ff6dceac/

Log:	Explicitly pass force_boxes arg in all cases (suggested by cfbolz)

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
@@ -184,8 +184,8 @@
                     self.optimizer._newoperations)
 
         try:
-            new_virtual_state = self.jump_to_existing_trace(end_jump, label_op,
-                                                            state.runtime_boxes)
+            new_virtual_state = self.jump_to_existing_trace(
+                    end_jump, label_op, state.runtime_boxes force_boxes=False)
         except InvalidLoop:
             # inlining short preamble failed, jump to preamble
             self.jump_to_preamble(celltoken, end_jump, info)
@@ -252,7 +252,8 @@
         for a in jump_op.getarglist():
             self.optimizer.force_box_for_end_of_preamble(a)
         try:
-            vs = self.jump_to_existing_trace(jump_op, None, runtime_boxes, False)
+            vs = self.jump_to_existing_trace(jump_op, None, runtime_boxes,
+                                             force_boxes=False)
         except InvalidLoop:
             return self.jump_to_preamble(cell_token, jump_op, info)
         if vs is None:
@@ -265,7 +266,8 @@
         else:
             # Try forcing boxes to avoid jumping to the preamble
             try:
-                vs = self.jump_to_existing_trace(jump_op, None, runtime_boxes, True)
+                vs = self.jump_to_existing_trace(jump_op, None, runtime_boxes,
+                                                 force_boxes=True)
             except InvalidLoop:
                 pass
             if vs is None: