Author: Armin Rigo <[email protected]>
Branch: branch-prediction
Changeset: r90989:83b603bf64b3
Date: 2017-04-06 16:11 +0200
http://bitbucket.org/pypy/pypy/changeset/83b603bf64b3/
Log: hg merge default
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
@@ -1745,6 +1745,10 @@
self.mc.patch_forward_jump(j_location)
except codebuf.ShortJumpTooFar:
pass # ignore this case
+ else:
+ # succeeded: forget the saved value of the scratch
+ # register here
+ self.mc.forget_scratch_register()
def genop_guard_guard_not_invalidated(self, guard_op, guard_token,
locs, ign):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
