Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r53869:65f628f558ca
Date: 2012-03-21 14:30 +0100
http://bitbucket.org/pypy/pypy/changeset/65f628f558ca/
Log: merge heads
diff --git a/pypy/objspace/std/test/test_obj.py
b/pypy/objspace/std/test/test_obj.py
--- a/pypy/objspace/std/test/test_obj.py
+++ b/pypy/objspace/std/test/test_obj.py
@@ -265,4 +265,7 @@
space = objspace.StdObjSpace()
w_a = space.wrap("a")
space.type = None
+ # if it crashes, it means that space._type_isinstance didn't go through
+ # the fast path, and tries to call type() (which is set to None just
+ # above)
space.isinstance_w(w_a, space.w_str) # does not crash
diff --git a/pypy/translator/jvm/opcodes.py b/pypy/translator/jvm/opcodes.py
--- a/pypy/translator/jvm/opcodes.py
+++ b/pypy/translator/jvm/opcodes.py
@@ -241,4 +241,6 @@
'cast_ulonglong_to_float': jvm.PYPYULONGTODOUBLE,
'cast_primitive': [PushAllArgs, CastPrimitive, StoreResult],
'force_cast': [PushAllArgs, CastPrimitive, StoreResult],
+
+ 'convert_float_bytes_to_longlong': jvm.PYPYDOUBLEBYTESTOLONG,
})
diff --git a/pypy/translator/jvm/typesystem.py
b/pypy/translator/jvm/typesystem.py
--- a/pypy/translator/jvm/typesystem.py
+++ b/pypy/translator/jvm/typesystem.py
@@ -941,6 +941,7 @@
PYPYDOUBLETOULONG = Method.s(jPyPy, 'double_to_ulong', (jDouble,), jLong)
PYPYULONGTODOUBLE = Method.s(jPyPy, 'ulong_to_double', (jLong,), jDouble)
PYPYLONGBITWISENEGATE = Method.v(jPyPy, 'long_bitwise_negate', (jLong,), jLong)
+PYPYDOUBLEBYTESTOLONG = Method.v(jPyPy, 'pypy__float2longlong', (jDouble,),
jLong)
PYPYSTRTOINT = Method.v(jPyPy, 'str_to_int', (jString,), jInt)
PYPYSTRTOUINT = Method.v(jPyPy, 'str_to_uint', (jString,), jInt)
PYPYSTRTOLONG = Method.v(jPyPy, 'str_to_long', (jString,), jLong)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
