[pypy-svn] pypy out-of-line-guards: Rename GUARD_NOT_INVARIANT to GUARD_NOT_INVALIDATED

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: out-of-line-guards
Changeset: r40322:89a53afe4641
Date: 2011-01-02 14:34 +0200
http://bitbucket.org/pypy/pypy/changeset/89a53afe4641/

Log:	Rename GUARD_NOT_INVARIANT to GUARD_NOT_INVALIDATED

diff --git a/pypy/jit/metainterp/resoperation.py b/pypy/jit/metainterp/resoperation.py
--- a/pypy/jit/metainterp/resoperation.py
+++ b/pypy/jit/metainterp/resoperation.py
@@ -380,7 +380,7 @@
     'GUARD_NO_OVERFLOW/0d',
     'GUARD_OVERFLOW/0d',
     'GUARD_NOT_FORCED/0d', # forcing virtualrefs/virtualizables
-    'GUARD_NOT_INVARIANT/0d', # forcing jit invariant fields
+    'GUARD_NOT_INVALIDATED/0d', # forcing jit invariant fields
     '_GUARD_LAST', # ----- end of guard operations -----
 
     '_NOSIDEEFFECT_FIRST', # ----- start of no_side_effect operations -----

diff --git a/pypy/jit/backend/llgraph/llimpl.py b/pypy/jit/backend/llgraph/llimpl.py
--- a/pypy/jit/backend/llgraph/llimpl.py
+++ b/pypy/jit/backend/llgraph/llimpl.py
@@ -157,7 +157,7 @@
     'force_token'     : ((), 'int'),
     'call_may_force'  : (('int', 'varargs'), 'intorptr'),
     'guard_not_forced': ((), None),
-    'guard_not_invariant': ((), None),
+    'guard_not_invalidated': ((), None),
 }
 
 # ____________________________________________________________
@@ -958,7 +958,7 @@
         if forced:
             raise GuardFailed
 
-    def op_guard_not_invariant(self, descr):
+    def op_guard_not_invalidated(self, descr):
         if self.loop.invalidated:
             raise GuardFailed
 

diff --git a/pypy/jit/metainterp/pyjitpl.py b/pypy/jit/metainterp/pyjitpl.py
--- a/pypy/jit/metainterp/pyjitpl.py
+++ b/pypy/jit/metainterp/pyjitpl.py
@@ -1185,9 +1185,9 @@
             if resbox is not None:
                 self.make_result_of_lastop(resbox)
             self.metainterp.vable_after_residual_call()
+            self.generate_guard(rop.GUARD_NOT_FORCED, None)
             if effectinfo is None or effectinfo.extraeffect >= effectinfo.EF_FORCES_JIT_INVARIANT:
-                self.generate_guard(rop.GUARD_NOT_INVARIANT, None)
-            self.generate_guard(rop.GUARD_NOT_FORCED, None)
+                self.generate_guard(rop.GUARD_NOT_INVALIDATED, None)
             self.metainterp.handle_possible_exception()
             return resbox
         else:

diff --git a/pypy/jit/metainterp/blackhole.py b/pypy/jit/metainterp/blackhole.py
--- a/pypy/jit/metainterp/blackhole.py
+++ b/pypy/jit/metainterp/blackhole.py
@@ -1247,7 +1247,7 @@
             # because of GUARD_NONNULL_CLASS.
             pass
         #
-        elif opnum == rop.GUARD_NOT_INVARIANT:
+        elif opnum == rop.GUARD_NOT_INVALIDATED:
             pass
         elif (opnum == rop.GUARD_NO_EXCEPTION or
               opnum == rop.GUARD_EXCEPTION or