[pypy-commit] pypy default: merge
fijal
pypy.commits at gmail.com
Tue Mar 8 10:13:34 EST 2016
Author: fijal
Branch:
Changeset: r82884:9f7abe836d20
Date: 2016-03-08 17:12 +0200
http://bitbucket.org/pypy/pypy/changeset/9f7abe836d20/
Log: merge
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -240,6 +240,7 @@
Kristjan Valur Jonsson
David Lievens
Neil Blakey-Milner
+ Sergey Matyunin
Lutz Paelike
Lucio Torre
Lars Wassermann
@@ -271,6 +272,7 @@
Aaron Tubbs
Ben Darnell
Roberto De Ioris
+ Logan Chien
Juan Francisco Cantero Hurtado
Ruochen Huang
Jeong YunWon
diff --git a/pypy/doc/contributor.rst b/pypy/doc/contributor.rst
--- a/pypy/doc/contributor.rst
+++ b/pypy/doc/contributor.rst
@@ -210,6 +210,7 @@
Kristjan Valur Jonsson
David Lievens
Neil Blakey-Milner
+ Sergey Matyunin
Lutz Paelike
Lucio Torre
Lars Wassermann
@@ -241,6 +242,7 @@
Aaron Tubbs
Ben Darnell
Roberto De Ioris
+ Logan Chien
Juan Francisco Cantero Hurtado
Ruochen Huang
Jeong YunWon
diff --git a/pypy/doc/cpython_differences.rst b/pypy/doc/cpython_differences.rst
--- a/pypy/doc/cpython_differences.rst
+++ b/pypy/doc/cpython_differences.rst
@@ -265,7 +265,7 @@
return False
def evil(y):
- d = {x(): 1}
+ d = {X(): 1}
X.__eq__ = __evil_eq__
d[y] # might trigger a call to __eq__?
diff --git a/pypy/doc/release-5.0.0.rst b/pypy/doc/release-5.0.0.rst
--- a/pypy/doc/release-5.0.0.rst
+++ b/pypy/doc/release-5.0.0.rst
@@ -12,11 +12,11 @@
We also merged a major upgrade to our C-API layer (cpyext), simplifying the
interaction between c-level objects and PyPy interpreter level objects. As a
result, lxml with its cython compiled component `passes all tests`_ on PyPy
+and the new cpyext is a lot faster than the previous one.
-Users who have gotten used to vmprof_ on Linux, and those on other platforms
-who have not yet tried its awesomeness, will be happy to hear that vmprof
-now just works on MacOS and Windows too, in both PyPy (built-in support) and
-CPython (as an installed module).
+vmprof_ has been a go-to profiler for PyPy on linux for a few releases
+and we're happy to announce that thanks to commercial cooperation, vmprof
+now works on Linux, OS X and Windows on both PyPy and CPython.
You can download the PyPy 5.0 release here:
@@ -36,7 +36,7 @@
While not applicable only to PyPy, `cffi`_ is arguably our most significant
contribution to the python ecosystem. PyPy 5.0 ships with
-`cffi-1.5.2`_ which now allows embedding PyPy (or cpython) in a c program.
+`cffi-1.5.2`_ which now allows embedding PyPy (or cpython) in a C program.
.. _`PyPy`: http://doc.pypy.org
.. _`RPython`: https://rpython.readthedocs.org
@@ -52,18 +52,18 @@
=============
PyPy is a very compliant Python interpreter, almost a drop-in replacement for
-CPython 2.7. It's fast (`pypy and cpython 2.7.x`_ performance comparison)
+CPython 2.7. It's fast (`PyPy and CPython 2.7.x`_ performance comparison)
due to its integrated tracing JIT compiler.
We also welcome developers of other
`dynamic languages`_ to see what RPython can do for them.
This release supports **x86** machines on most common operating systems
-(Linux 32/64, Mac OS X 64, Windows 32, OpenBSD, freebsd),
+(Linux 32/64, Mac OS X 64, Windows 32, OpenBSD, FreeBSD),
newer **ARM** hardware (ARMv6 or ARMv7, with VFPv3) running Linux, and the
-big- and little-endian variants of **ppc64** running Linux.
+big- and little-endian variants of **PPC64** running Linux.
-.. _`pypy and cpython 2.7.x`: http://speed.pypy.org
+.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
.. _`dynamic languages`: http://pypyjs.org
Other Highlights (since 4.0.1 released in November 2015)
@@ -103,7 +103,7 @@
* More completely support datetime, optimize timedelta creation
- * Fix for issue 2185 which caused an inconsistent list of operations to be
+ * Fix for issue #2185 which caused an inconsistent list of operations to be
generated by the unroller, appeared in a complicated DJango app
* Fix an elusive issue with stacklets on shadowstack which showed up when
@@ -128,9 +128,6 @@
* Fix for corner case (likely shown by Krakatau) for consecutive guards with
interdependencies
- * Fix applevel bare class method comparisons which should fix pretty printing
- in IPython
-
* Issues reported with our previous release were resolved_ after reports from users on
our issue tracker at https://bitbucket.org/pypy/pypy/issues or on IRC at
#pypy
diff --git a/pypy/tool/release/repackage.sh b/pypy/tool/release/repackage.sh
--- a/pypy/tool/release/repackage.sh
+++ b/pypy/tool/release/repackage.sh
@@ -1,7 +1,7 @@
# Edit these appropriately before running this script
-maj=4
+maj=5
min=0
-rev=1
+rev=0
# This script will download latest builds from the buildmaster, rename the top
# level directory, and repackage ready to be uploaded to bitbucket. It will also
# download source, assuming a tag for the release already exists, and repackage them.
diff --git a/rpython/rlib/rvmprof/src/vmprof_getpc.h b/rpython/rlib/rvmprof/src/vmprof_getpc.h
--- a/rpython/rlib/rvmprof/src/vmprof_getpc.h
+++ b/rpython/rlib/rvmprof/src/vmprof_getpc.h
@@ -54,6 +54,7 @@
// It will cause problems for FreeBSD though!, because it turns off
// the needed __BSD_VISIBLE.
#ifdef __APPLE__
+#include <limits.h>
#define _XOPEN_SOURCE 500
#endif
@@ -144,7 +145,11 @@
#else
intptr_t GetPC(ucontext_t *signal_ucontext) {
#ifdef __APPLE__
+#if ((ULONG_MAX) == (UINT_MAX))
+ return (signal_ucontext->uc_mcontext->__ss.__eip);
+#else
return (signal_ucontext->uc_mcontext->__ss.__rip);
+#endif
#else
return signal_ucontext->PC_FROM_UCONTEXT; // defined in config.h
#endif
diff --git a/rpython/translator/c/test/test_genc.py b/rpython/translator/c/test/test_genc.py
--- a/rpython/translator/c/test/test_genc.py
+++ b/rpython/translator/c/test/test_genc.py
@@ -596,7 +596,7 @@
t.context._graphof(foobar_fn).inhibit_tail_call = True
t.source_c()
lines = t.driver.cbuilder.c_source_filename.join('..',
- 'rpython_translator_c_test_test_genc.c').readlines()
+ 'rpython_translator_c_test.c').readlines()
for i, line in enumerate(lines):
if '= pypy_g_foobar_fn' in line:
break
More information about the pypy-commit
mailing list