[pypy-commit] pypy default: fix
alex_gaynor
noreply at buildbot.pypy.org
Tue Oct 25 00:59:12 CEST 2011
Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch:
Changeset: r48400:adab424acda7
Date: 2011-10-24 18:58 -0400
http://bitbucket.org/pypy/pypy/changeset/adab424acda7/
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
@@ -1297,8 +1297,8 @@
genop_guard_int_ne = _cmpop_guard("NE", "NE", "E", "E")
genop_guard_int_gt = _cmpop_guard("G", "L", "LE", "GE")
genop_guard_int_ge = _cmpop_guard("GE", "LE", "L", "G")
- genop_guard_ptr_eq = genop_guard_int_eq
- genop_guard_ptr_ne = genop_guard_int_ne
+ genop_guard_ptr_eq = genop_guard_instance_ptr_eq = genop_guard_int_eq
+ genop_guard_ptr_ne = genop_guard_instance_ptr_ne = genop_guard_int_ne
genop_guard_uint_gt = _cmpop_guard("A", "B", "BE", "AE")
genop_guard_uint_lt = _cmpop_guard("B", "A", "AE", "BE")
diff --git a/pypy/jit/metainterp/test/test_ajit.py b/pypy/jit/metainterp/test/test_ajit.py
--- a/pypy/jit/metainterp/test/test_ajit.py
+++ b/pypy/jit/metainterp/test/test_ajit.py
@@ -3471,6 +3471,22 @@
return i
res = self.meta_interp(f, [10])
assert res == f(10)
+ def f(n):
+ a1 = A()
+ a2 = A()
+ i = 0
+ while n > 0:
+ myjitdriver.jit_merge_point(n=n, i=i, a1=a1, a2=a2)
+ if n % 2:
+ a = a2
+ else:
+ a = a1
+ if a is a2:
+ i += 1
+ n -= 1
+ return i
+ res = self.meta_interp(f, [10])
+ assert res == f(10)
def test_virtual_array_of_structs(self):
myjitdriver = JitDriver(greens = [], reds=["n", "d"])
More information about the pypy-commit
mailing list