[pypy-commit] pypy kill-gen-store-back-in: we're not supposed to touch anything between guard_not_forced and finish'

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: kill-gen-store-back-in
Changeset: r64510:266af5b37bc6
Date: 2013-05-23 13:27 +0200
http://bitbucket.org/pypy/pypy/changeset/266af5b37bc6/

Log:	we're not supposed to touch anything between guard_not_forced and
	finish'

diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -2274,10 +2274,10 @@
         # in case the force_token has not been recorded, record it here
         # to make sure we know the virtualizable can be broken. However, the
         # contents of the virtualizable should be generally correct
-        self.generate_guard(rop.GUARD_NOT_FORCED, None)
         self.history.record(rop.FORCE_TOKEN, [], force_token_box)
         self.history.record(rop.SETFIELD_GC, [vbox, force_token_box],
                             None, descr=vinfo.vable_token_descr)
+        self.generate_guard(rop.GUARD_NOT_FORCED, None)
 
     def compile_exit_frame_with_exception(self, valuebox):
         self.store_token_in_vable()