[pypy-commit] pypy guard-compatible: (remi, arigo)

arigo pypy.commits at gmail.com
Fri Mar 23 11:04:57 EDT 2018


Author: Armin Rigo <arigo at tunes.org>
Branch: guard-compatible
Changeset: r94122:bfc198924823
Date: 2018-03-23 16:04 +0100
http://bitbucket.org/pypy/pypy/changeset/bfc198924823/

Log:	(remi, arigo)

	Found one of the remaining obscuuuuuuuuure bugs: r11 is supposed to
	have a known value, but can't across a guard_compatible

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
@@ -1857,7 +1857,9 @@
         self.guard_success_cc = rx86.Conditions['E']
         self.implement_guard(guard_token)
 
-    genop_guard_guard_compatible = genop_guard_guard_value
+    def genop_guard_guard_compatible(self, guard_op, guard_token, locs, ign):
+        self.genop_guard_guard_value(guard_op, guard_token, locs, ign)
+        self.mc.forget_scratch_register()
 
     def _cmp_guard_class(self, locs):
         loc_ptr = locs[0]


More information about the pypy-commit mailing list