[pypy-commit] pypy optresult-unroll: call flush from propagate_all_forward

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult-unroll
Changeset: r78544:3319421c0bf3
Date: 2015-07-13 09:33 +0200
http://bitbucket.org/pypy/pypy/changeset/3319421c0bf3/

Log:	call flush from propagate_all_forward

diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -464,6 +464,7 @@
         #self.loop.operations = self.get_newoperations()
         #self.loop.quasi_immutable_deps = self.quasi_immutable_deps
         # accumulate counters
+        self.flush()
         self.resumedata_memo.update_counters(self.metainterp_sd.profiler)
         return BasicLoopInfo(newargs), self._newoperations
 
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
@@ -98,7 +98,6 @@
         self._check_no_forwarding([[start_label, end_label], ops])
         info, newops = self.optimizer.propagate_all_forward(
             start_label.getarglist()[:], ops)
-        self.optimizer.flush()
         exported_state = self.export_state(start_label, end_label,
                                            info.inputargs)
         # we need to absolutely make sure that we've cleaned up all
@@ -120,7 +119,6 @@
         jump_args = state.virtual_state.make_inputargs(jump_args,
                     self.optimizer, force_boxes=True) + args_from_extras
         
-        self.optimizer.flush()
         jump_op = ResOperation(rop.JUMP, jump_args)
         self.optimizer._newoperations.append(jump_op)
         return (UnrollInfo(self.make_short_preamble(start_label.getarglist()),