Author: Richard Plangger <[email protected]>
Branch:
Changeset: r85575:e472905e4fec
Date: 2016-07-06 12:29 +0200
http://bitbucket.org/pypy/pypy/changeset/e472905e4fec/
Log: remove pop_gcmap just before returning from malloc_slowpath, this
will overwrite the nursery free ptr hold in r1 (s390x)
diff --git a/rpython/jit/backend/zarch/assembler.py
b/rpython/jit/backend/zarch/assembler.py
--- a/rpython/jit/backend/zarch/assembler.py
+++ b/rpython/jit/backend/zarch/assembler.py
@@ -500,7 +500,6 @@
# r.RSZ is loaded from [r1], to make the caller's store a no-op here
mc.load(r.RSZ, r.r1, 0)
#
- self.pop_gcmap(mc) # push_gcmap(store=True) done by the caller
mc.restore_link()
mc.BCR(c.ANY, r.r14)
self.mc = None
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
