Author: Armin Rigo <[email protected]>
Branch:
Changeset: r83479:96c8916a4c64
Date: 2016-04-01 09:44 +0200
http://bitbucket.org/pypy/pypy/changeset/96c8916a4c64/
Log: merge heads
diff --git a/pypy/module/__pypy__/interp_magic.py
b/pypy/module/__pypy__/interp_magic.py
--- a/pypy/module/__pypy__/interp_magic.py
+++ b/pypy/module/__pypy__/interp_magic.py
@@ -181,9 +181,10 @@
elif space.is_w(space.type(w_obj), space.w_float):
jit.promote(space.float_w(w_obj))
elif space.is_w(space.type(w_obj), space.w_str):
- jit.promote(space.str_w(w_obj))
+ jit.promote_string(space.unicode_w(w_obj))
elif space.is_w(space.type(w_obj), space.w_unicode):
- jit.promote(space.unicode_w(w_obj))
+ raise OperationError(space.w_TypeError, space.wrap(
+ "promoting unicode unsupported"))
else:
jit.promote(w_obj)
return w_obj
diff --git a/rpython/jit/backend/zarch/pool.py
b/rpython/jit/backend/zarch/pool.py
--- a/rpython/jit/backend/zarch/pool.py
+++ b/rpython/jit/backend/zarch/pool.py
@@ -33,7 +33,7 @@
def ensure_can_hold_constants(self, asm, op):
# allocates 8 bytes in memory for pointers, long integers or floats
- if rop.is_jit_debug(op):
+ if rop.is_jit_debug(op.getopnum()):
return
for arg in op.getarglist():
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
