[pypy-commit] pypy share-guard-info: pfff

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: share-guard-info
Changeset: r79664:c96512000a0f
Date: 2015-09-17 12:21 +0200
http://bitbucket.org/pypy/pypy/changeset/c96512000a0f/

Log:	pfff

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
@@ -585,18 +585,12 @@
                             self.force_box(farg)
         elif op.can_raise():
             self.exception_might_have_happened = True
-<<<<<<< local
-        if self._emitting:
-            if op.has_no_side_effect() or op.is_guard() or op.is_jit_debug():
-                pass
-            else:
-                self._last_guard_op = None
-            self._really_emitted_operation = op
-            self._newoperations.append(op)
-=======
+        if op.has_no_side_effect() or op.is_guard() or op.is_jit_debug():
+            pass
+        else:
+            self._last_guard_op = None
         self._really_emitted_operation = op
         self._newoperations.append(op)
->>>>>>> other
 
     def _copy_resume_data_from(self, guard_op, last_guard_op):
         descr = compile.invent_fail_descr_for_op(guard_op.getopnum(), self)