[pypy-commit] pypy small-unroll-improvements: this should no longer be necessary

[cfbolz]

Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: small-unroll-improvements
Changeset: r70509:e4ad4a4796df
Date: 2014-04-09 16:42 +0200
http://bitbucket.org/pypy/pypy/changeset/e4ad4a4796df/

Log:	this should no longer be necessary

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
@@ -576,18 +576,7 @@
                     debugmsg = 'Guarded to match '
                 except InvalidLoop:
                     pass
-            if ok and not patchguardop:
-                # if we can't patch the guards to go to a good target, no use
-                # in jumping to this label
-                for guard in extra_guards:
-                    if guard.is_guard():
-                        ok = False
-                        break
-                else:
-                    for shop in target.short_preamble[1:]:
-                        if shop.is_guard():
-                            ok = False
-                            break
+            assert patchguardop is not None or (extra_guards == [] and len(target.short_preamble) == 1)
 
             target.virtual_state.debug_print(debugmsg, bad)