Author: Armin Rigo <ar...@tunes.org>
Branch: guard-compatible
Changeset: r90034:d16698c1a52b
Date: 2017-02-10 16:50 +0100
http://bitbucket.org/pypy/pypy/changeset/d16698c1a52b/
Log: pass the second test
diff --git a/rpython/jit/backend/x86/assembler.py
b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -1978,7 +1978,7 @@
if guardtok.guard_compatible():
assert startpos == self.mc.get_relative_pos()
guard_compat.generate_recovery_stub(self, guardtok)
- xXXXx
+ return startpos
#
self.push_from_gc_table(faildescrindex)
self.push_gcmap(self.mc, guardtok.gcmap, push=True)
diff --git a/rpython/jit/backend/x86/guard_compat.py
b/rpython/jit/backend/x86/guard_compat.py
--- a/rpython/jit/backend/x86/guard_compat.py
+++ b/rpython/jit/backend/x86/guard_compat.py
@@ -304,6 +304,7 @@
def generate_recovery_stub(assembler, guard_token):
+ rax = regloc.eax.value
r11 = regloc.r11.value
frame_size = DEFAULT_FRAME_BYTES
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
