[pypy-commit] pypy default: Double mention of DEBUG_MERGE_POINT

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r78273:6c9e9cfc6553
Date: 2015-06-23 16:03 +0200
http://bitbucket.org/pypy/pypy/changeset/6c9e9cfc6553/

Log:	Double mention of DEBUG_MERGE_POINT

diff --git a/rpython/jit/backend/llsupport/rewrite.py b/rpython/jit/backend/llsupport/rewrite.py
--- a/rpython/jit/backend/llsupport/rewrite.py
+++ b/rpython/jit/backend/llsupport/rewrite.py
@@ -73,8 +73,6 @@
                 self.emit_pending_zeros()
             elif op.can_malloc():
                 self.emitting_an_operation_that_can_collect()
-            elif op.getopnum() == rop.DEBUG_MERGE_POINT:
-                continue # ignore debug_merge_points
             elif op.getopnum() == rop.LABEL:
                 self.emitting_an_operation_that_can_collect()
                 self.known_lengths.clear()