[pypy-commit] pypy guard-compatible: tweaks

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: guard-compatible
Changeset: r84534:848afed0747a
Date: 2016-05-20 17:54 +0200
http://bitbucket.org/pypy/pypy/changeset/848afed0747a/

Log:	tweaks

diff --git a/rpython/jit/backend/llgraph/runner.py b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -1289,8 +1289,8 @@
             self.fail_guard(descr)
 
     def execute_guard_compatible(self, descr, arg1, arg2):
+        assert not hasattr(descr, '_llgraph_bridge')
         if arg1 != arg2:
-            assert not hasattr(descr, '_llgraph_bridge')
             try:
                 lst = descr._guard_compatible_llgraph_lst
             except AttributeError:
@@ -1308,7 +1308,8 @@
             if target == -1:
                 return
             else:
-                self.fail_guard(descr, force_bridge=target)
+                self.fail_guard(descr, extra_value='should not be used',
+                                force_bridge=target)
 
     def execute_int_add_ovf(self, _, x, y):
         try: