[pypy-svn] pypy out-of-line-guards-2: merge it here, this goes under review

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: out-of-line-guards-2
Changeset: r43488:91846e44e16c
Date: 2011-04-19 18:00 +0200
http://bitbucket.org/pypy/pypy/changeset/91846e44e16c/

Log:	merge it here, this goes under review

diff --git a/pypy/jit/metainterp/test/test_quasiimmut.py b/pypy/jit/metainterp/test/test_quasiimmut.py
--- a/pypy/jit/metainterp/test/test_quasiimmut.py
+++ b/pypy/jit/metainterp/test/test_quasiimmut.py
@@ -257,9 +257,12 @@
             total = f(foo)
             foo.a = 2
             total += f(foo)
+            foo.a = 1
+            total += f(foo)
             return total
 
         res = self.meta_interp(main, [])
+        self.check_loop_count(7)
         assert res == main()
 
 class TestLLtypeGreenFieldsTests(QuasiImmutTests, LLJitMixin):

diff --git a/pypy/jit/backend/x86/runner.py b/pypy/jit/backend/x86/runner.py
--- a/pypy/jit/backend/x86/runner.py
+++ b/pypy/jit/backend/x86/runner.py
@@ -152,6 +152,8 @@
             mc = codebuf.MachineCodeBlockWrapper()
             mc.JMP_l(tgt)
             mc.copy_to_raw_memory(addr - 1)
+        # positions invalidated
+        looptoken.compiled_loop_token.invalidate_positions = []
 
 class CPU386(AbstractX86CPU):
     WORD = 4