[pypy-svn] pypy jit-shadowstack: Fix.
arigo
commits-noreply at bitbucket.org
Thu Mar 31 13:58:33 CEST 2011
Author: Armin Rigo <arigo at tunes.org>
Branch: jit-shadowstack
Changeset: r43045:cd0f89185a35
Date: 2011-03-31 13:57 +0200
http://bitbucket.org/pypy/pypy/changeset/cd0f89185a35/
Log: Fix.
diff --git a/pypy/jit/backend/x86/assembler.py b/pypy/jit/backend/x86/assembler.py
--- a/pypy/jit/backend/x86/assembler.py
+++ b/pypy/jit/backend/x86/assembler.py
@@ -133,6 +133,7 @@
def setup(self, looptoken):
assert self.memcpy_addr != 0, "setup_once() not called?"
+ self.currently_compiling_loop = looptoken
self.pending_guard_tokens = []
self.mc = codebuf.MachineCodeBlockWrapper()
if self.datablockwrapper is None:
@@ -318,7 +319,6 @@
assert len(set(inputargs)) == len(inputargs)
self.setup(looptoken)
- self.currently_compiling_loop = looptoken
funcname = self._find_debug_merge_point(operations)
if log:
self._register_counter()
More information about the Pypy-commit
mailing list