From pypy.commits at gmail.com  Sat Apr  1 04:43:27 2017
From: pypy.commits at gmail.com (arigo)
Date: Sat, 01 Apr 2017 01:43:27 -0700 (PDT)
Subject: [pypy-commit] pypy default: The exact message we get depends on the
 underlying (host) cffi version
Message-ID: <58df682f.ebafdf0a.a4ea2.a209@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90887:efad75426201
Date: 2017-04-01 10:43 +0200
http://bitbucket.org/pypy/pypy/changeset/efad75426201/

Log:	The exact message we get depends on the underlying (host) cffi
	version

diff --git a/pypy/module/_cffi_backend/test/test_recompiler.py b/pypy/module/_cffi_backend/test/test_recompiler.py
--- a/pypy/module/_cffi_backend/test/test_recompiler.py
+++ b/pypy/module/_cffi_backend/test/test_recompiler.py
@@ -1471,8 +1471,13 @@
         with self.StdErrCapture(fd=True) as f:
             res = lib.bar(4, 5)
         assert res == 0
-        assert f.getvalue() == (
+        assert f.getvalue() in (
+            # If the underlying cffi is <= 1.9
             "extern \"Python\": function bar() called, but no code was attached "
+            "to it yet with @ffi.def_extern().  Returning 0.\n",
+            # If the underlying cffi is >= 1.10
+            "extern \"Python\": function _CFFI_test_extern_python_1.bar() "
+            "called, but no code was attached "
             "to it yet with @ffi.def_extern().  Returning 0.\n")
 
         @ffi.def_extern("bar")

From pypy.commits at gmail.com  Sat Apr  1 04:45:59 2017
From: pypy.commits at gmail.com (arigo)
Date: Sat, 01 Apr 2017 01:45:59 -0700 (PDT)
Subject: [pypy-commit] pypy default: Fix test (expecting AssertionError now
 for out-of-bounds unsafe access)
Message-ID: <58df68c7.2ea0df0a.6bdd4.a650@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90888:e21e09d948c3
Date: 2017-04-01 10:45 +0200
http://bitbucket.org/pypy/pypy/changeset/e21e09d948c3/

Log:	Fix test (expecting AssertionError now for out-of-bounds unsafe
	access)

diff --git a/rpython/rlib/rstrategies/test/test_rstrategies.py b/rpython/rlib/rstrategies/test/test_rstrategies.py
--- a/rpython/rlib/rstrategies/test/test_rstrategies.py
+++ b/rpython/rlib/rstrategies/test/test_rstrategies.py
@@ -204,7 +204,7 @@
     if is_safe:
         py.test.raises(IndexError, s.fetch, l, -1)
     else:
-        assert s.fetch(l, -1) == s.fetch(l, size - 1)
+        py.test.raises(AssertionError, s.fetch, l, -1)
 
 def test_init_Empty():
     l = W_List(EmptyStrategy, 0)
@@ -249,7 +249,7 @@
     if is_safe:
         py.test.raises(IndexError, s.store, l, -1, stored_value)
     else:
-        store_test(-1)
+        py.test.raises(AssertionError, s.store, l, -1, stored_value)
 
 def test_store_Nil():
     do_test_store(NilStrategy, stored_value=w_nil)

From pypy.commits at gmail.com  Sat Apr  1 04:48:40 2017
From: pypy.commits at gmail.com (arigo)
Date: Sat, 01 Apr 2017 01:48:40 -0700 (PDT)
Subject: [pypy-commit] pypy default: fix on 32-bit
Message-ID: <58df6968.9d711c0a.b95d7.31ee@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90889:5907000d9e3d
Date: 2017-04-01 10:48 +0200
http://bitbucket.org/pypy/pypy/changeset/5907000d9e3d/

Log:	fix on 32-bit

diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -28,7 +28,7 @@
 RPY_EXTERN void vmprof_ignore_signals(int);
 RPY_EXTERN int vmprof_enable(int memory, int native);
 RPY_EXTERN int vmprof_disable(void);
-RPY_EXTERN int vmprof_register_virtual_function(char *, long, int);
+RPY_EXTERN int vmprof_register_virtual_function(char *, intptr_t, int);
 RPY_EXTERN void* vmprof_stack_new(void);
 RPY_EXTERN int vmprof_stack_append(void*, long);
 RPY_EXTERN long vmprof_stack_pop(void*);

From pypy.commits at gmail.com  Sat Apr  1 04:01:18 2017
From: pypy.commits at gmail.com (arigo)
Date: Sat, 01 Apr 2017 01:01:18 -0700 (PDT)
Subject: [pypy-commit] pypy default: Issue #2526: fix for a corner case of
 __future__ imports
Message-ID: <58df5e4e.8bd11c0a.3a02e.2574@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90886:49dcf5e4c5a1
Date: 2017-04-01 10:00 +0200
http://bitbucket.org/pypy/pypy/changeset/49dcf5e4c5a1/

Log:	Issue #2526: fix for a corner case of __future__ imports

diff --git a/pypy/interpreter/pyparser/future.py b/pypy/interpreter/pyparser/future.py
--- a/pypy/interpreter/pyparser/future.py
+++ b/pypy/interpreter/pyparser/future.py
@@ -78,6 +78,7 @@
     from pypy.interpreter.pyparser import pygram
     it = TokenIterator(tokens)
     result = 0
+    last_position = (0, 0)
     #
     # The only things that can precede a future statement are another
     # future statement and a doc string (only one).  This is a very
@@ -92,6 +93,11 @@
            it.skip_name("__future__") and
            it.skip_name("import")):
         it.skip(pygram.tokens.LPAR)    # optionally
+        # return in 'last_position' any line-column pair that points
+        # somewhere inside the last __future__ import statement
+        # (at the start would be fine too, but it's easier to grab a
+        # random position inside)
+        last_position = (it.tok[2], it.tok[3])
         result |= future_flags.get_compiler_feature(it.next_feature_name())
         while it.skip(pygram.tokens.COMMA):
             result |= future_flags.get_compiler_feature(it.next_feature_name())
@@ -99,5 +105,4 @@
         it.skip(pygram.tokens.SEMI)    # optionally
         it.skip_newlines()
 
-    position = (it.tok[2], it.tok[3])
-    return result, position
+    return result, last_position
diff --git a/pypy/interpreter/pyparser/test/test_future.py b/pypy/interpreter/pyparser/test/test_future.py
--- a/pypy/interpreter/pyparser/test/test_future.py
+++ b/pypy/interpreter/pyparser/test/test_future.py
@@ -2,10 +2,9 @@
 from pypy.interpreter.pyparser import future, pytokenizer
 from pypy.tool import stdlib___future__ as fut
 
-def run(s, expected_last_future=None):
+def run(s, expected_last_future=(0, 0)):
     source_lines = s.splitlines(True)
     tokens = pytokenizer.generate_tokens(source_lines, 0)
-    expected_last_future = expected_last_future or tokens[-1][2:4]
     #
     flags, last_future_import = future.add_future_flags(
         future.futureFlags_2_7, tokens)
@@ -14,7 +13,7 @@
 
 def test_docstring():
     s = '"Docstring\\" "\nfrom  __future__ import division\n'
-    f = run(s)
+    f = run(s, (2, 24))
     assert f == fut.CO_FUTURE_DIVISION
 
 def test_comment():
@@ -45,167 +44,167 @@
 
 def test_from():
     s = 'from  __future__ import division\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == fut.CO_FUTURE_DIVISION
 
 def test_froms():
     s = 'from  __future__ import division, generators, with_statement\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == (fut.CO_FUTURE_DIVISION |
                  fut.CO_GENERATOR_ALLOWED |
                  fut.CO_FUTURE_WITH_STATEMENT)
 
 def test_from_as():
     s = 'from  __future__ import division as b\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == fut.CO_FUTURE_DIVISION
     
 def test_froms_as():
     s = 'from  __future__ import division as b, generators as c\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == (fut.CO_FUTURE_DIVISION |
                  fut.CO_GENERATOR_ALLOWED)
 
 def test_from_paren():
     s = 'from  __future__ import (division)\n'
-    f = run(s)
+    f = run(s, (1, 25))
     assert f == fut.CO_FUTURE_DIVISION
 
 def test_froms_paren():
     s = 'from  __future__ import (division, generators)\n'
-    f = run(s)
+    f = run(s, (1, 25))
     assert f == (fut.CO_FUTURE_DIVISION |
                  fut.CO_GENERATOR_ALLOWED)
 
 def test_froms_paren_as():
     s = 'from  __future__ import (division as b, generators,)\n'
-    f = run(s)
+    f = run(s, (1, 25))
     assert f == (fut.CO_FUTURE_DIVISION |
                  fut.CO_GENERATOR_ALLOWED)
 
 def test_paren_with_newline():
     s = 'from __future__ import (division,\nabsolute_import)\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == (fut.CO_FUTURE_DIVISION | fut.CO_FUTURE_ABSOLUTE_IMPORT)
 
 def test_paren_with_newline_2():
     s = 'from __future__ import (\ndivision,\nabsolute_import)\n'
-    f = run(s)
+    f = run(s, (2, 0))
     assert f == (fut.CO_FUTURE_DIVISION | fut.CO_FUTURE_ABSOLUTE_IMPORT)
 
 def test_multiline():
     s = '"abc" #def\n  #ghi\nfrom  __future__ import (division as b, generators,)\nfrom __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (4, 23))
     assert f == (fut.CO_FUTURE_DIVISION |
                  fut.CO_GENERATOR_ALLOWED |
                  fut.CO_FUTURE_WITH_STATEMENT)
 
 def test_windows_style_lineendings():
     s = '"abc" #def\r\n  #ghi\r\nfrom  __future__ import (division as b, generators,)\r\nfrom __future__ import with_statement\r\n'
-    f = run(s)
+    f = run(s, (4, 23))
     assert f == (fut.CO_FUTURE_DIVISION |
                  fut.CO_GENERATOR_ALLOWED |
                  fut.CO_FUTURE_WITH_STATEMENT)
 
 def test_mac_style_lineendings():
     s = '"abc" #def\r  #ghi\rfrom  __future__ import (division as b, generators,)\rfrom __future__ import with_statement\r'
-    f = run(s)
+    f = run(s, (4, 23))
     assert f == (fut.CO_FUTURE_DIVISION |
                  fut.CO_GENERATOR_ALLOWED |
                  fut.CO_FUTURE_WITH_STATEMENT)
 
 def test_semicolon():
     s = '"abc" #def\n  #ghi\nfrom  __future__ import (division as b, generators,);  from __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (3, 78))
     assert f == (fut.CO_FUTURE_DIVISION |
                  fut.CO_GENERATOR_ALLOWED |
                  fut.CO_FUTURE_WITH_STATEMENT)
 
 def test_semicolon_2():
     s = 'from  __future__ import division; from foo import bar'
-    f = run(s, expected_last_future=(1, 39))
+    f = run(s, expected_last_future=(1, 24))
     assert f == fut.CO_FUTURE_DIVISION
 
 def test_full_chain():
     s = '"abc" #def\n  #ghi\nfrom  __future__ import (division as b, generators,);  from __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (3, 78))
     assert f == (fut.CO_FUTURE_DIVISION |
                  fut.CO_GENERATOR_ALLOWED |
                  fut.CO_FUTURE_WITH_STATEMENT)
 
 def test_intervening_code():
     s = 'from  __future__ import (division as b, generators,)\nfrom sys import modules\nfrom __future__ import with_statement\n'
-    f = run(s, expected_last_future=(2, 5))
+    f = run(s, expected_last_future=(1, 25))
     assert f == (fut.CO_FUTURE_DIVISION | fut.CO_GENERATOR_ALLOWED)
 
 def test_nonexisting():
     s = 'from  __future__ import non_existing_feature\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_nonexisting_2():
     s = 'from  __future__ import non_existing_feature, with_statement\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == fut.CO_FUTURE_WITH_STATEMENT
 
 def test_from_import_abs_import():
     s = 'from  __future__ import absolute_import\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == fut.CO_FUTURE_ABSOLUTE_IMPORT
 
 def test_raw_doc():
     s = 'r"Doc"\nfrom __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == fut.CO_FUTURE_WITH_STATEMENT
 
 def test_unicode_doc():
     s = 'u"Doc"\nfrom __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == fut.CO_FUTURE_WITH_STATEMENT
 
 def test_raw_unicode_doc():
     s = 'ru"Doc"\nfrom __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == fut.CO_FUTURE_WITH_STATEMENT
 
 def test_continuation_line():
     s = "\\\nfrom __future__ import with_statement\n"
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == fut.CO_FUTURE_WITH_STATEMENT
 
 def test_continuation_lines():
     s = "\\\n  \t\\\nfrom __future__ import with_statement\n"
-    f = run(s)
+    f = run(s, (3, 23))
     assert f == fut.CO_FUTURE_WITH_STATEMENT
 
 def test_lots_of_continuation_lines():
     s = "\\\n\\\n\\\n\\\n\\\n\\\n\nfrom __future__ import with_statement\n"
-    f = run(s)
+    f = run(s, (8, 23))
     assert f == fut.CO_FUTURE_WITH_STATEMENT
 
 def test_continuation_lines_raise():
     s = "   \\\n  \t\\\nfrom __future__ import with_statement\n"
-    f = run(s, expected_last_future=(1, 0))
+    f = run(s)
     assert f == 0     # because of the INDENT
 
 def test_continuation_lines_in_docstring_single_quoted():
     s = '"\\\n\\\n\\\n\\\n\\\n\\\n"\nfrom  __future__ import division\n'
-    f = run(s)
+    f = run(s, (8, 24))
     assert f == fut.CO_FUTURE_DIVISION
 
 def test_continuation_lines_in_docstring_triple_quoted():
     s = '"""\\\n\\\n\\\n\\\n\\\n\\\n"""\nfrom  __future__ import division\n'
-    f = run(s)
+    f = run(s, (8, 24))
     assert f == fut.CO_FUTURE_DIVISION
 
 def test_blank_lines():
     s = ('\n\t\n\nfrom __future__ import with_statement'
          '  \n  \n  \nfrom __future__ import division')
-    f = run(s)
+    f = run(s, (7, 23))
     assert f == fut.CO_FUTURE_WITH_STATEMENT | fut.CO_FUTURE_DIVISION
 
 def test_dummy_semicolons():
     s = ('from __future__ import division;\n'
          'from __future__ import with_statement;')
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == fut.CO_FUTURE_DIVISION | fut.CO_FUTURE_WITH_STATEMENT
diff --git a/pypy/interpreter/test/test_syntax.py b/pypy/interpreter/test/test_syntax.py
--- a/pypy/interpreter/test/test_syntax.py
+++ b/pypy/interpreter/test/test_syntax.py
@@ -366,6 +366,15 @@
         assert isinstance(ns["b"], str)
         assert isinstance(ns["c"], str)
 
+    def test_both_futures_with_semicolon(self):
+        # Issue #2526: a corner case which crashes only if the file
+        # contains *nothing more* than two __future__ imports separated
+        # by a semicolon.
+        s = """
+from __future__ import unicode_literals; from __future__ import print_function
+"""
+        exec s in {}
+
 
 class AppTestComprehensions:
 

From pypy.commits at gmail.com  Sat Apr  1 05:19:16 2017
From: pypy.commits at gmail.com (arigo)
Date: Sat, 01 Apr 2017 02:19:16 -0700 (PDT)
Subject: [pypy-commit] pypy default: Trying to fix the vmprof
 platform-conditionals
Message-ID: <58df7094.4ca8df0a.cbf22.ad49@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90890:2846cda12de2
Date: 2017-04-01 11:11 +0200
http://bitbucket.org/pypy/pypy/changeset/2846cda12de2/

Log:	Trying to fix the vmprof platform-conditionals

diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -22,29 +22,31 @@
     SHARED.join('symboltable.c')
 ]
 if sys.platform.startswith('linux'):
-    separate_module_files += [
-       BACKTRACE.join('backtrace.c'),
-       BACKTRACE.join('state.c'),
-       BACKTRACE.join('elf.c'),
-       BACKTRACE.join('dwarf.c'),
-       BACKTRACE.join('fileline.c'),
-       BACKTRACE.join('mmap.c'),
-       BACKTRACE.join('mmapio.c'),
-       BACKTRACE.join('posix.c'),
-       BACKTRACE.join('sort.c'),
-    ]
+    if sys.maxint > 2**32:     # doesn't seem to compile on 32-bit Linux
+        separate_module_files += [
+           BACKTRACE.join('backtrace.c'),
+           BACKTRACE.join('state.c'),
+           BACKTRACE.join('elf.c'),
+           BACKTRACE.join('dwarf.c'),
+           BACKTRACE.join('fileline.c'),
+           BACKTRACE.join('mmap.c'),
+           BACKTRACE.join('mmapio.c'),
+           BACKTRACE.join('posix.c'),
+           BACKTRACE.join('sort.c'),
+        ]
+        compile_extra += ['-DVMPROF_BACKTRACE']
     _libs = ['dl']
     compile_extra += ['-DVMPROF_UNIX']
     compile_extra += ['-DVMPROF_LINUX']
-elif sys.platform == 'darwin':
+elif sys.platform == 'win32':
+    compile_extra = ['-DRPYTHON_VMPROF', '-DVMPROF_WINDOWS']
+    separate_module_files = [SHARED.join('vmprof_main_win32.c')]
+    _libs = []
+else:
+    # Guessing a BSD-like Unix platform
     compile_extra += ['-DVMPROF_UNIX']
     compile_extra += ['-DVMPROF_MAC']
     _libs = []
-else:
-    # windows
-    compile_extra = ['-DRPYTHON_VMPROF', '-DVMPROF_WINDOWS']
-    separate_module_files = [SHARED.join('vmprof_main_win32.c')]
-    _libs = []
 
 
 eci_kwds = dict(
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c b/rpython/rlib/rvmprof/src/shared/symboltable.c
--- a/rpython/rlib/rvmprof/src/shared/symboltable.c
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 
 #include <dlfcn.h>
-#ifdef VMPROF_LINUX
+#ifdef VMPROF_BACKTRACE
 #include <link.h>
 #endif
 
@@ -215,7 +215,7 @@
         name[name_len-1] = 0;
     }
     lookup_vmprof_debug_info(name, info.dli_fbase, srcfile, srcfile_len, lineno);
-#elif defined(__unix__)
+#elif defined(RVMPROF_BACKTRACE)
     if (bstate == NULL) {
         bstate = backtrace_create_state (NULL, 1, backtrace_error_cb, NULL);
     }

From pypy.commits at gmail.com  Sat Apr  1 08:54:40 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Sat, 01 Apr 2017 05:54:40 -0700 (PDT)
Subject: [pypy-commit] extradoc extradoc: add blog post entry
Message-ID: <58dfa310.d5161c0a.9e3bf.7d51@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: extradoc
Changeset: r5793:3ed56edfa7ab
Date: 2017-04-01 08:54 -0400
http://bitbucket.org/pypy/extradoc/changeset/3ed56edfa7ab/

Log:	add blog post entry

diff --git a/blog/draft/vmprof-native.rst b/blog/draft/vmprof-native.rst
new file mode 100644
--- /dev/null
+++ b/blog/draft/vmprof-native.rst
@@ -0,0 +1,149 @@
+We are happy to announce a new release for the PyPI package vmprof.
+
+It is now able to capture native stack frames on Linux and Mac OS X to show you bottle necks in compiled code (such as CFFI modules, Cython or C Python extensions). It supports PyPy, CPython versions 2.7, 3.4, 3.5 and 3.6. Special thanks to Jetbrains for funding the native profiling support.
+
+What is vmprof?
+===============
+
+If you have already worked with vmprof you can skip the next two section. If not, here is a short introduction:
+
+
+The goal of vmprof package is to give you more insight into your program. It is a statistical profiler. Another prominent profiler you might already have worked with is cProfile. It is bundled with the Python standard library.
+
+
+vmprof's distinct feature (from most other profilers) is that it does not significantly slow down your program execution. The employed strategy is statistical, rather than deterministic. Not every function call is intercepted, but it samples stack traces and memory usage at a configured sample rate (usually around 100hz). You can imagine that this creates a lot less contention than doing work before and after each function call.
+
+
+As mentioned earlier cProfile gives you a complete profile, but it needs to intercept every function call (it is a deterministic profiler). Usually this means that you have to capture and record every function call, but this takes an significant amount time.
+
+
+The overhead vmprof consumes is roughly 3-4% of your total program runtime or even less if you reduce the sampling frequency. Indeed it lets you sample and inspect much larger programs. If you failed to profile a large application with cProfile, please give vmprof a shot.
+
+
+vmprof.com or PyCharm
+======================
+
+
+There are two major alternative to the command line tools shipped with vmprof.
+
+    A web service on vmprof.com
+    A commercial version of PyCharm
+
+Since the PyPy Team runs and maintains the service on vmprof.com I'll explain some more details here. Still PyCharm is a great IDE and uses vmprof to display the statistical profiles. We highly recommend to use either of those, the command line tool is only good for quick inspection.
+
+
+On vmprof.com you can inspect the generated profile interactively instead of looking at console output. What is sent to vmprof.com? You can find details here.
+
+
+There are currently three visualizations we'll quickly explain:
+
+
+Flamegraph: Accumulates and displays the most frequent codepaths. It allows you to quickly and accurately identify hot spots in your code. The flame graph below is a very short run of richards.py (less. Thus it shows a lot of time spent in PyPy's JIT compiler.
+
+<image>
+
+List all functions (optionally sorted): the equivalent of the vmprof command line output in the web.
+
+<image>
+
+Memory curve: A line plot that shows how how many MBytes have been consumed over the lifetime of your program (see more info in the section below).
+
+<image>
+
+Native programs
+===============
+
+The new feature introduced in vmprof 0.4.0 allows you to look beyond the Python level. As you might know, Python maintains a stack of frames to save the execution. Up to now the vmprof profiles only contained that level of information. But what if you program jumps to native code (such as calling gzip compression on a large file)? Up to now you would not see that information.
+
+
+Many packages make use of the CPython C API (which we discurage, please lookup cffi for a better way to call C). Have you ever had the issue that you know that your performance problems reach down to, but you could not profile it properly? Now you can!
+
+
+Let's inspect a very simple Python program to find out why a program is significantly slower on Linux than on Mac:
+
+
+import numpy as np
+n = 1000
+a = np.random.random((n, n))
+b = np.random.random((n, n))
+c = np.dot(np.abs(a), b)
+
+
+Take two NxN random matrix objects and create a dot product. The first argument to the dot product provides the absolute value of the random matrix.
+
+
+Run, Python, NumPy, OS, n=..., Took
+[1] CPython 3.5.2, NumPy 1.12.1, Mac OS X, 10.12.3, n=5000, ~9 sec
+[2] CPython 3.6.0, NumPy 1.12.1, Linux 64, Kernel 4.9.14, n=1000, ~26 sec
+
+Note that the Linux machine operates on a 5 times smaller matrix, still it takes much longer. What is wrong? Is Linux slow? CPython 3.6.0? Well no, lets inspect and [1] and [2] (shown below in that order).
+
+[2] runs on Linux, spends nearly all of the time in PyArray_MatrixProduct2, if you compare to [1] on Mac OS X, you'll see that a lot of time is spent in generating the random numbers and the rest in cblas_matrixproduct.
+
+Blas has a very efficient implementation so you can achieve the same on Linux if you install a blas implementation (such as openblas).
+
+Usually you can spot potential program source locations that take a lot of time and might be the first starting point to resolve performance issues.
+
+Beyond Python programs
+======================
+
+
+It is not unthinkable that the strategy can be reused for native programs. Indeed this can already be done by creating a small cffi wrapper around an entry point of a compiled C program. It would even work for programs compiled from other languages (e.g. C++ or Fortran). The resulting function names are the full symbol name embedded into either the executable symboltable or extracted from the dwarf debugging information. Most of those will be compiler specific and contain some cryptic information.
+
+Memory profiling
+================
+
+We thankfully received a code contribution from the company Blue Yonder. They have built a memory profiler (for Linux and Mac OS X) on top of vmprof.com that displays the memory consumption for the runtime of your process.
+
+You can run it the following way:
+
+
+$ python -m vmprof --mem --web script.py
+
+
+By adding --mem, vmprof will capture memory information and display it in the dedicated view on vmprof.com. You can tha view by by clicking the 'Memory' switch in the flamegraph view.
+
+
+There is more
+
+
+Some more minor highlights contained in 0.4.x:
+
+    VMProf support for Windows 64 bit (python only)
+    VMProf can read profiles generated by another host system
+    VMProf is now bundled in several binary wheel for fast and easy installation (Mac OS X, Linux 32/64 for CPython 2.7, 3.4, 3.5, 3.6)
+
+Future plans - Profile Streaming
+================================
+
+
+vmprof has not reached the end of development. There are many features we could implement. But there is one feature that could be a great asset to many Python developers.
+
+
+Continuous delivery of your statistical profile, or in short, profile streaming. One of the great strengths of vmprof is that is consumes very little overhead. It is not a crazy idea to run this in production.
+
+
+It would require a smart way to stream the profile in the background to vmprof.com and new visualizations to look at much more data your Python service produces.
+
+
+If that sounds like a solid vmprof improvement, don't hesitate to get in touch with us (e.g. IRC #pypy, mailing list pypy-dev, or comment below)
+
+
+You can help!
+=============
+
+
+There are some immediate things other people could help with. Either by donating time or money (yes we have occasional contributors which is great)!
+
+    We gladly received code contribution for the memory profiler. But it was not enough time to finish the migration completely. Sadly it is a bit brittle right now.
+    We would like to spend more time on other visualizations. This should include to give a much better user experience on vmprof.com (like a tutorial that explains the visualization that we already have). 
+    Build Windows 32/64 bit wheels (for all CPython versions we currently support)
+
+We are also happy to accept google summer of code projects on vmprof for new visualizations and other improvements. If you qualify and are interested, don't hesitate to ask!
+
+
+Richard Plangger (plan_rich) and the PyPy Team
+
+
+[1] Mac OS X http://vmprof.com/#/567aa150-5927-4867-b22d-dbb67ac824ac
+[2] Linux64 http://vmprof.com/#/097fded2-b350-4d68-ae93-7956cd10150c

From pypy.commits at gmail.com  Sat Apr  1 11:22:55 2017
From: pypy.commits at gmail.com (rlamy)
Date: Sat, 01 Apr 2017 08:22:55 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Remove BinaryBuffer API from Buffer:
 getitem(), setitem(), getslice(), setslice()
Message-ID: <58dfc5cf.4ca8df0a.cbf22.1496@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r90893:d7d49f4a1803
Date: 2017-04-01 16:22 +0100
http://bitbucket.org/pypy/pypy/changeset/d7d49f4a1803/

Log:	Remove BinaryBuffer API from Buffer: getitem(), setitem(),
	getslice(), setslice()

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -15,23 +15,6 @@
         "Returns an interp-level string with the whole content of the buffer."
         return ''.join(self._copy_buffer())
 
-    def getitem(self, index):
-        "Returns the index'th character in the buffer."
-        raise NotImplementedError   # Must be overriden.  No bounds checks.
-
-    def getslice(self, start, stop, step, size):
-        # May be overridden.  No bounds checks.
-        return ''.join([self.getitem(i) for i in range(start, stop, step)])
-
-    def setitem(self, index, char):
-        "Write a character into the buffer."
-        raise NotImplementedError   # Must be overriden.  No bounds checks.
-
-    def setslice(self, start, string):
-        # May be overridden.  No bounds checks.
-        for i in range(len(string)):
-            self.setitem(start + i, string[i])
-
     def get_raw_address(self):
         raise ValueError("no raw buffer")
 
@@ -109,12 +92,6 @@
     def as_str(self):
         return self.data.as_str()
 
-    def getitem(self, index):
-        return self.data.getitem(index)
-
-    def setitem(self, index, value):
-        return self.data.setitem(index, value)
-
     def get_raw_address(self):
         return self.data.get_raw_address()
 
@@ -237,7 +214,7 @@
             if start == 0 and stop == len(self.value):
                 return self.value
             return self.value[start:stop]
-        return Buffer.getslice(self, start, stop, step, size)
+        return BinaryBuffer.getslice(self, start, stop, step, size)
 
     def get_raw_address(self):
         from rpython.rtyper.lltypesystem import rffi
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -695,25 +695,6 @@
     def getlength(self):
         return self.shape[0] * self.getitemsize()
 
-    def getitem(self, index):
-        return self.buf.getitem(self.offset + index)
-
-    def setitem(self, index, char):
-        self.buf.setitem(self.offset + index, char)
-
-    def getslice(self, start, stop, step, size):
-        if start == stop:
-            return ''     # otherwise, adding self.offset might make them
-                          # out of bounds
-        return self.buf.getslice(self.offset + start, self.offset + stop,
-                                    step, size)
-
-    def setslice(self, start, string):
-        if len(string) == 0:
-            return        # otherwise, adding self.offset might make 'start'
-                          # out of bounds
-        self.buf.setslice(self.offset + start, string)
-
     def get_raw_address(self):
         from rpython.rtyper.lltypesystem import rffi
         ptr = self.buf.get_raw_address()
@@ -748,18 +729,6 @@
     def as_str_and_offset_maybe(self):
         return self.parent.as_str_and_offset_maybe()
 
-    def getitem(self, index):
-        return self.parent.getitem(index)
-
-    def setitem(self, index, value):
-        return self.parent.setitem(index, value)
-
-    def getslice(self, start, stop, step, size):
-        return self.parent.getslice(start, stop, step, size)
-
-    def setslice(self, start, string):
-        self.parent.setslice(start, string)
-
     def get_raw_address(self):
         return self.parent.get_raw_address()
 

From pypy.commits at gmail.com  Sat Apr  1 11:22:52 2017
From: pypy.commits at gmail.com (rlamy)
Date: Sat, 01 Apr 2017 08:22:52 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Fix PyBuffer/BinaryBuffer confusion in
 _cffi_backend
Message-ID: <58dfc5cc.d4b2df0a.b60ec.1638@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r90891:d8147a9479bc
Date: 2017-04-01 02:13 +0100
http://bitbucket.org/pypy/pypy/changeset/d8147a9479bc/

Log:	Fix PyBuffer/BinaryBuffer confusion in _cffi_backend

diff --git a/pypy/module/_cffi_backend/cbuffer.py b/pypy/module/_cffi_backend/cbuffer.py
--- a/pypy/module/_cffi_backend/cbuffer.py
+++ b/pypy/module/_cffi_backend/cbuffer.py
@@ -79,20 +79,20 @@
         if space.isinstance_w(w_other, space.w_unicode):
             return space.w_NotImplemented
         try:
-            other_buf = space.buffer_w(w_other, space.BUF_SIMPLE)
+            other_pybuf = space.buffer_w(w_other, space.BUF_SIMPLE)
         except OperationError as e:
             if e.async(space):
                 raise
             return space.w_NotImplemented
         my_buf = self.buffer
         my_len = len(my_buf)
-        other_len = len(other_buf)
+        other_len = other_pybuf.getlength()
         if other_len != my_len:
             if mode == 'E':
                 return space.w_False
             if mode == 'N':
                 return space.w_True
-        cmp = _memcmp(my_buf, other_buf, min(my_len, other_len))
+        cmp = _memcmp(my_buf, other_pybuf.as_binary(), min(my_len, other_len))
         if cmp == 0:
             if my_len < other_len:
                 cmp = -1

From pypy.commits at gmail.com  Sat Apr  1 11:22:54 2017
From: pypy.commits at gmail.com (rlamy)
Date: Sat, 01 Apr 2017 08:22:54 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Remove __len__ and __getitem__ from
 Buffer API
Message-ID: <58dfc5ce.97e61c0a.626da.e5df@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r90892:a4ec60792800
Date: 2017-04-01 02:26 +0100
http://bitbucket.org/pypy/pypy/changeset/a4ec60792800/

Log:	Remove __len__ and __getitem__ from Buffer API

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -11,11 +11,6 @@
         """Returns the size in bytes (even if getitemsize() > 1)."""
         raise NotImplementedError
 
-    def __len__(self):
-        res = self.getlength()
-        assert res >= 0
-        return res
-
     def as_str(self):
         "Returns an interp-level string with the whole content of the buffer."
         return ''.join(self._copy_buffer())
@@ -24,9 +19,6 @@
         "Returns the index'th character in the buffer."
         raise NotImplementedError   # Must be overriden.  No bounds checks.
 
-    def __getitem__(self, i):
-        return self.getitem(i)
-
     def getslice(self, start, stop, step, size):
         # May be overridden.  No bounds checks.
         return ''.join([self.getitem(i) for i in range(start, stop, step)])

From pypy.commits at gmail.com  Sat Apr  1 12:02:44 2017
From: pypy.commits at gmail.com (arigo)
Date: Sat, 01 Apr 2017 09:02:44 -0700 (PDT)
Subject: [pypy-commit] pypy default: Be explicit about not-implemented slot
 wrappers, rather than defaulting
Message-ID: <58dfcf24.16a1df0a.3ba5d.22ba@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90894:20b913db347d
Date: 2017-04-01 18:02 +0200
http://bitbucket.org/pypy/pypy/changeset/20b913db347d/

Log:	Be explicit about not-implemented slot wrappers, rather than
	defaulting to that if we don't find any global function with the
	correct name

diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -810,6 +810,9 @@
         wrapper = None
     else:
         wrapper = globals().get(WRAPPER, Ellipsis)
+        if wrapper is Ellipsis:
+            assert WRAPPER.endswith('_XXX'), (
+                "no wrapper function called %r in slotdefs.py" % WRAPPER)
 
     # irregular interface, because of tp_getattr/tp_getattro confusion
     if NAME == "__getattr__":
@@ -826,6 +829,7 @@
         if wrapper is Ellipsis:
             @func_renamer(WRAPPER)
             def wrapper(space, w_self, w_args, func, w_kwds):
+                print "cpyext missing wrapper", WRAPPER, "for", NAME
                 raise NotImplementedError("Wrapper for slot " + NAME)
         wrapper1 = None
         wrapper2 = wrapper
@@ -833,6 +837,7 @@
         if wrapper is Ellipsis:
             @func_renamer(WRAPPER)
             def wrapper(space, w_self, w_args, func):
+                print "cpyext missing wrapper", WRAPPER, "for", NAME
                 raise NotImplementedError("Wrapper for slot " + NAME)
         wrapper1 = wrapper
         wrapper2 = None
@@ -879,15 +884,18 @@
 # Copy new slotdefs from typeobject.c
 # Remove comments and tabs
 # Done.
+# XXX NOTE that we already tweaked that string manually!
+# Also, a few wrapper functions have a name ending in "_XXX" to mean
+# that we know it is not implemented so far.
 slotdefs_str = r"""
 static slotdef slotdefs[] = {
         SQSLOT("__len__", sq_length, slot_sq_length, wrap_lenfunc,
                "x.__len__() <==> len(x)"),
         SQSLOT("__add__", sq_concat, slot_sq_concat, wrap_binaryfunc,
           "x.__add__(y) <==> x+y"),
-        SQSLOT("__mul__", sq_repeat, NULL, wrap_indexargfunc,
+        SQSLOT("__mul__", sq_repeat, NULL, wrap_indexargfunc_XXX,
           "x.__mul__(n) <==> x*n"),
-        SQSLOT("__rmul__", sq_repeat, NULL, wrap_indexargfunc,
+        SQSLOT("__rmul__", sq_repeat, NULL, wrap_indexargfunc_XXX,
           "x.__rmul__(n) <==> n*x"),
         SQSLOT("__getitem__", sq_item, slot_sq_item, wrap_sq_item,
                "x.__getitem__(y) <==> x[y]"),
@@ -904,7 +912,7 @@
                "x.__setslice__(i, j, y) <==> x[i:j]=y\n\
                \n\
                Use  of negative indices is not supported."),
-        SQSLOT("__delslice__", sq_ass_slice, slot_sq_ass_slice, wrap_delslice,
+        SQSLOT("__delslice__", sq_ass_slice, slot_sq_ass_slice, wrap_delslice_XXX,
                "x.__delslice__(i, j) <==> del x[i:j]\n\
                \n\
                Use of negative indices is not supported."),
@@ -913,7 +921,7 @@
         SQSLOT("__iadd__", sq_inplace_concat, NULL,
           wrap_binaryfunc, "x.__iadd__(y) <==> x+=y"),
         SQSLOT("__imul__", sq_inplace_repeat, NULL,
-          wrap_indexargfunc, "x.__imul__(y) <==> x*=y"),
+          wrap_indexargfunc_XXX, "x.__imul__(y) <==> x*=y"),
 
         MPSLOT("__len__", mp_length, slot_mp_length, wrap_lenfunc,
                "x.__len__() <==> len(x)"),
@@ -972,7 +980,7 @@
         RBINSLOT("__rxor__", nb_xor, slot_nb_xor, "^"),
         BINSLOT("__or__", nb_or, slot_nb_or, "|"),
         RBINSLOT("__ror__", nb_or, slot_nb_or, "|"),
-        NBSLOT("__coerce__", nb_coerce, slot_nb_coerce, wrap_coercefunc,
+        NBSLOT("__coerce__", nb_coerce, slot_nb_coerce, wrap_coercefunc_XXX,
                "x.__coerce__(y) <==> coerce(x, y)"),
         UNSLOT("__int__", nb_int, slot_nb_int, wrap_unaryfunc,
                "int(x)"),

From pypy.commits at gmail.com  Sat Apr  1 12:12:29 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 09:12:29 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: CPython makes a difference between
 OSError(None, None) and OSError(), 
Message-ID: <58dfd16d.c791df0a.48e0c.237c@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90895:259a16de4c00
Date: 2017-04-01 14:35 +0200
http://bitbucket.org/pypy/pypy/changeset/259a16de4c00/

Log:	CPython makes a difference between OSError(None,None) and OSError(),
	do the same in PyPy

diff --git a/pypy/module/exceptions/interp_exceptions.py b/pypy/module/exceptions/interp_exceptions.py
--- a/pypy/module/exceptions/interp_exceptions.py
+++ b/pypy/module/exceptions/interp_exceptions.py
@@ -443,10 +443,10 @@
     """OS system call failed."""
 
     def __init__(self, space):
-        self.w_errno = space.w_None
-        self.w_strerror = space.w_None
-        self.w_filename = space.w_None
-        self.w_filename2 = space.w_None
+        self.w_errno = None
+        self.w_strerror = None
+        self.w_filename = None
+        self.w_filename2 = None
         self.written = -1  # only for BlockingIOError.
         W_BaseException.__init__(self, space)
 
@@ -556,9 +556,9 @@
     # since we rebind args_w, we need special reduce, grump
     def descr_reduce(self, space):
         extra = []
-        if not space.is_w(self.w_filename, space.w_None):
+        if self.w_filename:
             extra.append(self.w_filename)
-            if not space.is_w(self.w_filename2, space.w_None):
+            if self.w_filename2:
                 extra.append(space.w_None)
                 extra.append(self.w_filename2)
         lst = [self.getclass(space), space.newtuple(self.args_w + extra)]
@@ -567,25 +567,26 @@
         return space.newtuple(lst)
 
     def descr_str(self, space):
-        if (not space.is_w(self.w_errno, space.w_None) and
-            not space.is_w(self.w_strerror, space.w_None)):
+        if self.w_errno:
             errno = space.unicode_w(space.str(self.w_errno))
+        else:
+            errno = u""
+        if self.w_strerror:
             strerror = space.unicode_w(space.str(self.w_strerror))
-            if not space.is_w(self.w_filename, space.w_None):
-                if not space.is_w(self.w_filename2, space.w_None):
-                    return space.newunicode(u"[Errno %s] %s: %s -> %s" % (
-                        errno,
-                        strerror,
-                        space.unicode_w(space.repr(self.w_filename)),
-                        space.unicode_w(space.repr(self.w_filename2))))
-                return space.newunicode(u"[Errno %s] %s: %s" % (
-                    errno,
-                    strerror,
-                    space.unicode_w(space.repr(self.w_filename))))
+        else:
+            strerror = u""
+        if self.w_filename:
+            if self.w_filename2:
+                return space.newunicode(u"[Errno %s] %s: %s -> %s" % (
+                    errno, strerror,
+                    space.unicode_w(space.repr(self.w_filename)),
+                    space.unicode_w(space.repr(self.w_filename2))))
+            return space.newunicode(u"[Errno %s] %s: %s" % (
+                errno, strerror,
+                space.unicode_w(space.repr(self.w_filename))))
+        if self.w_errno and self.w_strerror:
             return space.newunicode(u"[Errno %s] %s" % (
-                errno,
-                strerror,
-            ))
+                errno, strerror))
         return W_BaseException.descr_str(self, space)
 
     def descr_get_written(self, space):
@@ -637,7 +638,7 @@
             not space.is_w(self.w_strerror, space.w_None)):
             winerror = space.int_w(self.w_winerror)
             strerror = space.unicode_w(self.w_strerror)
-            if not space.is_w(self.w_filename, space.w_None):
+            if self.w_filename:
                 return space.newunicode(u"[Error %d] %s: %s" % (
                     winerror,
                     strerror,
diff --git a/pypy/module/exceptions/test/test_exc.py b/pypy/module/exceptions/test/test_exc.py
--- a/pypy/module/exceptions/test/test_exc.py
+++ b/pypy/module/exceptions/test/test_exc.py
@@ -2,8 +2,6 @@
 
 
 class AppTestExc(object):
-    spaceconfig = dict(usemodules=('exceptions',))
-
     def setup_class(cls):
         cls.w_file = cls.space.wrap(__file__)
 
@@ -392,6 +390,12 @@
         assert e.filename2 == "bok"
         assert str(e) == "[Errno 42] bar: 'baz' -> 'bok'"
 
+    def test_oserror_None(self):
+        assert str(OSError()) == ""
+        assert str(OSError(None)) == "None"
+        assert str(OSError(None, None)) == "[Errno None] None"
+        assert str(OSError(None, None, None, None)) == "[Errno None] None"
+
     # Check the heuristic for print & exec covers significant cases
     # As well as placing some limits on false positives
     def test_former_statements_refer_to_builtins(self):

From pypy.commits at gmail.com  Sat Apr  1 12:12:31 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 09:12:31 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Remove WindowsError,
 and add support for the "winerror" parameter in OSError.
Message-ID: <58dfd16f.92061c0a.eba0.af88@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90896:1b8d1cb66a57
Date: 2017-04-01 18:11 +0200
http://bitbucket.org/pypy/pypy/changeset/1b8d1cb66a57/

Log:	Remove WindowsError, and add support for the "winerror" parameter in
	OSError. Also maybe fix wrap_oserror on Windows.

	This is a shoot in the dark: I don't have Windows. But most of
	interp_exceptions can be tested on Linux.

diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
--- a/pypy/interpreter/error.py
+++ b/pypy/interpreter/error.py
@@ -9,6 +9,7 @@
 from rpython.rlib.objectmodel import we_are_translated, specialize
 from rpython.rlib.objectmodel import dont_inline
 from rpython.rlib import rstack, rstackovf
+from rpython.rlib import rwin32
 
 from pypy.interpreter import debug
 
@@ -568,33 +569,6 @@
     # 31: ANSI color code "red"
     ansi_print(text, esc="31", file=file, newline=newline)
 
-try:
-    WindowsError
-except NameError:
-    _WINDOWS = False
-else:
-    _WINDOWS = True
-
-    def wrap_windowserror(space, e, w_filename=None):
-        XXX    # WindowsError no longer exists in Py3.5
-               # instead, OSError has a kwarg winerror that overrides
-               # any errno supplied
-        from rpython.rlib import rwin32
-
-        winerror = e.winerror
-        try:
-            msg = rwin32.FormatError(winerror)
-        except ValueError:
-            msg = 'Windows Error %d' % winerror
-        exc = space.w_WindowsError
-        if w_filename is not None:
-            w_error = space.call_function(exc, space.newint(winerror),
-                                          space.newtext(msg), w_filename)
-        else:
-            w_error = space.call_function(exc, space.newint(winerror),
-                                          space.newtext(msg))
-        return OperationError(exc, w_error)
-
 @specialize.arg(3, 6)
 def wrap_oserror2(space, e, w_filename=None, exception_name='w_OSError',
                   w_exception_class=None, w_filename2=None, eintr_retry=False):
@@ -612,9 +586,6 @@
     """
     assert isinstance(e, OSError)
 
-    if _WINDOWS and isinstance(e, WindowsError):
-        return wrap_windowserror(space, e, w_filename)
-
     if w_exception_class is None:
         w_exc = getattr(space, exception_name)
     else:
@@ -631,28 +602,37 @@
 def _wrap_oserror2_impl(space, e, w_filename, w_filename2, w_exc, eintr_retry):
     # move the common logic in its own function, instead of having it
     # duplicated 4 times in all 4 specialized versions of wrap_oserror2()
-    errno = e.errno
 
-    if errno == EINTR:
-        space.getexecutioncontext().checksignals()
-        if eintr_retry:
-            return None
+    if rwin32.WIN32 and isinstance(e, WindowsError):
+        winerror = e.winerror
+        try:
+            msg = rwin32.FormatError(winerror)
+        except ValueError:
+            msg = 'Windows Error %d' % winerror
+        w_errno = space.w_None
+        w_winerror = space.newint(winerror)
+        w_msg = space.newtext(msg)
+    else:
+        errno = e.errno
+        if errno == EINTR:
+            space.getexecutioncontext().checksignals()
+            if eintr_retry:
+                return None
 
-    try:
-        msg = strerror(errno)
-    except ValueError:
-        msg = u'error %d' % errno
-    if w_filename is not None:
-        if w_filename2 is not None:
-            w_error = space.call_function(w_exc, space.newint(errno),
-                                          space.newunicode(msg), w_filename,
-                                          space.w_None, w_filename2)
-        else:
-            w_error = space.call_function(w_exc, space.newint(errno),
-                                          space.newunicode(msg), w_filename)
-    else:
-        w_error = space.call_function(w_exc, space.newint(errno),
-                                      space.newunicode(msg))
+        try:
+            msg = strerror(errno)
+        except ValueError:
+            msg = u'error %d' % errno
+        w_errno = space.newint(errno)
+        w_winerror = space.w_None
+        w_msg = space.newunicode(msg)
+
+    if w_filename is None:
+        w_filename = space.w_None
+    if w_filename2 is None:
+        w_filename2 = space.w_None
+    w_error = space.call_function(w_exc, w_errno, w_msg, w_filename,
+                                  w_winerror, w_filename2)
     operror = OperationError(w_exc, w_error)
     if eintr_retry:
         raise operror
diff --git a/pypy/module/exceptions/__init__.py b/pypy/module/exceptions/__init__.py
--- a/pypy/module/exceptions/__init__.py
+++ b/pypy/module/exceptions/__init__.py
@@ -1,4 +1,4 @@
-import sys
+from rpython.rlib import rwin32
 from pypy.interpreter.mixedmodule import MixedModule
 
 class Module(MixedModule):
@@ -73,8 +73,8 @@
         'ZeroDivisionError' : 'interp_exceptions.W_ZeroDivisionError',
         }
 
-    if sys.platform.startswith("win"):
-        interpleveldefs['WindowsError'] = 'interp_exceptions.W_WindowsError'
+    if rwin32.WIN32:
+        interpleveldefs['WindowsError'] = 'interp_exceptions.W_OSError'
 
     def setup_after_space_initialization(self):
         from pypy.objspace.std.transparent import register_proxyable
diff --git a/pypy/module/exceptions/interp_exceptions.py b/pypy/module/exceptions/interp_exceptions.py
--- a/pypy/module/exceptions/interp_exceptions.py
+++ b/pypy/module/exceptions/interp_exceptions.py
@@ -444,6 +444,7 @@
 
     def __init__(self, space):
         self.w_errno = None
+        self.w_winerror = None
         self.w_strerror = None
         self.w_filename = None
         self.w_filename2 = None
@@ -476,18 +477,36 @@
             w_errno = args_w[0]
             w_strerror = args_w[1]
             w_filename = None
+            w_winerror = None
             w_filename2 = None
             if len(args_w) > 2:
                 w_filename = args_w[2]
-                if len(args_w) > 4:
-                    w_filename2 = args_w[4]
-            return w_errno, w_strerror, w_filename, w_filename2
-        return None, None, None, None
+                if len(args_w) > 3:
+                    w_winerror = args_w[3]
+                    if len(args_w) > 4:
+                        w_filename2 = args_w[4]
+            if rwin32.WIN32 and w_winerror:
+                # Under Windows, if the winerror constructor argument is
+                # an integer, the errno attribute is determined from the
+                # Windows error code, and the errno argument is
+                # ignored.
+                # On other platforms, the winerror argument is
+                # ignored, and the winerror attribute does not exist.
+                try:
+                    winerror = space.int_w(w_winerror)
+                except OperationError:
+                    w_winerror = None
+                else:
+                    w_errno = space.newint(
+                        WINERROR_TO_ERRNO.get(winerror, DEFAULT_WIN32_ERRNO))
+            return w_errno, w_winerror, w_strerror, w_filename, w_filename2
+        return None, None, None, None, None
 
     @staticmethod
     def descr_new(space, w_subtype, __args__):
         args_w, kwds_w = __args__.unpack()
         w_errno = None
+        w_winerror = None
         w_strerror = None
         w_filename = None
         w_filename2 = None
@@ -495,7 +514,7 @@
             if kwds_w:
                 raise oefmt(space.w_TypeError,
                             "OSError does not take keyword arguments")
-            (w_errno, w_strerror, w_filename, w_filename2
+            (w_errno, w_winerror, w_strerror, w_filename, w_filename2
              ) = W_OSError._parse_init_args(space, args_w)
         if (not space.is_none(w_errno) and
             space.is_w(w_subtype, space.gettypeobject(W_OSError.typedef))):
@@ -513,8 +532,8 @@
         exc = space.allocate_instance(W_OSError, w_subtype)
         W_OSError.__init__(exc, space)
         if not W_OSError._use_init(space, w_subtype):
-            exc._init_error(space, args_w, w_errno, w_strerror, w_filename,
-                            w_filename2)
+            exc._init_error(space, args_w, w_errno, w_winerror, w_strerror,
+                            w_filename, w_filename2)
         return exc
 
     def descr_init(self, space, __args__):
@@ -525,18 +544,17 @@
         if kwds_w:
             raise oefmt(space.w_TypeError,
                         "OSError does not take keyword arguments")
-        (w_errno, w_strerror, w_filename, w_filename2
+        (w_errno, w_winerror, w_strerror, w_filename, w_filename2
          ) = W_OSError._parse_init_args(space, args_w)
-        self._init_error(space, args_w, w_errno, w_strerror, w_filename,
-                         w_filename2)
+        self._init_error(space, args_w, w_errno, w_winerror, w_strerror,
+                         w_filename, w_filename2)
 
-    def _init_error(self, space, args_w, w_errno, w_strerror, w_filename,
-                    w_filename2):
+    def _init_error(self, space, args_w, w_errno, w_winerror, w_strerror,
+                    w_filename, w_filename2):
         W_BaseException.descr_init(self, space, args_w)
-        if w_errno:
-            self.w_errno = w_errno
-        if w_strerror:
-            self.w_strerror = w_strerror
+        self.w_errno = w_errno
+        self.w_winerror = w_winerror
+        self.w_strerror = w_strerror
 
         if not space.is_none(w_filename):
             if space.isinstance_w(
@@ -546,7 +564,8 @@
                 except OperationError:
                     self.w_filename = w_filename
             else:
-                self.w_filename = w_filename
+                if not space.is_none(w_filename):
+                    self.w_filename = w_filename
                 if not space.is_none(w_filename2):
                     self.w_filename2 = w_filename2
                 # filename is removed from the args tuple (for compatibility
@@ -575,6 +594,20 @@
             strerror = space.unicode_w(space.str(self.w_strerror))
         else:
             strerror = u""
+        if rwin32.WIN32 and self.w_winerror:
+            winerror = space.unicode_w(space.str(self.w_winerror))
+            # If available, winerror has the priority over errno
+            if self.w_filename:
+                if self.w_filename2:
+                    return space.newunicode(u"[WinError %s] %s: %s -> %s" % (
+                        winerror, strerror,
+                        space.unicode_w(space.repr(self.w_filename)),
+                        space.unicode_w(space.repr(self.w_filename2))))
+                return space.newunicode(u"[WinError %s] %s: %s" % (
+                    winerror, strerror,
+                    space.unicode_w(space.repr(self.w_filename))))
+            return space.newunicode(u"[WinError %s] %s" % (
+                winerror, strerror))
         if self.w_filename:
             if self.w_filename2:
                 return space.newunicode(u"[Errno %s] %s: %s -> %s" % (
@@ -597,6 +630,12 @@
     def descr_set_written(self, space, w_written):
         self.written = space.int_w(w_written)
 
+
+if hasattr(rwin32, 'build_winerror_to_errno'):
+    WINERROR_TO_ERRNO, DEFAULT_WIN32_ERRNO = rwin32.build_winerror_to_errno()
+else:
+    WINERROR_TO_ERRNO, DEFAULT_WIN32_ERRNO = {}, 22 # EINVAL
+
 W_OSError.typedef = TypeDef(
     'OSError',
     W_Exception.typedef,
@@ -609,62 +648,11 @@
     strerror = readwrite_attrproperty_w('w_strerror', W_OSError),
     filename = readwrite_attrproperty_w('w_filename', W_OSError),
     filename2= readwrite_attrproperty_w('w_filename2',W_OSError),
+    winerror = readwrite_attrproperty_w('w_winerror', W_OSError),
     characters_written = GetSetProperty(W_OSError.descr_get_written,
                                         W_OSError.descr_set_written),
     )
 
-class W_WindowsError(W_OSError):
-    """MS-Windows OS system call failed."""
-
-    def __init__(self, space):
-        self.w_winerror = space.w_None
-        W_OSError.__init__(self, space)
-
-    def descr_init(self, space, __args__):
-        # Set errno to the POSIX errno, and winerror to the Win32
-        # error code.
-        W_OSError.descr_init(self, space, __args__)
-        try:
-            errno = space.int_w(self.w_errno)
-        except OperationError:
-            errno = self._default_errno
-        else:
-            errno = self._winerror_to_errno.get(errno, self._default_errno)
-        self.w_winerror = self.w_errno
-        self.w_errno = space.newint(errno)
-
-    def descr_str(self, space):
-        if (not space.is_w(self.w_winerror, space.w_None) and
-            not space.is_w(self.w_strerror, space.w_None)):
-            winerror = space.int_w(self.w_winerror)
-            strerror = space.unicode_w(self.w_strerror)
-            if self.w_filename:
-                return space.newunicode(u"[Error %d] %s: %s" % (
-                    winerror,
-                    strerror,
-                    space.unicode_w(self.w_filename)))
-            return space.newunicode(u"[Error %d] %s" % (winerror,
-                                                  strerror))
-        return W_BaseException.descr_str(self, space)
-
-    if hasattr(rwin32, 'build_winerror_to_errno'):
-        _winerror_to_errno, _default_errno = rwin32.build_winerror_to_errno()
-        # Python 2 doesn't map ERROR_DIRECTORY (267) to ENOTDIR but
-        # Python 3 (CPython issue #12802) and build_winerror_to_errno do
-        del _winerror_to_errno[267]
-    else:
-        _winerror_to_errno, _default_errno = {}, 22 # EINVAL
-
-W_WindowsError.typedef = TypeDef(
-    "WindowsError",
-    W_OSError.typedef,
-    __doc__  = W_WindowsError.__doc__,
-    __new__  = _new(W_WindowsError),
-    __init__ = interp2app(W_WindowsError.descr_init),
-    __str__  = interp2app(W_WindowsError.descr_str),
-    winerror = readwrite_attrproperty_w('w_winerror', W_WindowsError),
-    )
-
 W_BlockingIOError = _new_exception(
     "BlockingIOError", W_OSError, "I/O operation would block")
 W_ConnectionError = _new_exception(
diff --git a/pypy/module/exceptions/test/test_exc.py b/pypy/module/exceptions/test/test_exc.py
--- a/pypy/module/exceptions/test/test_exc.py
+++ b/pypy/module/exceptions/test/test_exc.py
@@ -101,12 +101,13 @@
             WindowsError
         except NameError:
             skip('WindowsError not present')
-        ee = WindowsError(3, "x", "y")
-        assert str(ee) == "[Error 3] x: y"
+        ee = WindowsError(None, "x", "y", 3)
+        assert type(ee) is FileNotFoundError
+        assert str(ee) == "[WinError 3] x: 'y'"
         # winerror=3 (ERROR_PATH_NOT_FOUND) maps to errno=2 (ENOENT)
         assert ee.winerror == 3
         assert ee.errno == 2
-        assert str(WindowsError(3, "x")) == "[Error 3] x"
+        assert str(WindowsError(3, "x")) == "[Errno 3] x"
 
     def test_syntax_error(self):
         s = SyntaxError()

From pypy.commits at gmail.com  Sat Apr  1 12:19:41 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 09:19:41 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: wrap_windowserror can be replaced by
 wrap_oserror, everywhere.
Message-ID: <58dfd31d.9d711c0a.b95d7.b007@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90897:3a59893aaaba
Date: 2017-04-01 18:19 +0200
http://bitbucket.org/pypy/pypy/changeset/3a59893aaaba/

Log:	wrap_windowserror can be replaced by wrap_oserror, everywhere.

diff --git a/pypy/module/_multiprocessing/interp_win32.py b/pypy/module/_multiprocessing/interp_win32.py
--- a/pypy/module/_multiprocessing/interp_win32.py
+++ b/pypy/module/_multiprocessing/interp_win32.py
@@ -4,7 +4,7 @@
 from rpython.rtyper.tool import rffi_platform
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
 
-from pypy.interpreter.error import oefmt, wrap_windowserror
+from pypy.interpreter.error import oefmt, wrap_oserror
 from pypy.interpreter.function import StaticMethod
 from pypy.interpreter.gateway import interp2app, unwrap_spec
 from pypy.module._multiprocessing.interp_connection import w_handle
@@ -106,7 +106,7 @@
 def CloseHandle(space, w_handle):
     handle = handle_w(space, w_handle)
     if not rwin32.CloseHandle(handle):
-        raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+        raise wrap_oserror(space, rwin32.lastSavedWindowsError())
 
 def GetLastError(space):
     return space.newint(rwin32.GetLastError_saved())
@@ -126,7 +126,7 @@
         outputsize, inputsize, timeout, rffi.NULL)
 
     if handle == rwin32.INVALID_HANDLE_VALUE:
-        raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+        raise wrap_oserror(space, rwin32.lastSavedWindowsError())
 
     return w_handle(space, handle)
 
@@ -136,7 +136,7 @@
     if overlapped:
         raise oefmt(space.w_NotImplementedError, "expected a NULL pointer")
     if not _ConnectNamedPipe(handle, rffi.NULL):
-        raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+        raise wrap_oserror(space, rwin32.lastSavedWindowsError())
 
 def SetNamedPipeHandleState(space, w_handle, w_pipemode, w_maxinstances,
                             w_timeout):
@@ -156,7 +156,7 @@
             statep[2] = rffi.ptradd(state, 2)
         if not _SetNamedPipeHandleState(handle, statep[0], statep[1],
                                         statep[2]):
-            raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+            raise wrap_oserror(space, rwin32.lastSavedWindowsError())
     finally:
         lltype.free(state, flavor='raw')
         lltype.free(statep, flavor='raw')
@@ -165,7 +165,7 @@
 def WaitNamedPipe(space, name, timeout):
     # Careful: zero means "default value specified by CreateNamedPipe()"
     if not _WaitNamedPipe(name, timeout):
-        raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+        raise wrap_oserror(space, rwin32.lastSavedWindowsError())
 
 @unwrap_spec(filename='fsencode', access=r_uint, share=r_uint,
              disposition=r_uint, flags=r_uint)
@@ -180,7 +180,7 @@
                          disposition, flags, rwin32.NULL_HANDLE)
 
     if handle == rwin32.INVALID_HANDLE_VALUE:
-        raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+        raise wrap_oserror(space, rwin32.lastSavedWindowsError())
 
     return w_handle(space, handle)
 
diff --git a/pypy/module/_winreg/interp_winreg.py b/pypy/module/_winreg/interp_winreg.py
--- a/pypy/module/_winreg/interp_winreg.py
+++ b/pypy/module/_winreg/interp_winreg.py
@@ -2,7 +2,7 @@
 from pypy.interpreter.baseobjspace import W_Root, BufferInterfaceNotFound
 from pypy.interpreter.gateway import interp2app, unwrap_spec
 from pypy.interpreter.typedef import TypeDef, GetSetProperty
-from pypy.interpreter.error import OperationError, oefmt, wrap_windowserror
+from pypy.interpreter.error import OperationError, oefmt, wrap_oserror
 from rpython.rtyper.lltypesystem import rffi, lltype
 from rpython.rlib import rwinreg, rwin32
 from rpython.rlib.rarithmetic import r_uint, intmask
@@ -702,7 +702,7 @@
     try:
         return space.newunicode(rwinreg.ExpandEnvironmentStrings(source))
     except WindowsError as e:
-        raise wrap_windowserror(space, e)
+        raise wrap_oserror(space, e)
 
 def DisableReflectionKey(space, w_key):
     """Disables registry reflection for 32-bit processes running on a 64-bit
diff --git a/pypy/module/time/interp_time.py b/pypy/module/time/interp_time.py
--- a/pypy/module/time/interp_time.py
+++ b/pypy/module/time/interp_time.py
@@ -39,7 +39,7 @@
     # timeout.  On Ctrl-C, the signal handler is called, the event is set,
     # and the wait function exits.
     from rpython.rlib import rwin32
-    from pypy.interpreter.error import wrap_windowserror, wrap_oserror
+    from pypy.interpreter.error import wrap_oserror
     from rpython.rlib import rthread as thread
 
     eci = ExternalCompilationInfo(
@@ -101,9 +101,9 @@
                 globalState.interrupt_event = rwin32.CreateEvent(
                     rffi.NULL, True, False, rffi.NULL)
             except WindowsError as e:
-                raise wrap_windowserror(space, e)
+                raise wrap_oserror(space, e)
             if not _setCtrlHandlerRoutine(globalState.interrupt_event):
-                raise wrap_windowserror(space,
+                raise wrap_oserror(space,
                     rwin32.lastSavedWindowsError("SetConsoleCtrlHandler"))
 
     globalState = GlobalState()
@@ -911,7 +911,7 @@
                                                   is_time_adjustment_disabled)
                     if not ok:
                         # Is this right? Cargo culting...
-                        raise wrap_windowserror(space,
+                        raise wrap_oserror(space,
                             rwin32.lastSavedWindowsError("GetSystemTimeAdjustment"))
                     resolution = resolution * time_increment[0]
                 _setinfo(space, w_info, implementation, resolution, True, False)
@@ -1020,7 +1020,7 @@
             worked = GetProcessTimes(current_process, creation_time, exit_time,
                                      kernel_time, user_time)
             if not worked:
-                raise wrap_windowserror(space,
+                raise wrap_oserror(space,
                     rwin32.lastSavedWindowsError("GetProcessTimes"))
             kernel_time2 = (kernel_time.c_dwLowDateTime |
                             r_ulonglong(kernel_time.c_dwHighDateTime) << 32)

From pypy.commits at gmail.com  Sat Apr  1 12:25:34 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 09:25:34 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: In cpyext,
 skip WindowsError when reading symbols from the exception modules.
Message-ID: <58dfd47e.ebafdf0a.a4ea2.2200@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90898:bf7f4f9cb1f4
Date: 2017-04-01 18:24 +0200
http://bitbucket.org/pypy/pypy/changeset/bf7f4f9cb1f4/

Log:	In cpyext, skip WindowsError when reading symbols from the exception
	modules.

diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@ -651,7 +651,7 @@
     global all_exceptions
     all_exceptions = list(exceptions.Module.interpleveldefs)
     for exc_name in all_exceptions:
-        if exc_name in ('EnvironmentError', 'IOError'):
+        if exc_name in ('EnvironmentError', 'IOError', 'WindowsError'):
             # FIXME: aliases of OSError cause a clash of names via
             # export_struct
             continue

From pypy.commits at gmail.com  Sat Apr  1 12:42:43 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 09:42:43 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Attempt to import interp_scandir on
 Windows
Message-ID: <58dfd883.16a1df0a.3ba5d.2d63@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90899:ba2d0d7ea48e
Date: 2017-04-01 18:42 +0200
http://bitbucket.org/pypy/pypy/changeset/ba2d0d7ea48e/

Log:	Attempt to import interp_scandir on Windows

diff --git a/rpython/rlib/rposix_scandir.py b/rpython/rlib/rposix_scandir.py
--- a/rpython/rlib/rposix_scandir.py
+++ b/rpython/rlib/rposix_scandir.py
@@ -1,4 +1,4 @@
-from rpython.rlib import rposix
+from rpython.rlib import rposix, rwin32
 from rpython.rlib.objectmodel import specialize
 from rpython.rtyper.lltypesystem import lltype, rffi
 
@@ -17,7 +17,8 @@
 def closedir(dirp):
     rposix.c_closedir(dirp)
 
-NULL_DIRP = lltype.nullptr(rposix.DIRP.TO)
+if not rwin32.WIN32:
+    NULL_DIRP = lltype.nullptr(rposix.DIRP.TO)
 
 def nextentry(dirp):
     """Read the next entry and returns an opaque object.

From pypy.commits at gmail.com  Sat Apr  1 12:51:02 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 09:51:02 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Convert one remaining space.wrap() in
 _winreg
Message-ID: <58dfda76.0eb7df0a.8f5d2.e3da@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90900:ed2af05e6735
Date: 2017-04-01 18:50 +0200
http://bitbucket.org/pypy/pypy/changeset/ed2af05e6735/

Log:	Convert one remaining space.wrap() in _winreg

diff --git a/pypy/module/_winreg/interp_winreg.py b/pypy/module/_winreg/interp_winreg.py
--- a/pypy/module/_winreg/interp_winreg.py
+++ b/pypy/module/_winreg/interp_winreg.py
@@ -110,7 +110,7 @@
     elif isinstance(w_hkey, W_HKEY):
         return w_hkey.hkey
     elif space.isinstance_w(w_hkey, space.w_int):
-        if space.is_true(space.lt(w_hkey, space.wrap(0))):
+        if space.is_true(space.lt(w_hkey, space.newint(0))):
             return rffi.cast(rwinreg.HKEY, space.int_w(w_hkey))
         return rffi.cast(rwinreg.HKEY, space.uint_w(w_hkey))
     else:

From pypy.commits at gmail.com  Sat Apr  1 13:01:43 2017
From: pypy.commits at gmail.com (rlamy)
Date: Sat, 01 Apr 2017 10:01:43 -0700 (PDT)
Subject: [pypy-commit] pypy default: kill _XXX and Ellipsis hacks
Message-ID: <58dfdcf7.9d711c0a.b95d7.bab4@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: 
Changeset: r90901:a09ae92a91a0
Date: 2017-04-01 18:01 +0100
http://bitbucket.org/pypy/pypy/changeset/a09ae92a91a0/

Log:	kill _XXX and Ellipsis hacks

diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -4,10 +4,10 @@
 
 from rpython.rtyper.lltypesystem import rffi, lltype
 from rpython.rlib.rarithmetic import widen
-from rpython.rlib import rgc # Force registration of gc.collect
+from rpython.rlib import rgc  # Force registration of gc.collect
 from pypy.module.cpyext.api import (
-    slot_function, generic_cpy_call, PyObject, Py_ssize_t, Py_TPFLAGS_CHECKTYPES,
-    pypy_decl, Py_buffer, Py_bufferP, PyTypeObjectPtr, cts)
+    slot_function, generic_cpy_call, PyObject, Py_ssize_t,
+    Py_TPFLAGS_CHECKTYPES, Py_buffer, Py_bufferP, PyTypeObjectPtr, cts)
 from pypy.module.cpyext.typeobjectdefs import (
     unaryfunc, ternaryfunc, binaryfunc,
     getattrfunc, getattrofunc, setattrofunc, lenfunc, ssizeargfunc, inquiry,
@@ -792,6 +792,16 @@
         return 0
     return buff_w
 
+missing_wrappers = ['wrap_indexargfunc', 'wrap_delslice', 'wrap_coercefunc']
+for name in missing_wrappers:
+    assert name not in globals()
+    def missing_wrapper(space, w_self, w_args, func, w_kwds):
+        print "cpyext: missing slot wrapper " + name
+        raise NotImplementedError("Slot wrapper " + name)
+    missing_wrapper.__name__ = name
+    globals()[name] = missing_wrapper
+
+
 PyWrapperFlag_KEYWORDS = 1
 
 class TypeSlot:
@@ -809,10 +819,7 @@
     if WRAPPER is None:
         wrapper = None
     else:
-        wrapper = globals().get(WRAPPER, Ellipsis)
-        if wrapper is Ellipsis:
-            assert WRAPPER.endswith('_XXX'), (
-                "no wrapper function called %r in slotdefs.py" % WRAPPER)
+        wrapper = globals()[WRAPPER]
 
     # irregular interface, because of tp_getattr/tp_getattro confusion
     if NAME == "__getattr__":
@@ -826,19 +833,9 @@
     function = getattr(userslot, FUNCTION or '!missing', None)
     assert FLAGS == 0 or FLAGS == PyWrapperFlag_KEYWORDS
     if FLAGS:
-        if wrapper is Ellipsis:
-            @func_renamer(WRAPPER)
-            def wrapper(space, w_self, w_args, func, w_kwds):
-                print "cpyext missing wrapper", WRAPPER, "for", NAME
-                raise NotImplementedError("Wrapper for slot " + NAME)
         wrapper1 = None
         wrapper2 = wrapper
     else:
-        if wrapper is Ellipsis:
-            @func_renamer(WRAPPER)
-            def wrapper(space, w_self, w_args, func):
-                print "cpyext missing wrapper", WRAPPER, "for", NAME
-                raise NotImplementedError("Wrapper for slot " + NAME)
         wrapper1 = wrapper
         wrapper2 = None
     return TypeSlot(NAME, SLOT, function, wrapper1, wrapper2, DOC)
@@ -885,17 +882,15 @@
 # Remove comments and tabs
 # Done.
 # XXX NOTE that we already tweaked that string manually!
-# Also, a few wrapper functions have a name ending in "_XXX" to mean
-# that we know it is not implemented so far.
 slotdefs_str = r"""
 static slotdef slotdefs[] = {
         SQSLOT("__len__", sq_length, slot_sq_length, wrap_lenfunc,
                "x.__len__() <==> len(x)"),
         SQSLOT("__add__", sq_concat, slot_sq_concat, wrap_binaryfunc,
           "x.__add__(y) <==> x+y"),
-        SQSLOT("__mul__", sq_repeat, NULL, wrap_indexargfunc_XXX,
+        SQSLOT("__mul__", sq_repeat, NULL, wrap_indexargfunc,
           "x.__mul__(n) <==> x*n"),
-        SQSLOT("__rmul__", sq_repeat, NULL, wrap_indexargfunc_XXX,
+        SQSLOT("__rmul__", sq_repeat, NULL, wrap_indexargfunc,
           "x.__rmul__(n) <==> n*x"),
         SQSLOT("__getitem__", sq_item, slot_sq_item, wrap_sq_item,
                "x.__getitem__(y) <==> x[y]"),
@@ -912,7 +907,7 @@
                "x.__setslice__(i, j, y) <==> x[i:j]=y\n\
                \n\
                Use  of negative indices is not supported."),
-        SQSLOT("__delslice__", sq_ass_slice, slot_sq_ass_slice, wrap_delslice_XXX,
+        SQSLOT("__delslice__", sq_ass_slice, slot_sq_ass_slice, wrap_delslice,
                "x.__delslice__(i, j) <==> del x[i:j]\n\
                \n\
                Use of negative indices is not supported."),
@@ -921,7 +916,7 @@
         SQSLOT("__iadd__", sq_inplace_concat, NULL,
           wrap_binaryfunc, "x.__iadd__(y) <==> x+=y"),
         SQSLOT("__imul__", sq_inplace_repeat, NULL,
-          wrap_indexargfunc_XXX, "x.__imul__(y) <==> x*=y"),
+          wrap_indexargfunc, "x.__imul__(y) <==> x*=y"),
 
         MPSLOT("__len__", mp_length, slot_mp_length, wrap_lenfunc,
                "x.__len__() <==> len(x)"),
@@ -980,7 +975,7 @@
         RBINSLOT("__rxor__", nb_xor, slot_nb_xor, "^"),
         BINSLOT("__or__", nb_or, slot_nb_or, "|"),
         RBINSLOT("__ror__", nb_or, slot_nb_or, "|"),
-        NBSLOT("__coerce__", nb_coerce, slot_nb_coerce, wrap_coercefunc_XXX,
+        NBSLOT("__coerce__", nb_coerce, slot_nb_coerce, wrap_coercefunc,
                "x.__coerce__(y) <==> coerce(x, y)"),
         UNSLOT("__int__", nb_int, slot_nb_int, wrap_unaryfunc,
                "int(x)"),

From pypy.commits at gmail.com  Sat Apr  1 13:02:05 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 10:02:05 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: win32 multiprocessing: restore the
 w_handle function from a deleted module.
Message-ID: <58dfdd0d.55061c0a.4b93.c785@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90902:cedc709e41d2
Date: 2017-04-01 19:01 +0200
http://bitbucket.org/pypy/pypy/changeset/cedc709e41d2/

Log:	win32 multiprocessing: restore the w_handle function from a deleted
	module.

diff --git a/pypy/module/_multiprocessing/interp_win32.py b/pypy/module/_multiprocessing/interp_win32.py
--- a/pypy/module/_multiprocessing/interp_win32.py
+++ b/pypy/module/_multiprocessing/interp_win32.py
@@ -7,7 +7,6 @@
 from pypy.interpreter.error import oefmt, wrap_oserror
 from pypy.interpreter.function import StaticMethod
 from pypy.interpreter.gateway import interp2app, unwrap_spec
-from pypy.module._multiprocessing.interp_connection import w_handle
 
 CONSTANTS = """
     PIPE_ACCESS_INBOUND PIPE_ACCESS_DUPLEX
@@ -35,6 +34,9 @@
 def handle_w(space, w_handle):
     return rffi.cast(rwin32.HANDLE, space.int_w(w_handle))
 
+def w_handle(space, handle):
+    return space.wrap(rffi.cast(rffi.INTPTR_T, handle))
+
 _CreateNamedPipe = rwin32.winexternal(
     'CreateNamedPipeA', [
         rwin32.LPCSTR,

From pypy.commits at gmail.com  Sat Apr  1 13:48:28 2017
From: pypy.commits at gmail.com (rlamy)
Date: Sat, 01 Apr 2017 10:48:28 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: hg merge default
Message-ID: <58dfe7ec.c30b1c0a.d564c.cdae@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r90903:49c746636960
Date: 2017-04-01 18:47 +0100
http://bitbucket.org/pypy/pypy/changeset/49c746636960/

Log:	hg merge default

diff too long, truncating to 2000 out of 49367 lines

diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -32,10 +32,11 @@
 import threading
 
 try:
-    from __pypy__ import newlist_hint
+    from __pypy__ import newlist_hint, add_memory_pressure
 except ImportError:
     assert '__pypy__' not in sys.builtin_module_names
     newlist_hint = lambda sizehint: []
+    add_memory_pressure = lambda size: None
 
 if sys.version_info[0] >= 3:
     StandardError = Exception
@@ -152,6 +153,9 @@
                  check_same_thread=True, factory=None, cached_statements=100,
                  uri=0):
     factory = Connection if not factory else factory
+    # an sqlite3 db seems to be around 100 KiB at least (doesn't matter if
+    # backed by :memory: or a file)
+    add_memory_pressure(100 * 1024)
     return factory(database, timeout, detect_types, isolation_level,
                     check_same_thread, factory, cached_statements, uri)
 
diff --git a/pypy/doc/build.rst b/pypy/doc/build.rst
--- a/pypy/doc/build.rst
+++ b/pypy/doc/build.rst
@@ -79,6 +79,9 @@
 _ssl
     libssl
 
+_vmprof
+    libunwind (optional, loaded dynamically at runtime)
+
 Make sure to have these libraries (with development headers) installed
 before building PyPy, otherwise the resulting binary will not contain
 these modules.  Furthermore, the following libraries should be present
@@ -185,7 +188,7 @@
 ::
 
     cd pypy/tool/release
-    ./package.py pypy-VER-PLATFORM
+    ./package.py --archive-name=pypy-VER-PLATFORM
 
 This creates a clean and prepared hierarchy, as well as a ``.tar.bz2``
 with the same content; both are found by default in
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
@@ -364,6 +364,24 @@
 
 .. __: https://bitbucket.org/pypy/pypy/issue/1974/different-behaviour-for-collections-of
 
+Performance Differences
+-------------------------
+
+CPython has an optimization that can make repeated string concatenation not
+quadratic. For example, this kind of code runs in O(n) time::
+
+    s = ''
+    for string in mylist:
+        s += string
+
+In PyPy, this code will always have quadratic complexity. Note also, that the
+CPython optimization is brittle and can break by having slight variations in
+your code anyway. So you should anyway replace the code with::
+
+    parts = []
+    for string in mylist:
+        parts.append(string)
+    s = "".join(parts)
 
 Miscellaneous
 -------------
diff --git a/pypy/doc/install.rst b/pypy/doc/install.rst
--- a/pypy/doc/install.rst
+++ b/pypy/doc/install.rst
@@ -57,6 +57,7 @@
 .. code-block:: console
 
     $ ./pypy-xxx/bin/pypy -m ensurepip
+    $ ./pypy-xxx/bin/pip install -U pip wheel # to upgrade to the latest versions
     $ ./pypy-xxx/bin/pip install pygments  # for example
 
 Third party libraries will be installed in ``pypy-xxx/site-packages``, and
@@ -77,7 +78,17 @@
 	# from the mercurial checkout
 	$ virtualenv -p /path/to/pypy/pypy/translator/goal/pypy-c my-pypy-env
 
-Note that bin/python is now a symlink to bin/pypy.
+	# in any case activate it
+	$ source my-pypy-env/bin/activate
+
+Note that my-pypy-env/bin/python is now a symlink to my-pypy-env/bin/pypy
+so you should be able to run pypy simply by typing::
+
+    $ python
+
+You should still upgrade pip and wheel to the latest versions via::
+
+    $ my-pypy-env/bin/pip install -U pip wheel
 
 .. _pip: http://pypi.python.org/pypi/pip
 .. _ensurepip: https://docs.python.org/2.7/library/ensurepip.html
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -2,7 +2,22 @@
 What's new in PyPy2.7 5.8+
 ==========================
 
-.. this is a revision shortly after release-pypy2.7-v5.7
+.. this is a revision shortly after release-pypy2.7-v5.7.0
 .. startrev: 44f31f6dd39f
 
+Add cpyext interfaces for ``PyModule_New``
 
+Correctly handle `dict.pop`` where the ``pop``
+key is not the same type as the ``dict``'s and ``pop``
+is called with a default (will be part of release 5.7.1)
+
+.. branch: issue2522
+
+Fix missing tp_new on w_object called through multiple inheritance
+(will be part of release 5.7.1)
+
+.. branch: lstrip_to_empty_string
+
+.. branch: vmprof-native
+
+PyPy support to profile native frames in vmprof.
diff --git a/pypy/interpreter/pyparser/future.py b/pypy/interpreter/pyparser/future.py
--- a/pypy/interpreter/pyparser/future.py
+++ b/pypy/interpreter/pyparser/future.py
@@ -80,6 +80,7 @@
     from pypy.interpreter.pyparser import pygram
     it = TokenIterator(tokens)
     result = 0
+    last_position = (0, 0)
     #
     # The only things that can precede a future statement are another
     # future statement and a doc string (only one).  This is a very
@@ -94,6 +95,11 @@
            it.skip_name("__future__") and
            it.skip_name("import")):
         it.skip(pygram.tokens.LPAR)    # optionally
+        # return in 'last_position' any line-column pair that points
+        # somewhere inside the last __future__ import statement
+        # (at the start would be fine too, but it's easier to grab a
+        # random position inside)
+        last_position = (it.tok[2], it.tok[3])
         result |= future_flags.get_compiler_feature(it.next_feature_name())
         while it.skip(pygram.tokens.COMMA):
             result |= future_flags.get_compiler_feature(it.next_feature_name())
@@ -104,5 +110,4 @@
     # remove the flags that were specified but are anyway mandatory
     result &= ~future_flags.mandatory_flags
 
-    position = (it.tok[2], it.tok[3])
-    return result, position
+    return result, last_position
diff --git a/pypy/interpreter/pyparser/test/test_future.py b/pypy/interpreter/pyparser/test/test_future.py
--- a/pypy/interpreter/pyparser/test/test_future.py
+++ b/pypy/interpreter/pyparser/test/test_future.py
@@ -2,10 +2,9 @@
 from pypy.interpreter.pyparser import future, pytokenizer
 from pypy.tool import stdlib___future__ as fut
 
-def run(s, expected_last_future=None):
+def run(s, expected_last_future=(0, 0)):
     source_lines = s.splitlines(True)
     tokens = pytokenizer.generate_tokens(source_lines, 0)
-    expected_last_future = expected_last_future or tokens[-1][2:4]
     #
     flags, last_future_import = future.add_future_flags(
         future.futureFlags_3_5, tokens)
@@ -14,7 +13,7 @@
 
 def test_docstring():
     s = '"Docstring\\" "\nfrom  __future__ import division\n'
-    f = run(s)
+    f = run(s, (2, 24))
     assert f == 0
 
 def test_comment():
@@ -45,152 +44,152 @@
 
 def test_from():
     s = 'from  __future__ import division\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_froms():
     s = 'from  __future__ import division, generators, with_statement\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_from_as():
     s = 'from  __future__ import division as b\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_froms_as():
     s = 'from  __future__ import division as b, generators as c\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_from_paren():
     s = 'from  __future__ import (division)\n'
-    f = run(s)
+    f = run(s, (1, 25))
     assert f == 0
 
 def test_froms_paren():
     s = 'from  __future__ import (division, generators)\n'
-    f = run(s)
+    f = run(s, (1, 25))
     assert f == 0
 
 def test_froms_paren_as():
     s = 'from  __future__ import (division as b, generators,)\n'
-    f = run(s)
+    f = run(s, (1, 25))
     assert f == 0
 
 def test_paren_with_newline():
     s = 'from __future__ import (division,\nabsolute_import)\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_paren_with_newline_2():
     s = 'from __future__ import (\ndivision,\nabsolute_import)\n'
-    f = run(s)
+    f = run(s, (2, 0))
     assert f == 0
 
 def test_multiline():
     s = '"abc" #def\n  #ghi\nfrom  __future__ import (division as b, generators,)\nfrom __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (4, 23))
     assert f == 0
 
 def test_windows_style_lineendings():
     s = '"abc" #def\r\n  #ghi\r\nfrom  __future__ import (division as b, generators,)\r\nfrom __future__ import with_statement\r\n'
-    f = run(s)
+    f = run(s, (4, 23))
     assert f == 0
 
 def test_mac_style_lineendings():
     s = '"abc" #def\r  #ghi\rfrom  __future__ import (division as b, generators,)\rfrom __future__ import with_statement\r'
-    f = run(s)
+    f = run(s, (4, 23))
     assert f == 0
 
 def test_semicolon():
     s = '"abc" #def\n  #ghi\nfrom  __future__ import (division as b, generators,);  from __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (3, 78))
     assert f == 0
 
 def test_semicolon_2():
     s = 'from  __future__ import division; from foo import bar'
-    f = run(s, expected_last_future=(1, 39))
+    f = run(s, expected_last_future=(1, 24))
     assert f == 0
 
 def test_full_chain():
     s = '"abc" #def\n  #ghi\nfrom  __future__ import (division as b, generators,);  from __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (3, 78))
     assert f == 0
 
 def test_intervening_code():
     s = 'from  __future__ import (division as b, generators,)\nfrom sys import modules\nfrom __future__ import with_statement\n'
-    f = run(s, expected_last_future=(2, 5))
+    f = run(s, expected_last_future=(1, 25))
     assert f == 0
 
 def test_nonexisting():
     s = 'from  __future__ import non_existing_feature\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_nonexisting_2():
     s = 'from  __future__ import non_existing_feature, with_statement\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_from_import_abs_import():
     s = 'from  __future__ import absolute_import\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_raw_doc():
     s = 'r"Doc"\nfrom __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == 0
 
 def test_unicode_doc():
     s = 'u"Doc"\nfrom __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == 0
 
 def test_raw_unicode_doc():
     s = 'ru"Doc"\nfrom __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == 0
 
 def test_continuation_line():
     s = "\\\nfrom __future__ import with_statement\n"
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == 0
 
 def test_continuation_lines():
     s = "\\\n  \t\\\nfrom __future__ import with_statement\n"
-    f = run(s)
+    f = run(s, (3, 23))
     assert f == 0
 
 def test_lots_of_continuation_lines():
     s = "\\\n\\\n\\\n\\\n\\\n\\\n\nfrom __future__ import with_statement\n"
-    f = run(s)
+    f = run(s, (8, 23))
     assert f == 0
 
 def test_continuation_lines_raise():
     s = "   \\\n  \t\\\nfrom __future__ import with_statement\n"
-    f = run(s, expected_last_future=(1, 0))
+    f = run(s)
     assert f == 0     # because of the INDENT
 
 def test_continuation_lines_in_docstring_single_quoted():
     s = '"\\\n\\\n\\\n\\\n\\\n\\\n"\nfrom  __future__ import division\n'
-    f = run(s)
+    f = run(s, (8, 24))
     assert f == 0
 
 def test_continuation_lines_in_docstring_triple_quoted():
     s = '"""\\\n\\\n\\\n\\\n\\\n\\\n"""\nfrom  __future__ import division\n'
-    f = run(s)
+    f = run(s, (8, 24))
     assert f == 0
 
 def test_blank_lines():
     s = ('\n\t\n\nfrom __future__ import with_statement'
          '  \n  \n  \nfrom __future__ import division')
-    f = run(s)
+    f = run(s, (7, 23))
     assert f == 0
 
 def test_dummy_semicolons():
     s = ('from __future__ import division;\n'
          'from __future__ import with_statement;')
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == 0
diff --git a/pypy/interpreter/test/test_syntax.py b/pypy/interpreter/test/test_syntax.py
--- a/pypy/interpreter/test/test_syntax.py
+++ b/pypy/interpreter/test/test_syntax.py
@@ -308,6 +308,15 @@
         assert isinstance(ns["c"], bytes)
         assert isinstance(ns["d"], bytes)
 
+    def test_both_futures_with_semicolon(self):
+        # Issue #2526: a corner case which crashes only if the file
+        # contains *nothing more* than two __future__ imports separated
+        # by a semicolon.
+        s = """
+from __future__ import unicode_literals; from __future__ import print_function
+"""
+        exec s in {}
+
 
 class AppTestComprehensions:
 
diff --git a/pypy/module/__pypy__/__init__.py b/pypy/module/__pypy__/__init__.py
--- a/pypy/module/__pypy__/__init__.py
+++ b/pypy/module/__pypy__/__init__.py
@@ -6,6 +6,8 @@
 
 
 class BuildersModule(MixedModule):
+    """ Module containing string and unicode builders """
+
     appleveldefs = {}
 
     interpleveldefs = {
@@ -34,6 +36,8 @@
 
 
 class IntOpModule(MixedModule):
+    """ Module for integer operations that have two-complement overflow
+    behaviour instead of overflowing to longs """
     appleveldefs = {}
     interpleveldefs = {
         'int_add':         'interp_intop.int_add',
@@ -55,6 +59,8 @@
 
 
 class Module(MixedModule):
+    """ PyPy specific "magic" functions. A lot of them are experimental and
+    subject to change, many are internal. """
     appleveldefs = {
     }
 
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
@@ -106,13 +106,15 @@
         raise wrap_oserror(space, e)
 
 @unwrap_spec(sizehint=int)
-def resizelist_hint(space, w_iterable, sizehint):
-    if not isinstance(w_iterable, W_ListObject):
+def resizelist_hint(space, w_list, sizehint):
+    """ Reallocate the underlying storage of the argument list to sizehint """
+    if not isinstance(w_list, W_ListObject):
         raise oefmt(space.w_TypeError, "arg 1 must be a 'list'")
-    w_iterable._resize_hint(sizehint)
+    w_list._resize_hint(sizehint)
 
 @unwrap_spec(sizehint=int)
 def newlist_hint(space, sizehint):
+    """ Create a new empty list that has an underlying storage of length sizehint """
     return space.newlist_hint(sizehint)
 
 @unwrap_spec(debug=int)
@@ -125,6 +127,9 @@
 
 @unwrap_spec(estimate=int)
 def add_memory_pressure(estimate):
+    """ Add memory pressure of estimate bytes. Useful when calling a C function
+    that internally allocates a big chunk of memory. This instructs the GC to
+    garbage collect sooner than it would otherwise."""
     rgc.add_memory_pressure(estimate)
 
 @unwrap_spec(w_frame=PyFrame)
diff --git a/pypy/module/_cffi_backend/test/test_recompiler.py b/pypy/module/_cffi_backend/test/test_recompiler.py
--- a/pypy/module/_cffi_backend/test/test_recompiler.py
+++ b/pypy/module/_cffi_backend/test/test_recompiler.py
@@ -1471,8 +1471,13 @@
         with self.StdErrCapture(fd=True) as f:
             res = lib.bar(4, 5)
         assert res == 0
-        assert f.getvalue() == (
+        assert f.getvalue() in (
+            # If the underlying cffi is <= 1.9
             "extern \"Python\": function bar() called, but no code was attached "
+            "to it yet with @ffi.def_extern().  Returning 0.\n",
+            # If the underlying cffi is >= 1.10
+            "extern \"Python\": function _CFFI_test_extern_python_1.bar() "
+            "called, but no code was attached "
             "to it yet with @ffi.def_extern().  Returning 0.\n")
 
         @ffi.def_extern("bar")
diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -50,8 +50,8 @@
     return OperationError(w_VMProfError, space.newtext(e.msg))
 
 
- at unwrap_spec(fileno=int, period=float)
-def enable(space, fileno, period):
+ at unwrap_spec(fileno=int, period=float, memory=int, lines=int, native=int)
+def enable(space, fileno, period, memory, lines, native):
     """Enable vmprof.  Writes go to the given 'fileno', a file descriptor
     opened for writing.  *The file descriptor must remain open at least
     until disable() is called.*
@@ -65,7 +65,7 @@
     #                             "with vmprof will crash"),
     #               space.w_RuntimeWarning)
     try:
-        rvmprof.enable(fileno, period)
+        rvmprof.enable(fileno, period, memory, native)
     except rvmprof.VMProfError as e:
         raise VMProfError(space, e)
 
diff --git a/pypy/module/_vmprof/test/test__vmprof.py b/pypy/module/_vmprof/test/test__vmprof.py
--- a/pypy/module/_vmprof/test/test__vmprof.py
+++ b/pypy/module/_vmprof/test/test__vmprof.py
@@ -24,10 +24,11 @@
             i += 5 * WORD # header
             assert s[i    ] == 5    # MARKER_HEADER
             assert s[i + 1] == 0    # 0
-            assert s[i + 2] == 2    # VERSION_THREAD_ID
-            assert s[i + 3] == 4    # len('pypy')
-            assert s[i + 4: i + 8] == b'pypy'
-            i += 8
+            assert s[i + 2] == 6    # VERSION_TIMESTAMP
+            assert s[i + 3] == 8    # PROFILE_RPYTHON
+            assert s[i + 4] == 4    # len('pypy')
+            assert s[i + 5: i + 9] == b'pypy'
+            i += 9
             while i < len(s):
                 if s[i] == 3:
                     break
@@ -41,6 +42,17 @@
                     _, size = struct.unpack("ll", s[i:i + 2 * WORD])
                     count += 1
                     i += 2 * WORD + size
+                elif s[i] == '\x06':
+                    print(s[i:i+24])
+                    i += 1+8+8+8
+                elif s[i] == '\x07':
+                    i += 1
+                    # skip string
+                    size, = struct.unpack("l", s[i:i + WORD])
+                    i += WORD+size
+                    # skip string
+                    size, = struct.unpack("l", s[i:i + WORD])
+                    i += WORD+size
                 else:
                     raise AssertionError(s[i])
             return count
@@ -48,7 +60,7 @@
         import _vmprof
         gc.collect()  # try to make the weakref list deterministic
         gc.collect()  # by freeing all dead code objects
-        _vmprof.enable(tmpfileno, 0.01)
+        _vmprof.enable(tmpfileno, 0.01, 0, 0, 0)
         _vmprof.disable()
         s = open(self.tmpfilename, 'rb').read()
         no_of_codes = count(s)
@@ -64,7 +76,7 @@
 
         gc.collect()
         gc.collect()
-        _vmprof.enable(tmpfileno2, 0.01)
+        _vmprof.enable(tmpfileno2, 0.01, 0, 0, 0)
 
         exec_("""def foo2():
             pass
@@ -79,9 +91,9 @@
 
     def test_enable_ovf(self):
         import _vmprof
-        raises(_vmprof.VMProfError, _vmprof.enable, 2, 0)
-        raises(_vmprof.VMProfError, _vmprof.enable, 2, -2.5)
-        raises(_vmprof.VMProfError, _vmprof.enable, 2, 1e300)
-        raises(_vmprof.VMProfError, _vmprof.enable, 2, 1e300 * 1e300)
+        raises(_vmprof.VMProfError, _vmprof.enable, 2, 0, 0, 0, 0)
+        raises(_vmprof.VMProfError, _vmprof.enable, 2, -2.5, 0, 0, 0)
+        raises(_vmprof.VMProfError, _vmprof.enable, 2, 1e300, 0, 0, 0)
+        raises(_vmprof.VMProfError, _vmprof.enable, 2, 1e300 * 1e300, 0, 0, 0)
         NaN = (1e300*1e300) / (1e300*1e300)
-        raises(_vmprof.VMProfError, _vmprof.enable, 2, NaN)
+        raises(_vmprof.VMProfError, _vmprof.enable, 2, NaN, 0, 0, 0)
diff --git a/pypy/module/_vmprof/test/test_direct.py b/pypy/module/_vmprof/test/test_direct.py
--- a/pypy/module/_vmprof/test/test_direct.py
+++ b/pypy/module/_vmprof/test/test_direct.py
@@ -43,7 +43,7 @@
 }
 
 
-""" + open(str(srcdir.join("vmprof_get_custom_offset.h"))).read(), include_dirs=[str(srcdir)])
+""" + open(str(srcdir.join("shared/vmprof_get_custom_offset.h"))).read(), include_dirs=[str(srcdir)])
 
 class TestDirect(object):
     def test_infrastructure(self):
diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -4,10 +4,10 @@
 
 from rpython.rtyper.lltypesystem import rffi, lltype
 from rpython.rlib.rarithmetic import widen
-from rpython.rlib import rgc # Force registration of gc.collect
+from rpython.rlib import rgc  # Force registration of gc.collect
 from pypy.module.cpyext.api import (
     slot_function, generic_cpy_call, PyObject, Py_ssize_t,
-    pypy_decl, Py_buffer, Py_bufferP, PyTypeObjectPtr, cts)
+    Py_buffer, Py_bufferP, PyTypeObjectPtr, cts)
 from pypy.module.cpyext.typeobjectdefs import (
     unaryfunc, ternaryfunc, binaryfunc,
     getattrfunc, getattrofunc, setattrofunc, lenfunc, ssizeargfunc, inquiry,
@@ -793,6 +793,16 @@
         return 0
     return buff_w
 
+missing_wrappers = ['wrap_indexargfunc', 'wrap_del']
+for name in missing_wrappers:
+    assert name not in globals()
+    def missing_wrapper(space, w_self, w_args, func, w_kwds):
+        print "cpyext: missing slot wrapper " + name
+        raise NotImplementedError("Slot wrapper " + name)
+    missing_wrapper.__name__ = name
+    globals()[name] = missing_wrapper
+
+
 PyWrapperFlag_KEYWORDS = 1
 
 class TypeSlot:
@@ -810,7 +820,7 @@
     if WRAPPER is None:
         wrapper = None
     else:
-        wrapper = globals().get(WRAPPER, Ellipsis)
+        wrapper = globals()[WRAPPER]
 
     # irregular interface, because of tp_getattr/tp_getattro confusion
     if NAME == "__getattr__":
@@ -824,17 +834,9 @@
     function = getattr(userslot, FUNCTION or '!missing', None)
     assert FLAGS == 0 or FLAGS == PyWrapperFlag_KEYWORDS
     if FLAGS:
-        if wrapper is Ellipsis:
-            @func_renamer(WRAPPER)
-            def wrapper(space, w_self, w_args, func, w_kwds):
-                raise NotImplementedError("Wrapper for slot " + NAME)
         wrapper1 = None
         wrapper2 = wrapper
     else:
-        if wrapper is Ellipsis:
-            @func_renamer(WRAPPER)
-            def wrapper(space, w_self, w_args, func):
-                raise NotImplementedError("Wrapper for slot " + NAME)
         wrapper1 = wrapper
         wrapper2 = None
     return TypeSlot(NAME, SLOT, function, wrapper1, wrapper2, DOC)
diff --git a/pypy/module/cpyext/test/buffer_test.c b/pypy/module/cpyext/test/buffer_test.c
--- a/pypy/module/cpyext/test/buffer_test.c
+++ b/pypy/module/cpyext/test/buffer_test.c
@@ -344,7 +344,6 @@
 #endif
     if (m == NULL)
         INITERROR;
-    PyMyArrayType.tp_new = PyType_GenericNew;
     if (PyType_Ready(&PyMyArrayType) < 0)
         INITERROR;
     Py_INCREF(&PyMyArrayType);
diff --git a/pypy/module/cpyext/test/comparisons.c b/pypy/module/cpyext/test/comparisons.c
--- a/pypy/module/cpyext/test/comparisons.c
+++ b/pypy/module/cpyext/test/comparisons.c
@@ -68,7 +68,7 @@
     0,                                              /* tp_dictoffset */
     0,                                              /* tp_init */
     0,                                              /* tp_alloc */
-    0,                                              /* tp_new */
+    PyType_GenericNew,                              /* tp_new */
     0                                               /* tp_free */
 };
 
@@ -87,7 +87,6 @@
 {
     PyObject *m, *d;
 
-    CmpType.tp_new = PyType_GenericNew;
     if (PyType_Ready(&CmpType) < 0)
         return NULL;
     m = PyModule_Create(&moduledef);
diff --git a/pypy/module/cpyext/test/foo.c b/pypy/module/cpyext/test/foo.c
--- a/pypy/module/cpyext/test/foo.c
+++ b/pypy/module/cpyext/test/foo.c
@@ -36,14 +36,14 @@
     Py_ssize_t foo_ssizet;
 } fooobject;
 
-static PyTypeObject footype;
+static PyTypeObject fooType;
 
 static fooobject *
 newfooobject(void)
 {
     fooobject *foop;
 
-    foop = PyObject_New(fooobject, &footype);
+    foop = PyObject_New(fooobject, &fooType);
     if (foop == NULL)
         return NULL;
 
@@ -160,6 +160,28 @@
     return PyObject_GenericSetAttr((PyObject *)self, name, value);
 }
 
+static PyObject *
+new_fooType(PyTypeObject * t, PyObject *args, PyObject *kwds)
+{
+    PyObject * o;
+    /* copied from numpy scalartypes.c for inherited classes */
+    if (t->tp_bases && (PyTuple_GET_SIZE(t->tp_bases) > 1))
+    {
+        PyTypeObject *sup; 
+        /* We are inheriting from a Python type as well so 
+           give it first dibs on conversion */
+        sup = (PyTypeObject *)PyTuple_GET_ITEM(t->tp_bases, 1);
+        /* Prevent recursion */ 
+        if (new_fooType != sup->tp_new) 
+        {
+            o = sup->tp_new(t, args, kwds);
+            return o;
+        }
+    }
+    o = t->tp_alloc(t, 0);
+    return o;   
+};
+
 static PyMemberDef foo_members[] = {
     {"int_member", T_INT, offsetof(fooobject, foo), 0,
      "A helpful docstring."},
@@ -194,7 +216,7 @@
 
 PyDoc_STRVAR(foo_doc, "foo is for testing.");
 
-static PyTypeObject footype = {
+static PyTypeObject fooType = {
     PyVarObject_HEAD_INIT(NULL, 0)
     "foo.foo",               /*tp_name*/
     sizeof(fooobject),       /*tp_size*/
@@ -592,7 +614,7 @@
 
     0,          /*tp_init*/
     0,          /*tp_alloc  will be set to PyType_GenericAlloc in module init*/
-    0,          /*tp_new*/
+    PyType_GenericNew, /*tp_new*/
     0,          /*tp_free  Low-level free-memory routine */
     0,          /*tp_is_gc For PyObject_IS_GC */
     0,          /*tp_bases*/
@@ -648,6 +670,37 @@
     return PyInt_FromLong(tf);
 }
 
+static PyTypeObject GetType1 = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "foo.GetType1",          /*tp_name*/
+    sizeof(PyObject),        /*tp_size*/
+};
+static PyTypeObject GetType2 = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "foo.GetType2",          /*tp_name*/
+    sizeof(PyObject),        /*tp_size*/
+};
+static PyObject *gettype1, *gettype2;
+
+static PyObject *gettype1_getattr(PyObject *self, char *name)
+{
+    char buf[200];
+    strcpy(buf, "getattr:");
+    strcat(buf, name);
+    return PyBytes_FromString(buf);
+}
+static PyObject *gettype2_getattro(PyObject *self, PyObject *name)
+{
+    char buf[200];
+    PyObject* temp;
+    temp = PyUnicode_AsASCIIString(name);
+    if (temp == NULL) return NULL;
+    strcpy(buf, "getattro:");
+    strcat(buf, PyBytes_AS_STRING(temp));
+    return PyBytes_FromString(buf);
+}
+
+
 /* List of functions exported by this module */
 
 static PyMethodDef foo_functions[] = {
@@ -706,13 +759,14 @@
     if (module == NULL)
         INITERROR;
 
-    footype.tp_new = PyType_GenericNew;
-
     UnicodeSubtype.tp_base = &PyUnicode_Type;
     UnicodeSubtype2.tp_base = &UnicodeSubtype;
     MetaType.tp_base = &PyType_Type;
 
-    if (PyType_Ready(&footype) < 0)
+    fooType.tp_new = &new_fooType;
+    InitErrType.tp_new = PyType_GenericNew;
+
+    if (PyType_Ready(&fooType) < 0)
         INITERROR;
     if (PyType_Ready(&UnicodeSubtype) < 0)
         INITERROR;
@@ -725,8 +779,6 @@
     if (PyType_Ready(&SimplePropertyType) < 0)
         INITERROR;
 
-    SimplePropertyType.tp_new = PyType_GenericNew;
-    InitErrType.tp_new = PyType_GenericNew;
 
     Py_TYPE(&CustomType) = &MetaType;
     if (PyType_Ready(&CustomType) < 0)
@@ -744,11 +796,23 @@
     if (PyType_Ready(&TupleLike) < 0)
         INITERROR;
 
+    GetType1.tp_flags = Py_TPFLAGS_DEFAULT;
+    GetType1.tp_getattr = &gettype1_getattr;
+    if (PyType_Ready(&GetType1) < 0)
+        INITERROR;
+    gettype1 = PyObject_New(PyObject, &GetType1);
+
+    GetType2.tp_flags = Py_TPFLAGS_DEFAULT;
+    GetType2.tp_getattro = &gettype2_getattro;
+    if (PyType_Ready(&GetType2) < 0)
+        INITERROR;
+    gettype2 = PyObject_New(PyObject, &GetType2);
+
 
     d = PyModule_GetDict(module);
     if (d == NULL)
         INITERROR;
-    if (PyDict_SetItemString(d, "fooType", (PyObject *)&footype) < 0)
+    if (PyDict_SetItemString(d, "fooType", (PyObject *)&fooType) < 0)
         INITERROR;
     if (PyDict_SetItemString(d, "UnicodeSubtype", (PyObject *) &UnicodeSubtype) < 0)
         INITERROR;
@@ -766,6 +830,10 @@
         INITERROR;
     if (PyDict_SetItemString(d, "TupleLike", (PyObject *) &TupleLike) < 0)
         INITERROR;
+    if (PyDict_SetItemString(d, "gettype1", gettype1) < 0)
+        INITERROR;
+    if (PyDict_SetItemString(d, "gettype2", gettype2) < 0)
+        INITERROR;
 #if PY_MAJOR_VERSION >=3
     return module;
 #endif
diff --git a/pypy/module/cpyext/test/test_memoryobject.py b/pypy/module/cpyext/test/test_memoryobject.py
--- a/pypy/module/cpyext/test/test_memoryobject.py
+++ b/pypy/module/cpyext/test/test_memoryobject.py
@@ -187,6 +187,10 @@
                           " on too long format string"
         finally:
             warnings.resetwarnings()
+        # calling get_buffer_info on x creates a memory leak,
+        # which is detected as an error at test teardown:
+        # Exception TypeError: "'NoneType' object is not callable"
+        #         in <bound method ConcreteArray.__del__ ...> ignored
 
     def test_releasebuffer(self):
         if not self.runappdirect:
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -16,12 +16,12 @@
         assert 'foo' in sys.modules
         assert "copy" in dir(module.fooType)
         obj = module.new()
-        print(obj.foo)
+        #print(obj.foo)
         assert obj.foo == 42
-        print("Obj has type", type(obj))
+        #print("Obj has type", type(obj))
         assert type(obj) is module.fooType
-        print("type of obj has type", type(type(obj)))
-        print("type of type of obj has type", type(type(type(obj))))
+        #print("type of obj has type", type(type(obj)))
+        #print("type of type of obj has type", type(type(type(obj))))
         assert module.fooType.__doc__ == "foo is for testing."
 
     def test_typeobject_method_descriptor(self):
@@ -949,6 +949,8 @@
             pass
         class foo(f2, f1):
             pass
+
+        x = foo()
         assert bar.__base__ is f2
         # On cpython, the size changes.
         if '__pypy__' in sys.builtin_module_names:
@@ -1159,8 +1161,8 @@
                   ((PyHeapTypeObject*)Base2)->ht_name = dummyname;
                   ((PyHeapTypeObject*)Base12)->ht_name = dummyname;
                 }
-                #endif 
-                #endif 
+                #endif
+                #endif
                 Base1->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
                 Base2->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
                 Base12->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HEAPTYPE;
@@ -1197,3 +1199,14 @@
             pass
         bases = module.foo(C)
         assert bases == (A, B)
+
+    def test_getattr_getattro(self):
+        module = self.import_module(name='foo')
+        assert module.gettype2.dcba == b'getattro:dcba'
+        assert (type(module.gettype2).__getattribute__(module.gettype2, 'dcBA')
+            == b'getattro:dcBA')
+        assert module.gettype1.abcd == b'getattr:abcd'
+        # GetType1 objects have a __getattribute__ method, but this
+        # doesn't call tp_getattr at all, also on CPython
+        raises(AttributeError, type(module.gettype1).__getattribute__,
+                               module.gettype1, 'dcBA')
diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py
--- a/pypy/module/cpyext/typeobject.py
+++ b/pypy/module/cpyext/typeobject.py
@@ -682,10 +682,6 @@
         if pto.c_tp_itemsize < pto.c_tp_base.c_tp_itemsize:
             pto.c_tp_itemsize = pto.c_tp_base.c_tp_itemsize
 
-    if space.is_w(w_type, space.w_object):
-        # will be filled later on with the correct value
-        # may not be 0
-        pto.c_tp_new = cts.cast('newfunc', 1)
     update_all_slots(space, w_type, pto)
     if not pto.c_tp_new:
         base_object_pyo = make_ref(space, space.w_object)
diff --git a/pypy/module/faulthandler/cintf.py b/pypy/module/faulthandler/cintf.py
--- a/pypy/module/faulthandler/cintf.py
+++ b/pypy/module/faulthandler/cintf.py
@@ -5,10 +5,14 @@
 
 
 cwd = py.path.local(__file__).dirpath()
+rvmp = cwd.join('../../..')
+rvmp = rvmp.join('rpython/rlib/rvmprof/src')
+
 eci = ExternalCompilationInfo(
     includes=[cwd.join('faulthandler.h')],
-    include_dirs=[str(cwd), cdir],
-    separate_module_files=[cwd.join('faulthandler.c')])
+    include_dirs=[str(cwd), cdir, rvmp],
+    separate_module_files=[cwd.join('faulthandler.c')],
+    compile_extra=['-DRPYTHON_VMPROF=1'])
 
 eci_later = eci.merge(ExternalCompilationInfo(
     pre_include_bits=['#define PYPY_FAULTHANDLER_LATER\n']))
diff --git a/pypy/module/struct/interp_struct.py b/pypy/module/struct/interp_struct.py
--- a/pypy/module/struct/interp_struct.py
+++ b/pypy/module/struct/interp_struct.py
@@ -42,10 +42,12 @@
 def calcsize(space, w_format):
     """Return size of C struct described by format string fmt."""
     format = text_or_bytes_w(space, w_format)
+    """Return size of C struct described by format string fmt."""
     return space.newint(_calcsize(space, format))
 
 
 def _pack(space, format, args_w):
+    """Return string containing values v1, v2, ... packed according to fmt."""
     if jit.isconstant(format):
         size = _calcsize(space, format)
     else:
@@ -79,6 +81,9 @@
 
 # XXX inefficient
 def do_pack_into(space, format, w_buffer, offset, args_w):
+    """ Pack the values v1, v2, ... according to fmt.
+Write the packed bytes into the writable buffer buf starting at offset
+    """
     res = _pack(space, format, args_w)
     buf = space.getarg_w('w*', w_buffer)
     if offset < 0:
@@ -119,6 +124,8 @@
     return do_unpack_from(space, format, w_buffer, offset)
 
 def do_unpack_from(space, format, w_buffer, offset=0):
+    """Unpack the buffer, containing packed C structure data, according to
+fmt, starting at offset. Requires len(buffer[offset:]) >= calcsize(fmt)."""
     size = _calcsize(space, format)
     buf = space.buffer_w(w_buffer, space.BUF_SIMPLE)
     if offset < 0:
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=5
 min=7
-rev=0
+rev=1
 branchname=release-pypy2.7-5.x # ==OR== release-$maj.x  # ==OR== release-$maj.$min.x
 tagname=release-pypy2.7-v$maj.$min.$rev  # ==OR== release-$maj.$min
 
@@ -50,8 +50,8 @@
 rm -rf $rel-src
 
 # Print out the md5, sha1, sha256
-md5sum *.bz2 *.zip
-sha1sum *.bz2 *.zip
+#md5sum *.bz2 *.zip
+#sha1sum *.bz2 *.zip
 sha256sum *.bz2 *.zip
 
 # Now upload all the bz2 and zip
diff --git a/rpython/jit/backend/x86/detect_feature.py b/rpython/jit/backend/x86/detect_feature.py
--- a/rpython/jit/backend/x86/detect_feature.py
+++ b/rpython/jit/backend/x86/detect_feature.py
@@ -21,7 +21,11 @@
     return bool(code & (1<<25)) and bool(code & (1<<26))
 
 def cpu_id(eax = 1, ret_edx = True, ret_ecx = False):
-    asm = ["\xB8", chr(eax), "\x00\x00\x00", # MOV EAX, $eax
+    asm = ["\xB8",                     # MOV EAX, $eax
+                chr(eax & 0xff),
+                chr((eax >> 8) & 0xff),
+                chr((eax >> 16) & 0xff),
+                chr((eax >> 24) & 0xff),
            "\x53",                     # PUSH EBX
            "\x0F\xA2",                 # CPUID
            "\x5B",                     # POP EBX
diff --git a/rpython/jit/backend/x86/vector_ext.py b/rpython/jit/backend/x86/vector_ext.py
--- a/rpython/jit/backend/x86/vector_ext.py
+++ b/rpython/jit/backend/x86/vector_ext.py
@@ -60,6 +60,7 @@
 
 class VectorAssemblerMixin(object):
     _mixin_ = True
+    element_ones = []    # overridden in assembler.py
 
     def setup_once_vector(self):
         pass
@@ -342,6 +343,7 @@
         else:
             assert lhsloc is xmm0
             maskloc = X86_64_XMM_SCRATCH_REG
+            assert len(self.element_ones) > 0
             self.mc.MOVAPD(maskloc, heap(self.element_ones[get_scale(size)]))
             self.mc.PXOR(resloc, resloc)
             # note that resloc contains true false for each element by the last compare operation
diff --git a/rpython/jit/metainterp/test/test_ajit.py b/rpython/jit/metainterp/test/test_ajit.py
--- a/rpython/jit/metainterp/test/test_ajit.py
+++ b/rpython/jit/metainterp/test/test_ajit.py
@@ -4637,8 +4637,8 @@
 
         self.meta_interp(f, [10])
 
-    @py.test.skip("loops!")
     def test_finalizer_bug(self):
+        py.test.skip("loops!")
         from rpython.rlib import rgc
         driver = JitDriver(greens=[], reds=[])
         class Fin(object):
diff --git a/rpython/rlib/jit.py b/rpython/rlib/jit.py
--- a/rpython/rlib/jit.py
+++ b/rpython/rlib/jit.py
@@ -244,6 +244,10 @@
     return inner
 
 def oopspec(spec):
+    """ The JIT compiler won't look inside this decorated function,
+        but instead during translation, rewrites it according to the handler in
+        rpython/jit/codewriter/jtransform.py.
+    """
     def decorator(func):
         func.oopspec = spec
         return func
diff --git a/rpython/rlib/rstrategies/rstrategies.py b/rpython/rlib/rstrategies/rstrategies.py
--- a/rpython/rlib/rstrategies/rstrategies.py
+++ b/rpython/rlib/rstrategies/rstrategies.py
@@ -1,7 +1,7 @@
 
 import weakref, sys
 from rpython.rlib.rstrategies import logger
-from rpython.rlib import jit, objectmodel, rerased
+from rpython.rlib import jit, objectmodel, rerased, rarithmetic
 from rpython.rlib.objectmodel import specialize, not_rpython
 
 def make_accessors(strategy='strategy', storage='storage'):
@@ -443,6 +443,7 @@
 
     def store(self, w_self, index0, wrapped_value):
         self.check_index_store(w_self, index0)
+        assert index0 >= 0
         if self._check_can_handle(wrapped_value):
             unwrapped = self._unwrap(wrapped_value)
             self.get_storage(w_self)[index0] = unwrapped
@@ -451,6 +452,7 @@
 
     def fetch(self, w_self, index0):
         self.check_index_fetch(w_self, index0)
+        assert index0 >= 0
         unwrapped = self.get_storage(w_self)[index0]
         return self._wrap(unwrapped)
 
@@ -517,7 +519,7 @@
         self.check_index(w_self, start)
         self.check_index(w_self, end)
     def check_index(self, w_self, index0):
-        if index0 < 0 or index0 >= self.size(w_self):
+        if not rarithmetic.int_between(0, index0, self.size(w_self)):
             raise IndexError
 
 class UnsafeIndexingMixin(object):
diff --git a/rpython/rlib/rstrategies/test/test_rstrategies.py b/rpython/rlib/rstrategies/test/test_rstrategies.py
--- a/rpython/rlib/rstrategies/test/test_rstrategies.py
+++ b/rpython/rlib/rstrategies/test/test_rstrategies.py
@@ -204,7 +204,7 @@
     if is_safe:
         py.test.raises(IndexError, s.fetch, l, -1)
     else:
-        assert s.fetch(l, -1) == s.fetch(l, size - 1)
+        py.test.raises(AssertionError, s.fetch, l, -1)
 
 def test_init_Empty():
     l = W_List(EmptyStrategy, 0)
@@ -249,7 +249,7 @@
     if is_safe:
         py.test.raises(IndexError, s.store, l, -1, stored_value)
     else:
-        store_test(-1)
+        py.test.raises(AssertionError, s.store, l, -1, stored_value)
 
 def test_store_Nil():
     do_test_store(NilStrategy, stored_value=w_nil)
diff --git a/rpython/rlib/rvmprof/__init__.py b/rpython/rlib/rvmprof/__init__.py
--- a/rpython/rlib/rvmprof/__init__.py
+++ b/rpython/rlib/rvmprof/__init__.py
@@ -32,8 +32,8 @@
         return code._vmprof_unique_id
     return 0
 
-def enable(fileno, interval):
-    _get_vmprof().enable(fileno, interval)
+def enable(fileno, interval, memory=0, native=0):
+    _get_vmprof().enable(fileno, interval, memory, native)
 
 def disable():
     _get_vmprof().disable()
diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -14,32 +14,70 @@
 
 ROOT = py.path.local(rpythonroot).join('rpython', 'rlib', 'rvmprof')
 SRC = ROOT.join('src')
+SHARED = SRC.join('shared')
+BACKTRACE = SHARED.join('libbacktrace')
 
+compile_extra = ['-DRPYTHON_VMPROF', '-O3']
+separate_module_files = [
+    SHARED.join('symboltable.c')
+]
 if sys.platform.startswith('linux'):
+    if sys.maxint > 2**32:     # doesn't seem to compile on 32-bit Linux
+        separate_module_files += [
+           BACKTRACE.join('backtrace.c'),
+           BACKTRACE.join('state.c'),
+           BACKTRACE.join('elf.c'),
+           BACKTRACE.join('dwarf.c'),
+           BACKTRACE.join('fileline.c'),
+           BACKTRACE.join('mmap.c'),
+           BACKTRACE.join('mmapio.c'),
+           BACKTRACE.join('posix.c'),
+           BACKTRACE.join('sort.c'),
+        ]
+        compile_extra += ['-DVMPROF_BACKTRACE']
     _libs = ['dl']
+    compile_extra += ['-DVMPROF_UNIX']
+    compile_extra += ['-DVMPROF_LINUX']
+elif sys.platform == 'win32':
+    compile_extra = ['-DRPYTHON_VMPROF', '-DVMPROF_WINDOWS']
+    separate_module_files = [SHARED.join('vmprof_main_win32.c')]
+    _libs = []
 else:
+    # Guessing a BSD-like Unix platform
+    compile_extra += ['-DVMPROF_UNIX']
+    compile_extra += ['-DVMPROF_MAC']
     _libs = []
+
+
 eci_kwds = dict(
-    include_dirs = [SRC],
-    includes = ['rvmprof.h', 'vmprof_stack.h'],
+    include_dirs = [SRC, SHARED, BACKTRACE],
+    includes = ['rvmprof.h','vmprof_stack.h'],
     libraries = _libs,
-    separate_module_files = [SRC.join('rvmprof.c')],
-    post_include_bits=['#define RPYTHON_VMPROF\n'],
+    separate_module_files = [
+        SRC.join('rvmprof.c'),
+        SHARED.join('compat.c'),
+        SHARED.join('machine.c'),
+        SHARED.join('vmp_stack.c'),
+        # symbol table already in separate_module_files
+    ] + separate_module_files,
+    post_include_bits=[],
+    compile_extra=compile_extra
     )
 global_eci = ExternalCompilationInfo(**eci_kwds)
 
 
 def setup():
-    compile_extra = ['-DRPYTHON_LL2CTYPES']
+    eci_kwds['compile_extra'].append('-DRPYTHON_LL2CTYPES')
     platform.verify_eci(ExternalCompilationInfo(
-        compile_extra=compile_extra,
-        **eci_kwds))
+                        **eci_kwds))
 
     eci = global_eci
     vmprof_init = rffi.llexternal("vmprof_init",
-                                  [rffi.INT, rffi.DOUBLE, rffi.CCHARP],
+                                  [rffi.INT, rffi.DOUBLE, rffi.INT, rffi.INT,
+                                   rffi.CCHARP, rffi.INT],
                                   rffi.CCHARP, compilation_info=eci)
-    vmprof_enable = rffi.llexternal("vmprof_enable", [], rffi.INT,
+    vmprof_enable = rffi.llexternal("vmprof_enable", [rffi.INT, rffi.INT],
+                                    rffi.INT,
                                     compilation_info=eci,
                                     save_err=rffi.RFFI_SAVE_ERRNO)
     vmprof_disable = rffi.llexternal("vmprof_disable", [], rffi.INT,
@@ -62,6 +100,7 @@
     return CInterface(locals())
 
 
+
 class CInterface(object):
     def __init__(self, namespace):
         for k, v in namespace.iteritems():
diff --git a/rpython/rlib/rvmprof/rvmprof.py b/rpython/rlib/rvmprof/rvmprof.py
--- a/rpython/rlib/rvmprof/rvmprof.py
+++ b/rpython/rlib/rvmprof/rvmprof.py
@@ -10,6 +10,8 @@
 
 MAX_FUNC_NAME = 1023
 
+PLAT_WINDOWS = sys.platform == 'win32'
+
 # ____________________________________________________________
 
 # keep in sync with vmprof_stack.h
@@ -122,7 +124,7 @@
         self._gather_all_code_objs = gather_all_code_objs
 
     @jit.dont_look_inside
-    def enable(self, fileno, interval):
+    def enable(self, fileno, interval, memory=0, native=0):
         """Enable vmprof.  Writes go to the given 'fileno'.
         The sampling interval is given by 'interval' as a number of
         seconds, as a float which must be smaller than 1.0.
@@ -132,12 +134,16 @@
         if self.is_enabled:
             raise VMProfError("vmprof is already enabled")
 
-        p_error = self.cintf.vmprof_init(fileno, interval, "pypy")
+        if PLAT_WINDOWS:
+            native = 0 # force disabled on Windows
+        lines = 0 # not supported on PyPy currently
+
+        p_error = self.cintf.vmprof_init(fileno, interval, lines, memory, "pypy", native)
         if p_error:
             raise VMProfError(rffi.charp2str(p_error))
 
         self._gather_all_code_objs()
-        res = self.cintf.vmprof_enable()
+        res = self.cintf.vmprof_enable(memory, native)
         if res < 0:
             raise VMProfError(os.strerror(rposix.get_saved_errno()))
         self.is_enabled = True
@@ -154,6 +160,7 @@
         if res < 0:
             raise VMProfError(os.strerror(rposix.get_saved_errno()))
 
+
     def _write_code_registration(self, uid, name):
         assert name.count(':') == 3 and len(name) <= MAX_FUNC_NAME, (
             "the name must be 'class:func_name:func_line:filename' "
@@ -171,6 +178,23 @@
     arguments given to the decorated function.
 
     'result_class' is ignored (backward compatibility).
+
+    ====================================
+    TRANSLATION NOTE CALL THIS ONLY ONCE
+    ====================================
+
+    This function can only be called once during translation.
+    It generates a C function called __vmprof_eval_vmprof which is used by
+    the vmprof C source code and is bound as an extern function.
+    This is necessary while walking the native stack.
+    If you see __vmprof_eval_vmprof defined twice during
+    translation, read on:
+
+    To remove this restriction do the following:
+
+    *) Extend the macro IS_VMPROF_EVAL in the vmprof source repo to check several
+       sybmols.
+    *) Give each function provided to this decorator a unique symbol name in C
     """
     if _hack_update_stack_untranslated:
         from rpython.rtyper.annlowlevel import llhelper
@@ -198,16 +222,27 @@
             unique_id = get_code_fn(*args)._vmprof_unique_id
             unique_id = rffi.cast(lltype.Signed, unique_id)
             # ^^^ removes the "known non-negative" hint for annotation
+            #
+            # Signals can occur at the two places (1) and (2), that will
+            # have added a stack entry, but the function __vmprof_eval_vmprof
+            # is not entered. This behaviour will swallow one Python stack frame
+            #
+            # Current fix: vmprof will discard this sample. (happens
+            # very infrequently)
+            #
             if not jit.we_are_jitted():
                 x = enter_code(unique_id)
+                # (1) signal here
                 try:
                     return func(*args)
                 finally:
+                    # (2) signal here
                     leave_code(x)
             else:
                 return decorated_jitted_function(unique_id, *args)
 
         decorated_function.__name__ = func.__name__ + '_rvmprof'
+        decorated_function.c_name = '__vmprof_eval_vmprof'
         return decorated_function
 
     return decorate
@@ -216,7 +251,6 @@
 def _was_registered(CodeClass):
     return hasattr(CodeClass, '_vmprof_unique_id')
 
-
 _vmprof_instance = None
 
 @specialize.memo()
diff --git a/rpython/rlib/rvmprof/src/rvmprof.c b/rpython/rlib/rvmprof/src/rvmprof.c
--- a/rpython/rlib/rvmprof/src/rvmprof.c
+++ b/rpython/rlib/rvmprof/src/rvmprof.c
@@ -2,25 +2,30 @@
 
 #ifdef RPYTHON_LL2CTYPES
    /* only for testing: ll2ctypes sets RPY_EXTERN from the command-line */
-#ifndef RPY_EXTERN
-#define RPY_EXTERN RPY_EXPORTED
-#endif
-#ifdef _WIN32
-#define RPY_EXPORTED __declspec(dllexport)
-#else
-#define RPY_EXPORTED  extern __attribute__((visibility("default")))
-#endif
 
 #else
 #  include "common_header.h"
 #  include "structdef.h"
 #  include "src/threadlocal.h"
 #  include "rvmprof.h"
+#  include "forwarddecl.h"
 #endif
 
 
-#if defined(__unix__) || defined(__APPLE__)
-#include "vmprof_main.h"
+
+#include "shared/vmprof_get_custom_offset.h"
+#ifdef VMPROF_UNIX
+#include "shared/vmprof_main.h"
 #else
-#include "vmprof_main_win32.h"
+#include "shared/vmprof_main_win32.h"
 #endif
+
+
+#ifdef RPYTHON_LL2CTYPES
+int IS_VMPROF_EVAL(void * ptr) { return 0; }
+#else
+int IS_VMPROF_EVAL(void * ptr)
+{
+    return ptr == __vmprof_eval_vmprof;
+}
+#endif
diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -1,18 +1,41 @@
-#ifdef _WIN32
-typedef long intptr_t;
+#pragma once
+
+#include "shared/vmprof.h"
+
+#define SINGLE_BUF_SIZE (8192 - 2 * sizeof(unsigned int))
+
+#ifdef VMPROF_WINDOWS
+#include "msiinttypes/inttypes.h"
+#include "msiinttypes/stdint.h"
 #else
-# include <stdint.h>
+#include <inttypes.h>
+#include <stdint.h>
 #endif
 
-RPY_EXTERN char *vmprof_init(int, double, char *);
+#ifndef RPY_EXTERN
+#define RPY_EXTERN RPY_EXPORTED
+#endif
+#ifdef _WIN32
+#ifndef RPY_EXPORTED
+#define RPY_EXPORTED __declspec(dllexport)
+#endif
+#else
+#define RPY_EXPORTED  extern __attribute__((visibility("default")))
+#endif
+
+RPY_EXTERN char *vmprof_init(int fd, double interval, int memory,
+                     int lines, const char *interp_name, int native);
 RPY_EXTERN void vmprof_ignore_signals(int);
-RPY_EXTERN int vmprof_enable(void);
+RPY_EXTERN int vmprof_enable(int memory, int native);
 RPY_EXTERN int vmprof_disable(void);
-RPY_EXTERN int vmprof_register_virtual_function(char *, long, int);
+RPY_EXTERN int vmprof_register_virtual_function(char *, intptr_t, int);
 RPY_EXTERN void* vmprof_stack_new(void);
 RPY_EXTERN int vmprof_stack_append(void*, long);
 RPY_EXTERN long vmprof_stack_pop(void*);
 RPY_EXTERN void vmprof_stack_free(void*);
 RPY_EXTERN intptr_t vmprof_get_traceback(void *, void *, intptr_t*, intptr_t);
 
+long vmprof_write_header_for_jit_addr(intptr_t *result, long n,
+                                      intptr_t addr, int max_depth);
+
 #define RVMPROF_TRACEBACK_ESTIMATE_N(num_entries)  (2 * (num_entries) + 4)
diff --git a/rpython/rlib/rvmprof/src/shared/_vmprof.c b/rpython/rlib/rvmprof/src/shared/_vmprof.c
new file mode 100644
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/_vmprof.c
@@ -0,0 +1,354 @@
+/*[clinic input]
+module _vmprof
+[clinic start generated code]*/
+/*[clinic end generated code: output=da39a3ee5e6b4b0d input=b443489e38f2be7d]*/
+
+#define _GNU_SOURCE 1
+
+#include <Python.h>
+#include <frameobject.h>
+#include <signal.h>
+
+#include "_vmprof.h"
+
+static volatile int is_enabled = 0;
+static destructor Original_code_dealloc = 0;
+static PyObject* (*_default_eval_loop)(PyFrameObject *, int) = 0;
+void dump_native_symbols(int fileno);
+
+#if VMPROF_UNIX
+#include "trampoline.h"
+#include "machine.h"
+#include "symboltable.h"
+#include "vmprof_main.h"
+#else
+#include "vmprof_main_win32.h"
+#endif
+#include "vmp_stack.h"
+
+#ifdef VMPROF_UNIX
+#ifdef __clang__
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif
+PY_EVAL_RETURN_T * vmprof_eval(PY_STACK_FRAME_T *f, int throwflag)
+{
+#ifdef X86_64
+    register PY_STACK_FRAME_T * callee_saved asm("rbx");
+#elif defined(X86_32)
+    register PY_STACK_FRAME_T * callee_saved asm("edi");
+#else
+#    error "platform not supported"
+#endif
+
+    asm volatile(
+#ifdef X86_64
+        "movq %1, %0\t\n"
+#elif defined(X86_32)
+        "mov %1, %0\t\n"
+#else
+#    error "platform not supported"
+#endif
+        : "=r" (callee_saved)
+        : "r" (f) );
+    return _default_eval_loop(f, throwflag);
+}
+#endif
+
+static int emit_code_object(PyCodeObject *co)
+{
+    char buf[MAX_FUNC_NAME + 1];
+    char *co_name, *co_filename;
+    int co_firstlineno;
+    int sz;
+#if PY_MAJOR_VERSION >= 3
+    co_name = PyUnicode_AsUTF8(co->co_name);
+    if (co_name == NULL)
+        return -1;
+    co_filename = PyUnicode_AsUTF8(co->co_filename);
+    if (co_filename == NULL)
+        return -1;
+#else
+    co_name = PyString_AS_STRING(co->co_name);
+    co_filename = PyString_AS_STRING(co->co_filename);
+#endif
+    co_firstlineno = co->co_firstlineno;
+
+    sz = snprintf(buf, MAX_FUNC_NAME / 2, "py:%s", co_name);
+    if (sz < 0) sz = 0;
+    if (sz > MAX_FUNC_NAME / 2) sz = MAX_FUNC_NAME / 2;
+    snprintf(buf + sz, MAX_FUNC_NAME / 2, ":%d:%s", co_firstlineno,
+             co_filename);
+    return vmprof_register_virtual_function(buf, CODE_ADDR_TO_UID(co), 500000);
+}
+
+static int _look_for_code_object(PyObject *o, void *all_codes)
+{
+    if (PyCode_Check(o) && !PySet_Contains((PyObject *)all_codes, o)) {
+        Py_ssize_t i;
+        PyCodeObject *co = (PyCodeObject *)o;
+        if (emit_code_object(co) < 0)
+            return -1;
+        if (PySet_Add((PyObject *)all_codes, o) < 0)
+            return -1;
+
+        /* as a special case, recursively look for and add code
+           objects found in the co_consts.  The problem is that code
+           objects are not created as GC-aware in CPython, so we need
+           to hack like this to hope to find most of them. 
+        */
+        i = PyTuple_Size(co->co_consts);
+        while (i > 0) {
+            --i;
+            if (_look_for_code_object(PyTuple_GET_ITEM(co->co_consts, i),
+                                      all_codes) < 0)
+                return -1;
+        }
+    }
+    return 0;
+}
+
+static void emit_all_code_objects(void)
+{
+    PyObject *gc_module = NULL, *lst = NULL, *all_codes = NULL;
+    Py_ssize_t i, size;
+
+    gc_module = PyImport_ImportModuleNoBlock("gc");
+    if (gc_module == NULL)
+        goto error;
+
+    lst = PyObject_CallMethod(gc_module, "get_objects", "");
+    if (lst == NULL || !PyList_Check(lst))
+        goto error;
+
+    all_codes = PySet_New(NULL);
+    if (all_codes == NULL)
+        goto error;
+
+    size = PyList_GET_SIZE(lst);
+    for (i = 0; i < size; i++) {
+        PyObject *o = PyList_GET_ITEM(lst, i);
+        if (o->ob_type->tp_traverse &&
+            o->ob_type->tp_traverse(o, _look_for_code_object, (void *)all_codes)
+                < 0)
+            goto error;
+    }
+
+ error:
+    Py_XDECREF(all_codes);
+    Py_XDECREF(lst);
+    Py_XDECREF(gc_module);
+}
+
+static void cpyprof_code_dealloc(PyObject *co)
+{
+    if (is_enabled) {
+        emit_code_object((PyCodeObject *)co);
+        /* xxx error return values are ignored */
+    }
+    Original_code_dealloc(co);
+}
+
+static PyObject *enable_vmprof(PyObject* self, PyObject *args)
+{
+    int fd;
+    int memory = 0;
+    int lines = 0;
+    int native = 0;
+    double interval;
+    char *p_error;
+
+    if (!PyArg_ParseTuple(args, "id|iii", &fd, &interval, &memory, &lines, &native)) {
+        return NULL;
+    }
+    assert(fd >= 0 && "file descripter provided to vmprof must not" \
+                      " be less then zero.");
+
+    if (is_enabled) {
+        PyErr_SetString(PyExc_ValueError, "vmprof is already enabled");
+        return NULL;
+    }
+
+    vmp_profile_lines(lines);
+
+    if (!Original_code_dealloc) {
+        Original_code_dealloc = PyCode_Type.tp_dealloc;
+        PyCode_Type.tp_dealloc = &cpyprof_code_dealloc;
+    }
+
+    p_error = vmprof_init(fd, interval, memory, lines, "cpython", native);
+    if (p_error) {
+        PyErr_SetString(PyExc_ValueError, p_error);
+        return NULL;
+    }
+
+    if (vmprof_enable(memory, native) < 0) {
+        PyErr_SetFromErrno(PyExc_OSError);
+        return NULL;
+    }
+
+    is_enabled = 1;
+
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+static PyObject *
+disable_vmprof(PyObject *module, PyObject *noarg)
+{
+    if (!is_enabled) {
+        PyErr_SetString(PyExc_ValueError, "vmprof is not enabled");
+        return NULL;
+    }
+    is_enabled = 0;
+    vmprof_ignore_signals(1);
+    emit_all_code_objects();
+
+    if (vmprof_disable() < 0) {
+        PyErr_SetFromErrno(PyExc_OSError);
+        return NULL;
+    }
+    if (PyErr_Occurred())
+        return NULL;
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+static PyObject *
+write_all_code_objects(PyObject *module, PyObject *noargs)
+{
+    if (!is_enabled) {
+        PyErr_SetString(PyExc_ValueError, "vmprof is not enabled");
+        return NULL;
+    }
+    emit_all_code_objects();
+    if (PyErr_Occurred())
+        return NULL;
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+
+static PyObject *
+sample_stack_now(PyObject *module, PyObject * args)
+{
+    PyThreadState * tstate = NULL;
+    PyObject * list = NULL;
+    int i;
+    int entry_count;
+    void ** m;
+    void * routine_ip;
+    long skip = 0;
+
+    // stop any signal to occur
+    vmprof_ignore_signals(1);
+
+    list = PyList_New(0);
+    if (list == NULL) {
+        goto error;
+    }
+
+    if (!PyArg_ParseTuple(args, "l", &skip)) {
+        goto error;
+    }
+
+    tstate = PyGILState_GetThisThreadState();
+    m = (void**)malloc(SINGLE_BUF_SIZE);
+    if (m == NULL) {
+        PyErr_SetString(PyExc_MemoryError, "could not allocate buffer for stack trace");
+        vmprof_ignore_signals(0);
+        return NULL;
+    }
+    entry_count = vmp_walk_and_record_stack(tstate->frame, m, MAX_STACK_DEPTH-1, skip, 0);
+
+    for (i = 0; i < entry_count; i++) {
+        routine_ip = m[i];
+        PyList_Append(list, PyLong_NEW((ssize_t)routine_ip));
+    }
+
+    free(m);
+
+    Py_INCREF(list);
+
+    vmprof_ignore_signals(0);
+    return list;
+error:
+    Py_DECREF(list);
+    Py_INCREF(Py_None);
+
+    vmprof_ignore_signals(0);
+    return Py_None;
+}
+
+#ifdef VMP_SUPPORTS_NATIVE_PROFILING
+static PyObject *
+resolve_addr(PyObject *module, PyObject *args) {
+    long long addr;
+    PyObject * o_name = NULL;
+    PyObject * o_lineno = NULL;
+    PyObject * o_srcfile = NULL;
+    char name[128];
+    int lineno = 0;
+    char srcfile[256];
+
+    if (!PyArg_ParseTuple(args, "L", &addr)) {
+        return NULL;
+    }
+    name[0] = '\x00';
+    srcfile[0] = '-';
+    srcfile[1] = '\x00';
+    if (vmp_resolve_addr((void*)addr, name, 128, &lineno, srcfile, 256) != 0) {
+        goto error;
+    }
+
+    o_name = PyStr_NEW(name);
+    if (o_name == NULL) goto error;
+    o_lineno = PyLong_NEW(lineno);
+    if (o_lineno == NULL) goto error;
+    o_srcfile = PyStr_NEW(srcfile);
+    if (o_srcfile == NULL) goto error;
+    //
+    return PyTuple_Pack(3, o_name, o_lineno, o_srcfile);
+error:
+    Py_XDECREF(o_name);
+    Py_XDECREF(o_lineno);
+    Py_XDECREF(o_srcfile);
+
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+#endif
+
+static PyMethodDef VMProfMethods[] = {
+    {"enable",  enable_vmprof, METH_VARARGS, "Enable profiling."},
+    {"disable", disable_vmprof, METH_NOARGS, "Disable profiling."},
+    {"write_all_code_objects", write_all_code_objects, METH_NOARGS,
+     "Write eagerly all the IDs of code objects"},
+    {"sample_stack_now", sample_stack_now, METH_VARARGS, "Sample the stack now"},
+#ifdef VMP_SUPPORTS_NATIVE_PROFILING
+    {"resolve_addr", resolve_addr, METH_VARARGS, "Return the name of the addr"},
+#endif
+    {NULL, NULL, 0, NULL}        /* Sentinel */
+};
+
+
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef VmprofModule = {
+    PyModuleDef_HEAD_INIT,
+    "_vmprof",
+    "",  // doc
+    -1,  // size
+    VMProfMethods
+};
+
+PyMODINIT_FUNC PyInit__vmprof(void)
+{
+    return PyModule_Create(&VmprofModule);
+}
+#else
+PyMODINIT_FUNC init_vmprof(void)
+{
+    Py_InitModule("_vmprof", VMProfMethods);
+}
+#endif
diff --git a/rpython/rlib/rvmprof/src/shared/_vmprof.h b/rpython/rlib/rvmprof/src/shared/_vmprof.h
new file mode 100644
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/_vmprof.h
@@ -0,0 +1,53 @@
+#pragma once
+
+#include "vmprof.h"
+
+#ifdef VMPROF_WINDOWS
+
+#include <Python.h>
+// CPython 3.6 defines all the inttypes for us, we do not need the msiinttypes
+// library for that version or any newer!
+#if (PY_VERSION_HEX < 0x3060000)
+#include "msiinttypes/inttypes.h"
+#include "msiinttypes/stdint.h"
+#endif
+
+#else
+#include <inttypes.h>
+#include <stdint.h>
+#include <stddef.h>
+#endif
+
+/**
+ * This whole setup is very strange. There was just one C file called
+ * _vmprof.c which included all *.h files to copy code. Unsure what
+ * the goal was with this design, but I assume it just 'GREW'
+ *
+ * Thus I'm (plan_rich) slowly trying to separate this. *.h files
+ * should not have complex implementations (all of them currently have them)
+ */
+
+
+#define SINGLE_BUF_SIZE (8192 - 2 * sizeof(unsigned int))
+
+#define ROUTINE_IS_PYTHON(RIP) ((unsigned long long)RIP & 0x1) == 0
+#define ROUTINE_IS_C(RIP) ((unsigned long long)RIP & 0x1) == 1
+
+/* This returns the address of the code object
+   as the identifier.  The mapping from identifiers to string
+   representations of the code object is done elsewhere, namely:
+
+   * If the code object dies while vmprof is enabled,
+     PyCode_Type.tp_dealloc will emit it.  (We don't handle nicely
+     for now the case where several code objects are created and die
+     at the same memory address.)
+
+   * When _vmprof.disable() is called, then we look around the
+     process for code objects and emit all the ones that we can
+     find (which we hope is very close to 100% of them).
+*/
+#define CODE_ADDR_TO_UID(co)  (((intptr_t)(co)))
+
+#define CPYTHON_HAS_FRAME_EVALUATION PY_VERSION_HEX >= 0x30600B0
+
+int vmp_write_all(const char *buf, size_t bufsize);
diff --git a/rpython/rlib/rvmprof/src/shared/compat.c b/rpython/rlib/rvmprof/src/shared/compat.c
new file mode 100644
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/compat.c
@@ -0,0 +1,140 @@
+#include "compat.h"
+
+#include <string.h>
+#include <assert.h>
+#if VMPROF_WINDOWS
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#else
+#include <time.h>
+#include <sys/time.h>
+#endif
+
+static int _vmp_profile_fileno = -1;
+
+int vmp_profile_fileno(void) {
+    return _vmp_profile_fileno;
+}
+void vmp_set_profile_fileno(int fileno) {
+    _vmp_profile_fileno = fileno;
+}
+
+#ifndef VMPROF_WINDOWS
+int vmp_write_all(const char *buf, size_t bufsize)
+{
+    ssize_t count;
+    if (_vmp_profile_fileno == -1) {
+        return -1;
+    }
+    while (bufsize > 0) {
+        count = write(_vmp_profile_fileno, buf, bufsize);
+        if (count <= 0)
+            return -1;   /* failed */
+        buf += count;
+        bufsize -= count;
+    }
+    return 0;
+}
+#endif
+
+int vmp_write_meta(const char * key, const char * value)
+{
+    char marker = MARKER_META;
+    long x = (long)strlen(key);
+    vmp_write_all(&marker, 1);
+    vmp_write_all((char*)&x, sizeof(long));
+    vmp_write_all(key, x);
+    x = (long)strlen(value);
+    vmp_write_all((char*)&x, sizeof(long));
+    vmp_write_all(value, x);
+    return 0;
+}
+
+/**
+ * Write the time and zone now.
+ */
+
+struct timezone_buf {
+    int64_t tv_sec;
+    int64_t tv_usec;
+};
+#define __SIZE (1+sizeof(struct timezone_buf)+8)
+
+#ifdef VMPROF_UNIX
+int vmp_write_time_now(int marker) {
+    char buffer[__SIZE];
+    struct timezone_buf buf;
+
+    (void)memset(&buffer, 0, __SIZE);
+
+    assert((marker == MARKER_TRAILER || marker == MARKER_TIME_N_ZONE) && \
+           "marker must be either a trailer or time_n_zone!");
+
+    struct timeval tv;
+    time_t now;
+    struct tm tm;
+
+
+    /* copy over to the struct */
+    if (gettimeofday(&tv, NULL) != 0) {
+        return -1;
+    }
+    if (time(&now) == (time_t)-1) {
+        return -1;
+    }
+    if (localtime_r(&now, &tm) == NULL) {
+        return -1;
+    }
+    buf.tv_sec = tv.tv_sec;
+    buf.tv_usec = tv.tv_usec;
+    strncpy(((char*)buffer)+__SIZE-8, tm.tm_zone, 8);
+
+    buffer[0] = marker;
+    (void)memcpy(buffer+1, &buf, sizeof(struct timezone_buf));
+    vmp_write_all(buffer, __SIZE);
+    return 0;
+}
+#endif
+
+#ifdef VMPROF_WINDOWS
+int vmp_write_time_now(int marker) {
+    char buffer[__SIZE];
+    struct timezone_buf buf;
+
+    /**
+     * http://stackoverflow.com/questions/10905892/equivalent-of-gettimeday-for-windows
+     */
+
+    // Note: some broken versions only have 8 trailing zero's, the correct
+    // epoch has 9 trailing zero's
+    static const uint64_t EPOCH = ((uint64_t) 116444736000000000ULL);
+
+    SYSTEMTIME  system_time;
+    FILETIME    file_time;
+    uint64_t    time;
+
+    (void)memset(&buffer, 0, __SIZE);
+
+    assert((marker == MARKER_TRAILER || marker == MARKER_TIME_N_ZONE) && \
+           "marker must be either a trailer or time_n_zone!");
+
+
+    GetSystemTime( &system_time );
+    SystemTimeToFileTime( &system_time, &file_time );
+    time =  ((uint64_t)file_time.dwLowDateTime )      ;
+    time += ((uint64_t)file_time.dwHighDateTime) << 32;
+
+    buf.tv_sec = ((time - EPOCH) / 10000000L);
+    buf.tv_usec = (system_time.wMilliseconds * 1000);
+
+    // time zone not implemented on windows
+    memset(((char*)buffer)+__SIZE-8, 0, 8);
+    (void)memcpy(((char*)buffer)+__SIZE-8, "UTC", 3);
+
+    buffer[0] = marker;
+    (void)memcpy(buffer+1, &buf, sizeof(struct timezone_buf));
+    vmp_write_all(buffer, __SIZE);
+    return 0;
+}
+#endif
+#undef __SIZE
diff --git a/rpython/rlib/rvmprof/src/shared/compat.h b/rpython/rlib/rvmprof/src/shared/compat.h
new file mode 100644
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/compat.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "vmprof.h"
+
+#ifndef RPYTHON_VMPROF
+#  if PY_MAJOR_VERSION >= 3
+      #define PyStr_AS_STRING PyBytes_AS_STRING
+      #define PyStr_GET_SIZE PyBytes_GET_SIZE
+      #define PyStr_NEW      PyUnicode_FromString
+      #define PyLong_NEW     PyLong_FromSsize_t

From pypy.commits at gmail.com  Sat Apr  1 14:38:23 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 11:38:23 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: (blind) attempt to support EINTR in
 win32's sleep().
Message-ID: <58dff39f.6ca0df0a.13103.48ce@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90904:8a164b222d5a
Date: 2017-04-01 20:37 +0200
http://bitbucket.org/pypy/pypy/changeset/8a164b222d5a/

Log:	(blind) attempt to support EINTR in win32's sleep(). Based on
	CPython b1abd06465fc

diff --git a/pypy/module/time/interp_time.py b/pypy/module/time/interp_time.py
--- a/pypy/module/time/interp_time.py
+++ b/pypy/module/time/interp_time.py
@@ -447,17 +447,31 @@
     errno = rposix.get_saved_errno()
     return _strerror(errno)
 
-if sys.platform != 'win32':
-    from errno import EINTR
-    from rpython.rlib.rtime import c_select
+from errno import EINTR
+from rpython.rlib.rtime import c_select
 
-    @unwrap_spec(secs=float)
-    def sleep(space, secs):
-        if secs < 0:
-            raise oefmt(space.w_ValueError,
-                        "sleep length must be non-negative")
-        end_time = timeutils.monotonic(space) + secs
-        while True:
+ at unwrap_spec(secs=float)
+def sleep(space, secs):
+    if secs < 0:
+        raise oefmt(space.w_ValueError,
+                    "sleep length must be non-negative")
+    end_time = timeutils.monotonic(space) + secs
+    while True:
+        if _WIN:
+            # as decreed by Guido, only the main thread can be
+            # interrupted.
+            main_thread = space.fromcache(State).main_thread
+            interruptible = (main_thread == thread.get_ident())
+            millisecs = int(secs * 1000)
+            if millisecs == 0.0 or not interruptible:
+                rtime.sleep(secs)
+                break
+            interrupt_event = space.fromcache(State).get_interrupt_event()
+            rwin32.ResetEvent(interrupt_event)
+            rc = rwin32.WaitForSingleObject(interrupt_event, millisecs)
+            if rc != rwin32.WAIT_OBJECT_0:
+                break
+        else:
             void = lltype.nullptr(rffi.VOIDP.TO)
             with lltype.scoped_alloc(TIMEVAL) as t:
                 frac = math.fmod(secs, 1.0)
@@ -469,43 +483,10 @@
                 break    # normal path
             if rposix.get_saved_errno() != EINTR:
                 raise exception_from_saved_errno(space, space.w_OSError)
-            space.getexecutioncontext().checksignals()
-            secs = end_time - timeutils.monotonic(space)   # retry
-            if secs <= 0.0:
-                break
-
-else:
-    from rpython.rlib import rwin32
-    from errno import EINTR
-    def _simple_sleep(space, secs, interruptible):
-        if secs == 0.0 or not interruptible:
-            rtime.sleep(secs)
-        else:
-            millisecs = int(secs * 1000)
-            interrupt_event = space.fromcache(State).get_interrupt_event()
-            rwin32.ResetEvent(interrupt_event)
-            rc = rwin32.WaitForSingleObject(interrupt_event, millisecs)
-            if rc == rwin32.WAIT_OBJECT_0:
-                # Yield to make sure real Python signal handler
-                # called.
-                rtime.sleep(0.001)
-                raise wrap_oserror(space,
-                                   OSError(EINTR, "sleep() interrupted"))
-    @unwrap_spec(secs=float)
-    def sleep(space, secs):
-        XXX   # review for EINTR / PEP475
-        if secs < 0:
-            raise oefmt(space.w_ValueError,
-                        "sleep length must be non-negative")
-        # as decreed by Guido, only the main thread can be
-        # interrupted.
-        main_thread = space.fromcache(State).main_thread
-        interruptible = (main_thread == thread.get_ident())
-        MAX = sys.maxint / 1000.0 # > 24 days
-        while secs > MAX:
-            _simple_sleep(space, MAX, interruptible)
-            secs -= MAX
-        _simple_sleep(space, secs, interruptible)
+        space.getexecutioncontext().checksignals()
+        secs = end_time - timeutils.monotonic(space)   # retry
+        if secs <= 0.0:
+            break
 
 def _get_module_object(space, obj_name):
     w_module = space.getbuiltinmodule('time')

From pypy.commits at gmail.com  Sat Apr  1 14:44:39 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 11:44:39 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Fix imports on Windows
Message-ID: <58dff517.dda1df0a.e6b93.45cb@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90905:31102549174f
Date: 2017-04-01 20:44 +0200
http://bitbucket.org/pypy/pypy/changeset/31102549174f/

Log:	Fix imports on Windows

diff --git a/pypy/module/time/interp_time.py b/pypy/module/time/interp_time.py
--- a/pypy/module/time/interp_time.py
+++ b/pypy/module/time/interp_time.py
@@ -448,7 +448,9 @@
     return _strerror(errno)
 
 from errno import EINTR
-from rpython.rlib.rtime import c_select
+if not _WIN:
+    from rpython.rlib.rtime import c_select
+from rpython.rlib import rwin32
 
 @unwrap_spec(secs=float)
 def sleep(space, secs):

From pypy.commits at gmail.com  Sat Apr  1 15:14:08 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 12:14:08 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Restore the check for very large sleep
 delays
Message-ID: <58dffc00.16a1df0a.3ba5d.5652@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90906:52c431bcbf2f
Date: 2017-04-01 21:13 +0200
http://bitbucket.org/pypy/pypy/changeset/52c431bcbf2f/

Log:	Restore the check for very large sleep delays This code is already
	inside a retry loop.

diff --git a/pypy/module/time/interp_time.py b/pypy/module/time/interp_time.py
--- a/pypy/module/time/interp_time.py
+++ b/pypy/module/time/interp_time.py
@@ -468,6 +468,9 @@
             if millisecs == 0.0 or not interruptible:
                 rtime.sleep(secs)
                 break
+            MAX = sys.maxint / 1000.0  # > 24 days
+            if millisecs > MAX:
+                millisecs = MAX
             interrupt_event = space.fromcache(State).get_interrupt_event()
             rwin32.ResetEvent(interrupt_event)
             rc = rwin32.WaitForSingleObject(interrupt_event, millisecs)

From pypy.commits at gmail.com  Sat Apr  1 15:30:04 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 12:30:04 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Fix translation; millisecs should be ints.
Message-ID: <58dfffbc.6d82df0a.50aa6.53a9@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90907:6c201838bca7
Date: 2017-04-01 21:29 +0200
http://bitbucket.org/pypy/pypy/changeset/6c201838bca7/

Log:	Fix translation; millisecs should be ints.

diff --git a/pypy/module/time/interp_time.py b/pypy/module/time/interp_time.py
--- a/pypy/module/time/interp_time.py
+++ b/pypy/module/time/interp_time.py
@@ -465,10 +465,10 @@
             main_thread = space.fromcache(State).main_thread
             interruptible = (main_thread == thread.get_ident())
             millisecs = int(secs * 1000)
-            if millisecs == 0.0 or not interruptible:
+            if millisecs == 0 or not interruptible:
                 rtime.sleep(secs)
                 break
-            MAX = sys.maxint / 1000.0  # > 24 days
+            MAX = int(sys.maxint / 1000)  # > 24 days
             if millisecs > MAX:
                 millisecs = MAX
             interrupt_event = space.fromcache(State).get_interrupt_event()

From pypy.commits at gmail.com  Sat Apr  1 16:01:20 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 13:01:20 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Fix translation for platforms without
 tm_zone
Message-ID: <58e00710.c8151c0a.dbbdf.f085@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90908:4dec46cc728e
Date: 2017-04-01 22:00 +0200
http://bitbucket.org/pypy/pypy/changeset/4dec46cc728e/

Log:	Fix translation for platforms without tm_zone

diff --git a/pypy/module/time/interp_time.py b/pypy/module/time/interp_time.py
--- a/pypy/module/time/interp_time.py
+++ b/pypy/module/time/interp_time.py
@@ -588,10 +588,10 @@
     rffi.setintfield(glob_buf, 'c_tm_yday', tm_yday)
     rffi.setintfield(glob_buf, 'c_tm_isdst', space.c_int_w(tup_w[8]))
     #
-    old_tm_zone = glob_buf.c_tm_zone
-    glob_buf.c_tm_zone = lltype.nullptr(rffi.CCHARP.TO)
-    rffi.setintfield(glob_buf, 'c_tm_gmtoff', 0)
     if HAS_TM_ZONE :
+        old_tm_zone = glob_buf.c_tm_zone
+        glob_buf.c_tm_zone = lltype.nullptr(rffi.CCHARP.TO)
+        rffi.setintfield(glob_buf, 'c_tm_gmtoff', 0)
         if len(tup_w) >= 10:
             # NOTE this is not cleanly solved!
             # it saves the string that is later deleted when this

From pypy.commits at gmail.com  Sat Apr  1 16:31:51 2017
From: pypy.commits at gmail.com (mattip)
Date: Sat, 01 Apr 2017 13:31:51 -0700 (PDT)
Subject: [pypy-commit] buildbot default: move PYPYBUILDBOT and NUMPY_64 to
 bencher4 buildslave
Message-ID: <58e00e37.8d8e1c0a.fd105.feb7@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r1021:38147daa8ef7
Date: 2017-04-01 23:31 +0300
http://bitbucket.org/pypy/buildbot/changeset/38147daa8ef7/

Log:	move PYPYBUILDBOT and NUMPY_64 to bencher4 buildslave

diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -297,7 +297,7 @@
             JITFREEBSD964,             # on tavendo
             JITMACOSX64,               # on xerxes
             # buildbot selftest
-            PYPYBUILDBOT               # on cobra
+            PYPYBUILDBOT               # on bencher4
             ], branch='default', hour=0, minute=0),
 
         Nightly("nightly-1-00", [
@@ -522,11 +522,13 @@
                    "category": 'linux-ppc64',
                    },
                   {'name': NUMPY_64,
-                   'slavenames': ["tannit64"],
+                   'slavenames': ["bencher4"],
+                   #'slavenames': ["tannit64"],
                    'builddir': NUMPY_64,
                    'factory': pypyNumpyCompatability,
                    'category': 'numpy',
-                   'locks': [TannitCPU.access('counting')],
+                   #'locks': [TannitCPU.access('counting')],
+                   "locks": [Bencher4Lock.access('counting')],
                   },
                   {'name': NUMPY_WIN,
                    'slavenames': ["allegro_win32", "SalsaSalsa"],
@@ -536,10 +538,11 @@
                    'category': 'numpy',
                   },
                   {'name': PYPYBUILDBOT,
-                   'slavenames': ['cobra'],
+                   'slavenames': ['bencher4'],
                    'builddir': PYPYBUILDBOT,
                    'factory': pypybuilds.PyPyBuildbotTestFactory(),
                    'category': 'buildbot',
+                   "locks": [Bencher4Lock.access('counting')],
                   },
                   # S390X
                   {"name": LINUX_S390X,

From pypy.commits at gmail.com  Sat Apr  1 16:57:40 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 13:57:40 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Let set_wakeup_fd translate (and fail) on
 Windows
Message-ID: <58e01444.52911c0a.d98af.fbab@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90909:80199bfe76d1
Date: 2017-04-01 22:56 +0200
http://bitbucket.org/pypy/pypy/changeset/80199bfe76d1/

Log:	Let set_wakeup_fd translate (and fail) on Windows

diff --git a/pypy/module/signal/interp_signal.py b/pypy/module/signal/interp_signal.py
--- a/pypy/module/signal/interp_signal.py
+++ b/pypy/module/signal/interp_signal.py
@@ -253,6 +253,11 @@
         raise oefmt(space.w_ValueError,
                     "set_wakeup_fd only works in main thread or with "
                     "__pypy__.thread.enable_signals()")
+
+    if WIN32:
+        raise oefmt(space.w_NotImplementedError, 
+                    "signal.set_wakeup_fd is not implemented on Windows")
+
     if fd != -1:
         if not rposix.is_valid_fd(fd):
             raise oefmt(space.w_ValueError, "invalid fd")

From pypy.commits at gmail.com  Sat Apr  1 17:20:55 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 14:20:55 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Fix (isn't this function also used on
 Posix platforms?)
Message-ID: <58e019b7.50231c0a.4f6c4.fdfe@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90910:96e11f7f941c
Date: 2017-04-01 23:20 +0200
http://bitbucket.org/pypy/pypy/changeset/96e11f7f941c/

Log:	Fix (isn't this function also used on Posix platforms?)

diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -2168,7 +2168,7 @@
         # not a bound method like 'getexecutioncontext().checksignals'.
         # Otherwise, we can't use it from several independent places.
         _sigcheck.space = space
-        return space.newbytes(rurandom.urandom(context, n, _signal_checker))
+        return space.newbytes(rurandom.urandom(context, size, _signal_checker))
     except OSError as e:
         # 'rurandom' should catch and retry internally if it gets EINTR
         # (at least in os.read(), which is probably enough in practice)

From pypy.commits at gmail.com  Sat Apr  1 17:36:51 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sat, 01 Apr 2017 14:36:51 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Fix
Message-ID: <58e01d73.d48e1c0a.fbff6.0788@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90911:d5edca577439
Date: 2017-04-01 23:36 +0200
http://bitbucket.org/pypy/pypy/changeset/d5edca577439/

Log:	Fix

diff --git a/pypy/module/_multiprocessing/interp_win32.py b/pypy/module/_multiprocessing/interp_win32.py
--- a/pypy/module/_multiprocessing/interp_win32.py
+++ b/pypy/module/_multiprocessing/interp_win32.py
@@ -35,7 +35,7 @@
     return rffi.cast(rwin32.HANDLE, space.int_w(w_handle))
 
 def w_handle(space, handle):
-    return space.wrap(rffi.cast(rffi.INTPTR_T, handle))
+    return space.newint(rffi.cast(rffi.INTPTR_T, handle))
 
 _CreateNamedPipe = rwin32.winexternal(
     'CreateNamedPipeA', [

From pypy.commits at gmail.com  Sun Apr  2 04:09:26 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sun, 02 Apr 2017 01:09:26 -0700 (PDT)
Subject: [pypy-commit] pypy default: Fix translation: these missing wrappers
 take no keyword arguments.
Message-ID: <58e0b1b6.d28a1c0a.d944.75e0@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r90912:a01f47870f2b
Date: 2017-04-02 10:08 +0200
http://bitbucket.org/pypy/pypy/changeset/a01f47870f2b/

Log:	Fix translation: these missing wrappers take no keyword arguments.

diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -795,7 +795,7 @@
 missing_wrappers = ['wrap_indexargfunc', 'wrap_delslice', 'wrap_coercefunc']
 for name in missing_wrappers:
     assert name not in globals()
-    def missing_wrapper(space, w_self, w_args, func, w_kwds):
+    def missing_wrapper(space, w_self, w_args, func):
         print "cpyext: missing slot wrapper " + name
         raise NotImplementedError("Slot wrapper " + name)
     missing_wrapper.__name__ = name

From pypy.commits at gmail.com  Sun Apr  2 04:09:29 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sun, 02 Apr 2017 01:09:29 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: hg merge default
Message-ID: <58e0b1b9.5aa5df0a.d8d35.848f@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90913:8923cca262cd
Date: 2017-04-02 10:08 +0200
http://bitbucket.org/pypy/pypy/changeset/8923cca262cd/

Log:	hg merge default

diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -796,7 +796,7 @@
 missing_wrappers = ['wrap_indexargfunc', 'wrap_del']
 for name in missing_wrappers:
     assert name not in globals()
-    def missing_wrapper(space, w_self, w_args, func, w_kwds):
+    def missing_wrapper(space, w_self, w_args, func):
         print "cpyext: missing slot wrapper " + name
         raise NotImplementedError("Slot wrapper " + name)
     missing_wrapper.__name__ = name

From pypy.commits at gmail.com  Sun Apr  2 05:03:45 2017
From: pypy.commits at gmail.com (nanjekye)
Date: Sun, 02 Apr 2017 02:03:45 -0700 (PDT)
Subject: [pypy-commit] pypy superjumbo: solving typos in test_rposix.py
Message-ID: <58e0be71.9285df0a.3ae37.f03b@mx.google.com>

Author: Joannah Nanjekye <nanjekyejoannah at gmail.com>
Branch: superjumbo
Changeset: r90916:02d3198db10f
Date: 2017-04-01 17:03 +0300
http://bitbucket.org/pypy/pypy/changeset/02d3198db10f/

Log:	solving typos in test_rposix.py

diff --git a/rpython/rlib/test/test_rposix.py b/rpython/rlib/test/test_rposix.py
--- a/rpython/rlib/test/test_rposix.py
+++ b/rpython/rlib/test/test_rposix.py
@@ -752,25 +752,24 @@
     py.test.raises(OSError, rposix.pwrite, fd, b'ea', 1)
 
 @rposix_requires('posix_fadvise')
-def posix_fadvise():
+def test_posix_fadvise():
     fname = str(udir.join('test_os_posix_fadvise'))
     localdir = os.getcwd()
-    os.mkdir(self.path2 + 'test_os_posix_fadvise')
+    os.mkdir(fname)
     try:
         fd = os.open(fname, os.O_RDONLY, 0777)
         try:
             mypath = os.getcwd()
             assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_WILLNEED) == 0
             assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_NORMAL) == 0
-            assert rposix.posix_fadvise(fd, 0, 0, rPOSIX_FADV_SEQUENTIAL) == 0
+            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_SEQUENTIAL) == 0
             assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_RANDOM) == 0
             assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_NOREUSE) == 0
-            assert rposix.posix_fadvise(fd, 0, 0, rPOSIX_FADV_DONTNEED) == 0
+            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_DONTNEED) == 0
         finally:
             os.close(fd)
     finally:
         os.chdir(localdir)
-    py.test.raises(OSError, rposix.posix_fadvise, fd, 0, 0, rPOSIX_FADV_DONTNEED)
 
 @rposix_requires('posix_fallocate')
 def test_posix_fallocate():

From pypy.commits at gmail.com  Sun Apr  2 05:03:40 2017
From: pypy.commits at gmail.com (nanjekye)
Date: Sun, 02 Apr 2017 02:03:40 -0700 (PDT)
Subject: [pypy-commit] pypy superjumbo: posix_fallocate and posix_fadvise
 implementation
Message-ID: <58e0be6c.87d91c0a.5b3f3.c83a@mx.google.com>

Author: Joannah Nanjekye <nanjekyejoannah at gmail.com>
Branch: superjumbo
Changeset: r90914:45f6af71a2e5
Date: 2017-03-27 15:06 +0300
http://bitbucket.org/pypy/pypy/changeset/45f6af71a2e5/

Log:	posix_fallocate and posix_fadvise implementation

diff --git a/pypy/module/posix/__init__.py b/pypy/module/posix/__init__.py
--- a/pypy/module/posix/__init__.py
+++ b/pypy/module/posix/__init__.py
@@ -222,6 +222,14 @@
     if hasattr(rposix, 'pwrite'):
        interpleveldefs['pwrite'] = 'interp_posix.pwrite'
 
+    if hasattr(rposix, 'posix_fadvise'):
+        interpleveldefs['posix_fadvise'] = 'interp_posix.posix_fadvise'
+        interpleveldefs['posix_fallocate'] = 'interp_posix.posix_fallocate'
+        for _name in ['POSIX_FADV_WILLNEED', 'POSIX_FADV_NORMAL', 'POSIX_FADV_SEQUENTIAL',
+        'POSIX_FADV_RANDOM', 'POSIX_FADV_NOREUSE', 'POSIX_FADV_DONTNEED']:
+            assert getattr(rposix, _name) is not None, "missing %r" % (_name,)
+            interpleveldefs[_name] = 'space.wrap(%d)' % getattr(rposix, _name)
+
     for _name in ["O_CLOEXEC"]:
         if getattr(rposix, _name) is not None:
             interpleveldefs[_name] = 'space.wrap(%d)' % getattr(rposix, _name)
diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -401,6 +401,30 @@
         else:
             return space.newint(res)
 
+ at unwrap_spec(fd=c_int, length=r_longlong, offset=r_longlong)
+def posix_fallocate(space, fd, offset, length):
+    """allocate file space .
+    """
+    while True:
+        try:
+            s = rposix.posix_fallocate(fd, offset, length)
+        except OSError as e:
+            wrap_oserror(space, e, eintr_retry=True)
+        else:
+           return space.newint(s)
+
+ at unwrap_spec(fd=c_int, offset=r_longlong, length=r_longlong, advice=int)
+def posix_fadvise(space, fd, offset, length, advice):
+    """predeclare an access pattern for file data .
+    """
+    while True:
+        try:
+            res = rposix.posix_fadvise(fd, offset, length, advice)
+        except OSError as e:
+            wrap_oserror(space, e, eintr_retry=True)
+        else:
+            return space.newint(res)
+
 # ____________________________________________________________
 
 STAT_FIELDS = unrolling_iterable(enumerate(rposix_stat.STAT_FIELDS))
diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/test_posix2.py
--- a/pypy/module/posix/test/test_posix2.py
+++ b/pypy/module/posix/test/test_posix2.py
@@ -860,6 +860,42 @@
             finally:
                 os.close(fd)
 
+    if hasattr(rposix, 'posix_fadvise'):
+        def test_os_posix_fadvise(self):
+            posix, os = self.posix, self.os
+            localdir = os.getcwd()
+            os.mkdir(self.path2 + 'test_os_posix_fadvise')
+            try:
+                fd = os.open(self.path2 + 'test_os_posix_fadvise', os.O_RDONLY)
+                try:
+                    mypath = os.getcwd()
+                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_WILLNEED) == 0
+                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_NORMAL) == 0
+                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_SEQUENTIAL) == 0
+                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_RANDOM) == 0
+                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_NOREUSE) == 0
+                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_DONTNEED) == 0
+                finally:
+                    os.close(fd)
+            finally:
+                os.chdir(localdir)
+
+    if hasattr(rposix, 'posix_fallocate'):
+        def test_os_posix_posix_fallocate(self):
+            posix, os = self.posix, self.os
+            fd = os.open(self.path2 + 'test_os_posix_fallocate', os.O_WRONLY | os.O_CREAT)
+            try:
+                assert posix.posix_fallocate(fd, 0, 10) == 0
+            except OSError as inst:
+                """ ZFS seems not to support fallocate.
+                so skipping solaris-based since it is likely to come with ZFS
+                """
+                if inst.errno != errno.EINVAL or not sys.platform.startswith("sunos"):
+                    raise
+            finally:
+                os.close(fd)
+
+
     def test_largefile(self):
         os = self.posix
         fd = os.open(self.path2 + 'test_largefile',
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -255,6 +255,12 @@
     PRIO_PROCESS = rffi_platform.DefinedConstantInteger('PRIO_PROCESS')
     PRIO_PGRP = rffi_platform.DefinedConstantInteger('PRIO_PGRP')
     PRIO_USER = rffi_platform.DefinedConstantInteger('PRIO_USER')
+    POSIX_FADV_WILLNEED = rffi_platform.DefinedConstantInteger('POSIX_FADV_WILLNEED')
+    POSIX_FADV_NORMAL = rffi_platform.DefinedConstantInteger('POSIX_FADV_NORMAL')
+    POSIX_FADV_SEQUENTIAL = rffi_platform.DefinedConstantInteger('POSIX_FADV_SEQUENTIAL')
+    POSIX_FADV_RANDOM= rffi_platform.DefinedConstantInteger('POSIX_FADV_RANDOM')
+    POSIX_FADV_NOREUSE = rffi_platform.DefinedConstantInteger('POSIX_FADV_NOREUSE')
+    POSIX_FADV_DONTNEED = rffi_platform.DefinedConstantInteger('POSIX_FADV_DONTNEED')
     O_NONBLOCK = rffi_platform.DefinedConstantInteger('O_NONBLOCK')
     OFF_T = rffi_platform.SimpleType('off_t')
     OFF_T_SIZE = rffi_platform.SizeOf('off_t')
@@ -450,6 +456,12 @@
     validate_fd(fd)
     handle_posix_error('close', c_close(fd))
 
+def write(fd, data):
+    count = len(data)
+    validate_fd(fd)
+    with rffi.scoped_nonmovingbuffer(data) as buf:
+        return handle_posix_error('write', c_write(fd, buf, count))
+
 c_lseek = external('_lseeki64' if _WIN32 else 'lseek',
                    [rffi.INT, rffi.LONGLONG, rffi.INT], rffi.LONGLONG,
                    macro=_MACRO_ON_POSIX, save_err=rffi.RFFI_SAVE_ERRNO)
@@ -490,6 +502,23 @@
         with rffi.scoped_nonmovingbuffer(data) as buf:
             return handle_posix_error('pwrite', c_pwrite(fd, buf, count, offset))
 
+    c_posix_fallocate = external('posix_fallocate',
+                      [rffi.INT, OFF_T, OFF_T], rffi.INT,
+                      save_err=rffi.RFFI_SAVE_ERRNO)
+    c_posix_fadvise = external('posix_fadvise',
+                       [rffi.INT, OFF_T, OFF_T, rffi.INT], rffi.INT,
+                       save_err=rffi.RFFI_SAVE_ERRNO)
+
+    @enforceargs(int, None, None)
+    def posix_fallocate(fd, offset, length):
+        validate_fd(fd)
+        return handle_posix_error('posix_fallocate', c_posix_fallocate(fd, offset, length))
+
+    @enforceargs(int, None, None, int)
+    def posix_fadvise(fd, offset, length, advice):
+        validate_fd(fd)
+        return handle_posix_error('posix_fadvise', c_posix_fadvise(fd, offset, length, advice))
+
 c_ftruncate = external('ftruncate', [rffi.INT, rffi.LONGLONG], rffi.INT,
                        macro=_MACRO_ON_POSIX, save_err=rffi.RFFI_SAVE_ERRNO)
 c_fsync = external('fsync' if not _WIN32 else '_commit', [rffi.INT], rffi.INT,
diff --git a/rpython/rlib/test/test_rposix.py b/rpython/rlib/test/test_rposix.py
--- a/rpython/rlib/test/test_rposix.py
+++ b/rpython/rlib/test/test_rposix.py
@@ -750,3 +750,39 @@
     finally:
         os.close(fd)
     py.test.raises(OSError, rposix.pwrite, fd, b'ea', 1)
+
+ at rposix_requires('posix_fadvise')
+def posix_fadvise():
+    fname = str(udir.join('test_os_posix_fadvise'))
+    localdir = os.getcwd()
+    os.mkdir(self.path2 + 'test_os_posix_fadvise')
+    try:
+        fd = os.open(fname, os.O_RDONLY, 0777)
+        try:
+            mypath = os.getcwd()
+            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_WILLNEED) == 0
+            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_NORMAL) == 0
+            assert rposix.posix_fadvise(fd, 0, 0, rPOSIX_FADV_SEQUENTIAL) == 0
+            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_RANDOM) == 0
+            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_NOREUSE) == 0
+            assert rposix.posix_fadvise(fd, 0, 0, rPOSIX_FADV_DONTNEED) == 0
+        finally:
+            os.close(fd)
+    finally:
+        os.chdir(localdir)
+    py.test.raises(OSError, rposix.posix_fadvise, fd, 0, 0, rPOSIX_FADV_DONTNEED)
+
+ at rposix_requires('posix_fallocate')
+def test_posix_fallocate():
+    fname = str(udir.join('os_test.txt'))
+    fd = os.open(fname, os.O_WRONLY | os.O_CREAT, 0777)
+    try:
+        assert rposix.posix_fallocate(fd, 0, 10) == 0
+    except OSError as inst:
+        """ ZFS seems not to support fallocate.
+        so skipping solaris-based since it is likely to come with ZFS
+        """
+        if inst.errno != errno.EINVAL or not sys.platform.startswith("sunos"):
+            raise
+    finally:
+        os.close(fd)

From pypy.commits at gmail.com  Sun Apr  2 05:03:48 2017
From: pypy.commits at gmail.com (arigo)
Date: Sun, 02 Apr 2017 02:03:48 -0700 (PDT)
Subject: [pypy-commit] pypy superjumbo: close branch, ready to merge
Message-ID: <58e0be74.c791df0a.48e0c.f201@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: superjumbo
Changeset: r90917:218b82c4e242
Date: 2017-04-02 11:01 +0200
http://bitbucket.org/pypy/pypy/changeset/218b82c4e242/

Log:	close branch, ready to merge


From pypy.commits at gmail.com  Sun Apr  2 05:03:50 2017
From: pypy.commits at gmail.com (arigo)
Date: Sun, 02 Apr 2017 02:03:50 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: PR #530 from nanjekye (manual merge)
Message-ID: <58e0be76.52911c0a.d98af.7c91@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r90918:debef6d067cc
Date: 2017-04-02 11:02 +0200
http://bitbucket.org/pypy/pypy/changeset/debef6d067cc/

Log:	PR #530 from nanjekye (manual merge)

	posix_fallocate and posix_fadvise implementation

diff --git a/pypy/module/posix/__init__.py b/pypy/module/posix/__init__.py
--- a/pypy/module/posix/__init__.py
+++ b/pypy/module/posix/__init__.py
@@ -222,6 +222,14 @@
     if hasattr(rposix, 'pwrite'):
        interpleveldefs['pwrite'] = 'interp_posix.pwrite'
 
+    if hasattr(rposix, 'posix_fadvise'):
+        interpleveldefs['posix_fadvise'] = 'interp_posix.posix_fadvise'
+        interpleveldefs['posix_fallocate'] = 'interp_posix.posix_fallocate'
+        for _name in ['POSIX_FADV_WILLNEED', 'POSIX_FADV_NORMAL', 'POSIX_FADV_SEQUENTIAL',
+        'POSIX_FADV_RANDOM', 'POSIX_FADV_NOREUSE', 'POSIX_FADV_DONTNEED']:
+            assert getattr(rposix, _name) is not None, "missing %r" % (_name,)
+            interpleveldefs[_name] = 'space.wrap(%d)' % getattr(rposix, _name)
+
     for _name in ["O_CLOEXEC"]:
         if getattr(rposix, _name) is not None:
             interpleveldefs[_name] = 'space.wrap(%d)' % getattr(rposix, _name)
diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -401,6 +401,30 @@
         else:
             return space.newint(res)
 
+ at unwrap_spec(fd=c_int, length=r_longlong, offset=r_longlong)
+def posix_fallocate(space, fd, offset, length):
+    """allocate file space .
+    """
+    while True:
+        try:
+            s = rposix.posix_fallocate(fd, offset, length)
+        except OSError as e:
+            wrap_oserror(space, e, eintr_retry=True)
+        else:
+           return space.newint(s)
+
+ at unwrap_spec(fd=c_int, offset=r_longlong, length=r_longlong, advice=int)
+def posix_fadvise(space, fd, offset, length, advice):
+    """predeclare an access pattern for file data .
+    """
+    while True:
+        try:
+            res = rposix.posix_fadvise(fd, offset, length, advice)
+        except OSError as e:
+            wrap_oserror(space, e, eintr_retry=True)
+        else:
+            return space.newint(res)
+
 # ____________________________________________________________
 
 STAT_FIELDS = unrolling_iterable(enumerate(rposix_stat.STAT_FIELDS))
diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/test_posix2.py
--- a/pypy/module/posix/test/test_posix2.py
+++ b/pypy/module/posix/test/test_posix2.py
@@ -860,6 +860,42 @@
             finally:
                 os.close(fd)
 
+    if hasattr(rposix, 'posix_fadvise'):
+        def test_os_posix_fadvise(self):
+            posix, os = self.posix, self.os
+            localdir = os.getcwd()
+            os.mkdir(self.path2 + 'test_os_posix_fadvise')
+            try:
+                fd = os.open(self.path2 + 'test_os_posix_fadvise', os.O_RDONLY)
+                try:
+                    mypath = os.getcwd()
+                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_WILLNEED) == 0
+                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_NORMAL) == 0
+                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_SEQUENTIAL) == 0
+                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_RANDOM) == 0
+                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_NOREUSE) == 0
+                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_DONTNEED) == 0
+                finally:
+                    os.close(fd)
+            finally:
+                os.chdir(localdir)
+
+    if hasattr(rposix, 'posix_fallocate'):
+        def test_os_posix_posix_fallocate(self):
+            posix, os = self.posix, self.os
+            fd = os.open(self.path2 + 'test_os_posix_fallocate', os.O_WRONLY | os.O_CREAT)
+            try:
+                assert posix.posix_fallocate(fd, 0, 10) == 0
+            except OSError as inst:
+                """ ZFS seems not to support fallocate.
+                so skipping solaris-based since it is likely to come with ZFS
+                """
+                if inst.errno != errno.EINVAL or not sys.platform.startswith("sunos"):
+                    raise
+            finally:
+                os.close(fd)
+
+
     def test_largefile(self):
         os = self.posix
         fd = os.open(self.path2 + 'test_largefile',
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -255,6 +255,12 @@
     PRIO_PROCESS = rffi_platform.DefinedConstantInteger('PRIO_PROCESS')
     PRIO_PGRP = rffi_platform.DefinedConstantInteger('PRIO_PGRP')
     PRIO_USER = rffi_platform.DefinedConstantInteger('PRIO_USER')
+    POSIX_FADV_WILLNEED = rffi_platform.DefinedConstantInteger('POSIX_FADV_WILLNEED')
+    POSIX_FADV_NORMAL = rffi_platform.DefinedConstantInteger('POSIX_FADV_NORMAL')
+    POSIX_FADV_SEQUENTIAL = rffi_platform.DefinedConstantInteger('POSIX_FADV_SEQUENTIAL')
+    POSIX_FADV_RANDOM= rffi_platform.DefinedConstantInteger('POSIX_FADV_RANDOM')
+    POSIX_FADV_NOREUSE = rffi_platform.DefinedConstantInteger('POSIX_FADV_NOREUSE')
+    POSIX_FADV_DONTNEED = rffi_platform.DefinedConstantInteger('POSIX_FADV_DONTNEED')
     O_NONBLOCK = rffi_platform.DefinedConstantInteger('O_NONBLOCK')
     OFF_T = rffi_platform.SimpleType('off_t')
     OFF_T_SIZE = rffi_platform.SizeOf('off_t')
@@ -449,7 +455,7 @@
 def close(fd):
     validate_fd(fd)
     handle_posix_error('close', c_close(fd))
-
+    
 c_lseek = external('_lseeki64' if _WIN32 else 'lseek',
                    [rffi.INT, rffi.LONGLONG, rffi.INT], rffi.LONGLONG,
                    macro=_MACRO_ON_POSIX, save_err=rffi.RFFI_SAVE_ERRNO)
@@ -490,6 +496,23 @@
         with rffi.scoped_nonmovingbuffer(data) as buf:
             return handle_posix_error('pwrite', c_pwrite(fd, buf, count, offset))
 
+    c_posix_fallocate = external('posix_fallocate',
+                      [rffi.INT, OFF_T, OFF_T], rffi.INT,
+                      save_err=rffi.RFFI_SAVE_ERRNO)
+    c_posix_fadvise = external('posix_fadvise',
+                       [rffi.INT, OFF_T, OFF_T, rffi.INT], rffi.INT,
+                       save_err=rffi.RFFI_SAVE_ERRNO)
+
+    @enforceargs(int, None, None)
+    def posix_fallocate(fd, offset, length):
+        validate_fd(fd)
+        return handle_posix_error('posix_fallocate', c_posix_fallocate(fd, offset, length))
+
+    @enforceargs(int, None, None, int)
+    def posix_fadvise(fd, offset, length, advice):
+        validate_fd(fd)
+        return handle_posix_error('posix_fadvise', c_posix_fadvise(fd, offset, length, advice))
+
 c_ftruncate = external('ftruncate', [rffi.INT, rffi.LONGLONG], rffi.INT,
                        macro=_MACRO_ON_POSIX, save_err=rffi.RFFI_SAVE_ERRNO)
 c_fsync = external('fsync' if not _WIN32 else '_commit', [rffi.INT], rffi.INT,
diff --git a/rpython/rlib/test/test_rposix.py b/rpython/rlib/test/test_rposix.py
--- a/rpython/rlib/test/test_rposix.py
+++ b/rpython/rlib/test/test_rposix.py
@@ -750,3 +750,38 @@
     finally:
         os.close(fd)
     py.test.raises(OSError, rposix.pwrite, fd, b'ea', 1)
+
+ at rposix_requires('posix_fadvise')
+def test_posix_fadvise():
+    fname = str(udir.join('test_os_posix_fadvise'))
+    localdir = os.getcwd()
+    os.mkdir(fname)
+    try:
+        fd = os.open(fname, os.O_RDONLY, 0777)
+        try:
+            mypath = os.getcwd()
+            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_WILLNEED) == 0
+            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_NORMAL) == 0
+            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_SEQUENTIAL) == 0
+            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_RANDOM) == 0
+            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_NOREUSE) == 0
+            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_DONTNEED) == 0
+        finally:
+            os.close(fd)
+    finally:
+        os.chdir(localdir)
+
+ at rposix_requires('posix_fallocate')
+def test_posix_fallocate():
+    fname = str(udir.join('os_test.txt'))
+    fd = os.open(fname, os.O_WRONLY | os.O_CREAT, 0777)
+    try:
+        assert rposix.posix_fallocate(fd, 0, 10) == 0
+    except OSError as inst:
+        """ ZFS seems not to support fallocate.
+        so skipping solaris-based since it is likely to come with ZFS
+        """
+        if inst.errno != errno.EINVAL or not sys.platform.startswith("sunos"):
+            raise
+    finally:
+        os.close(fd)

From pypy.commits at gmail.com  Sun Apr  2 05:03:42 2017
From: pypy.commits at gmail.com (nanjekye)
Date: Sun, 02 Apr 2017 02:03:42 -0700 (PDT)
Subject: [pypy-commit] pypy superjumbo: removed extra code
Message-ID: <58e0be6e.0e2f1c0a.34901.8428@mx.google.com>

Author: Joannah Nanjekye <nanjekyejoannah at gmail.com>
Branch: superjumbo
Changeset: r90915:1c4ccc021d87
Date: 2017-03-27 15:27 +0300
http://bitbucket.org/pypy/pypy/changeset/1c4ccc021d87/

Log:	removed extra code

diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -455,13 +455,7 @@
 def close(fd):
     validate_fd(fd)
     handle_posix_error('close', c_close(fd))
-
-def write(fd, data):
-    count = len(data)
-    validate_fd(fd)
-    with rffi.scoped_nonmovingbuffer(data) as buf:
-        return handle_posix_error('write', c_write(fd, buf, count))
-
+    
 c_lseek = external('_lseeki64' if _WIN32 else 'lseek',
                    [rffi.INT, rffi.LONGLONG, rffi.INT], rffi.LONGLONG,
                    macro=_MACRO_ON_POSIX, save_err=rffi.RFFI_SAVE_ERRNO)

From pypy.commits at gmail.com  Sun Apr  2 05:59:29 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sun, 02 Apr 2017 02:59:29 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Attempt to fix build_cffi_imports on
 Windows: args should be passed as unicode strings.
Message-ID: <58e0cb81.0eb7df0a.8f5d2.b9e3@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90919:541dbb06046f
Date: 2017-04-02 11:57 +0200
http://bitbucket.org/pypy/pypy/changeset/541dbb06046f/

Log:	Attempt to fix build_cffi_imports on Windows: args should be passed
	as unicode strings.

diff --git a/rpython/tool/runsubprocess.py b/rpython/tool/runsubprocess.py
--- a/rpython/tool/runsubprocess.py
+++ b/rpython/tool/runsubprocess.py
@@ -15,7 +15,7 @@
     text = str
 
 def run_subprocess(executable, args, env=None, cwd=None):
-    if isinstance(args, list):
+    if isinstance(args, list) and sys.platform != 'win32':
         args = [a.encode('latin1') if isinstance(a, text) else a
                 for a in args]
     return _run(executable, args, env, cwd)

From pypy.commits at gmail.com  Sun Apr  2 11:10:40 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sun, 02 Apr 2017 08:10:40 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Popen.communicate() returns bytes if no
 encoding was specified.
Message-ID: <58e11470.179d1c0a.74294.e6d8@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90920:1fb74e166444
Date: 2017-04-02 17:09 +0200
http://bitbucket.org/pypy/pypy/changeset/1fb74e166444/

Log:	Popen.communicate() returns bytes if no encoding was specified.

diff --git a/rpython/tool/runsubprocess.py b/rpython/tool/runsubprocess.py
--- a/rpython/tool/runsubprocess.py
+++ b/rpython/tool/runsubprocess.py
@@ -49,7 +49,7 @@
     pipe = Popen(args, stdout=PIPE, stderr=PIPE, shell=shell, env=env, cwd=cwd)
     stdout, stderr = pipe.communicate()
     if (sys.platform == 'win32' and pipe.returncode == 1 and 
-        'is not recognized' in stderr):
+        b'is not recognized' in stderr):
         # Setting shell=True on windows messes up expected exceptions
         raise EnvironmentError(stderr)
     return pipe.returncode, stdout, stderr

From pypy.commits at gmail.com  Sun Apr  2 13:16:57 2017
From: pypy.commits at gmail.com (mattip)
Date: Sun, 02 Apr 2017 10:16:57 -0700 (PDT)
Subject: [pypy-commit] pypy default: Added tag release-pypy2.7-v5.7.1 for
 changeset 1aa2d8e03cdf
Message-ID: <58e13209.47b4df0a.f1db.ef43@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r90921:f18bb27393c4
Date: 2017-04-02 19:59 +0300
http://bitbucket.org/pypy/pypy/changeset/f18bb27393c4/

Log:	Added tag release-pypy2.7-v5.7.1 for changeset 1aa2d8e03cdf

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -36,3 +36,4 @@
 aff251e543859ce4508159dd9f1a82a2f553de00 release-pypy2.7-v5.6.0
 fa3249d55d15b9829e1be69cdf45b5a44cec902d release-pypy2.7-v5.7.0
 b16a4363e930f6401bceb499b9520955504c6cb0 release-pypy3.5-v5.7.0
+1aa2d8e03cdfab54b7121e93fda7e98ea88a30bf release-pypy2.7-v5.7.1

From pypy.commits at gmail.com  Sun Apr  2 13:58:23 2017
From: pypy.commits at gmail.com (alex_gaynor)
Date: Sun, 02 Apr 2017 10:58:23 -0700 (PDT)
Subject: [pypy-commit] pypy release-pypy3.5-5.x: Fixes #2508 -- correctly
 handle dict.pop where the popping key is not the same type as the dict's
 and pop is called with a default
Message-ID: <58e13bbf.6d82df0a.50aa6.7dfd@mx.google.com>

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: release-pypy3.5-5.x
Changeset: r90922:afcbd079e7f4
Date: 2017-04-02 20:36 +0300
http://bitbucket.org/pypy/pypy/changeset/afcbd079e7f4/

Log:	Fixes #2508 -- correctly handle dict.pop where the popping key is
	not the same type as the dict's and pop is called with a default
	(grafted from a1b0ce5e4915a6e46c9007f81a991cbaf179f027)

diff --git a/pypy/objspace/std/dictmultiobject.py b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -1007,6 +1007,8 @@
             else:
                 return d.pop(key, w_default)
         elif self._never_equal_to(space.type(w_key)):
+            if w_default is not None:
+                return w_default
             raise KeyError
         else:
             self.switch_to_object_strategy(w_dict)
diff --git a/pypy/objspace/std/test/test_dictmultiobject.py b/pypy/objspace/std/test/test_dictmultiobject.py
--- a/pypy/objspace/std/test/test_dictmultiobject.py
+++ b/pypy/objspace/std/test/test_dictmultiobject.py
@@ -227,6 +227,10 @@
         assert len(dd) == 1
         raises(KeyError, dd.pop, 33)
 
+        assert d.pop("abc", None) is None
+        raises(KeyError, d.pop, "abc")
+        assert len(d) == 2
+
     def test_items(self):
         d = {1: 2, 3: 4}
         its = list(d.items())

From pypy.commits at gmail.com  Sun Apr  2 13:58:25 2017
From: pypy.commits at gmail.com (mattip)
Date: Sun, 02 Apr 2017 10:58:25 -0700 (PDT)
Subject: [pypy-commit] pypy release-pypy3.5-5.x: add failing test for
 multiple bases
Message-ID: <58e13bc1.f4aedf0a.18f12.741c@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: release-pypy3.5-5.x
Changeset: r90923:22286c1b31a8
Date: 2017-04-02 20:38 +0300
http://bitbucket.org/pypy/pypy/changeset/22286c1b31a8/

Log:	add failing test for multiple bases (grafted from
	65ab47447a582ca2353f043d84d9d8225554d3bc)

diff --git a/pypy/module/cpyext/test/foo.c b/pypy/module/cpyext/test/foo.c
--- a/pypy/module/cpyext/test/foo.c
+++ b/pypy/module/cpyext/test/foo.c
@@ -160,6 +160,28 @@
     return PyObject_GenericSetAttr((PyObject *)self, name, value);
 }
 
+static PyObject *
+new_fooType(PyTypeObject * t, PyObject *args, PyObject *kwds)
+{
+    PyObject * o;
+    /* copied from numpy scalartypes.c for inherited classes */
+    if (t->tp_bases && (PyTuple_GET_SIZE(t->tp_bases) > 1))
+    {
+        PyTypeObject *sup; 
+        /* We are inheriting from a Python type as well so 
+           give it first dibs on conversion */
+        sup = (PyTypeObject *)PyTuple_GET_ITEM(t->tp_bases, 1);
+        /* Prevent recursion */ 
+        if (new_fooType != sup->tp_new) 
+        {
+            o = sup->tp_new(t, args, kwds);
+            return o;
+        }
+    }
+    o = t->tp_alloc(t, 0);
+    return o;   
+};
+
 static PyMemberDef foo_members[] = {
     {"int_member", T_INT, offsetof(fooobject, foo), 0,
      "A helpful docstring."},
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -949,6 +949,8 @@
             pass
         class foo(f2, f1):
             pass
+
+        x = foo(1)
         assert bar.__base__ is f2
         # On cpython, the size changes.
         if '__pypy__' in sys.builtin_module_names:

From pypy.commits at gmail.com  Sun Apr  2 13:58:27 2017
From: pypy.commits at gmail.com (mattip)
Date: Sun, 02 Apr 2017 10:58:27 -0700 (PDT)
Subject: [pypy-commit] pypy release-pypy3.5-5.x: fix for -A,
 fix issue setting tp_new to 0x1
Message-ID: <58e13bc3.2ea0df0a.6bdd4.8173@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: release-pypy3.5-5.x
Changeset: r90924:c49045ac1e81
Date: 2017-04-02 20:45 +0300
http://bitbucket.org/pypy/pypy/changeset/c49045ac1e81/

Log:	fix for -A, fix issue setting tp_new to 0x1 (grafted from
	c121ac248c573b43f774b4907e7d637bdeddddd6)

diff --git a/pypy/module/cpyext/test/foo.c b/pypy/module/cpyext/test/foo.c
--- a/pypy/module/cpyext/test/foo.c
+++ b/pypy/module/cpyext/test/foo.c
@@ -728,13 +728,14 @@
     if (module == NULL)
         INITERROR;
 
-    footype.tp_new = PyType_GenericNew;
-
     UnicodeSubtype.tp_base = &PyUnicode_Type;
     UnicodeSubtype2.tp_base = &UnicodeSubtype;
     MetaType.tp_base = &PyType_Type;
 
-    if (PyType_Ready(&footype) < 0)
+    fooType.tp_new = &new_fooType;
+    InitErrType.tp_new = PyType_GenericNew;
+
+    if (PyType_Ready(&fooType) < 0)
         INITERROR;
     if (PyType_Ready(&UnicodeSubtype) < 0)
         INITERROR;
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -950,7 +950,7 @@
         class foo(f2, f1):
             pass
 
-        x = foo(1)
+        x = foo()
         assert bar.__base__ is f2
         # On cpython, the size changes.
         if '__pypy__' in sys.builtin_module_names:
diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py
--- a/pypy/module/cpyext/typeobject.py
+++ b/pypy/module/cpyext/typeobject.py
@@ -682,10 +682,6 @@
         if pto.c_tp_itemsize < pto.c_tp_base.c_tp_itemsize:
             pto.c_tp_itemsize = pto.c_tp_base.c_tp_itemsize
 
-    if space.is_w(w_type, space.w_object):
-        # will be filled later on with the correct value
-        # may not be 0
-        pto.c_tp_new = cts.cast('newfunc', 1)
     update_all_slots(space, w_type, pto)
     if not pto.c_tp_new:
         base_object_pyo = make_ref(space, space.w_object)

From pypy.commits at gmail.com  Sun Apr  2 13:58:29 2017
From: pypy.commits at gmail.com (arigo)
Date: Sun, 02 Apr 2017 10:58:29 -0700 (PDT)
Subject: [pypy-commit] pypy release-pypy3.5-5.x: Issue #2523
Message-ID: <58e13bc5.1498df0a.b8f48.72d6@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: release-pypy3.5-5.x
Changeset: r90925:3ade3b0bc2cf
Date: 2017-04-02 20:46 +0300
http://bitbucket.org/pypy/pypy/changeset/3ade3b0bc2cf/

Log:	Issue #2523

	This should fix it. The slotdefs entry was removed in 1b0451031b2e
	but we didn't have any test for that. (grafted from
	f77701c9f5706a297821c43779219df4a0aa70b0)

diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -1063,6 +1063,7 @@
            wrap_indexargfunc,
            "__imul__($self, value, /)\n--\n\nImplement self*=value."),
 
+        TPSLOT("__getattr__", tp_getattr, NULL, NULL, ""),
     {NULL}
 };
 """
diff --git a/pypy/module/cpyext/test/foo.c b/pypy/module/cpyext/test/foo.c
--- a/pypy/module/cpyext/test/foo.c
+++ b/pypy/module/cpyext/test/foo.c
@@ -670,6 +670,34 @@
     return PyInt_FromLong(tf);
 }
 
+static PyTypeObject GetType1 = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "foo.GetType1",          /*tp_name*/
+    sizeof(PyObject),        /*tp_size*/
+};
+static PyTypeObject GetType2 = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "foo.GetType2",          /*tp_name*/
+    sizeof(PyObject),        /*tp_size*/
+};
+static PyObject *gettype1, *gettype2;
+
+static PyObject *gettype1_getattr(PyObject *self, char *name)
+{
+    char buf[200];
+    strcpy(buf, "getattr:");
+    strcat(buf, name);
+    return PyString_FromString(buf);
+}
+static PyObject *gettype2_getattro(PyObject *self, PyObject *name)
+{
+    char buf[200];
+    strcpy(buf, "getattro:");
+    strcat(buf, PyString_AS_STRING(name));
+    return PyString_FromString(buf);
+}
+
+
 /* List of functions exported by this module */
 
 static PyMethodDef foo_functions[] = {
@@ -767,6 +795,18 @@
     if (PyType_Ready(&TupleLike) < 0)
         INITERROR;
 
+    GetType1.tp_flags = Py_TPFLAGS_DEFAULT;
+    GetType1.tp_getattr = &gettype1_getattr;
+    if (PyType_Ready(&GetType1) < 0)
+        INITERROR;
+    gettype1 = PyObject_New(PyObject, &GetType1);
+
+    GetType2.tp_flags = Py_TPFLAGS_DEFAULT;
+    GetType2.tp_getattro = &gettype2_getattro;
+    if (PyType_Ready(&GetType2) < 0)
+        INITERROR;
+    gettype2 = PyObject_New(PyObject, &GetType2);
+
 
     d = PyModule_GetDict(module);
     if (d == NULL)
@@ -789,6 +829,10 @@
         INITERROR;
     if (PyDict_SetItemString(d, "TupleLike", (PyObject *) &TupleLike) < 0)
         INITERROR;
+    if (PyDict_SetItemString(d, "gettype1", gettype1) < 0)
+        INITERROR;
+    if (PyDict_SetItemString(d, "gettype2", gettype2) < 0)
+        INITERROR;
 #if PY_MAJOR_VERSION >=3
     return module;
 #endif
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -1221,3 +1221,14 @@
                 pass
             bases = module.foo(C)
             assert bases == (A, B)
+
+    def test_getattr_getattro(self):
+        module = self.import_module(name='foo')
+        assert module.gettype2.dcba == 'getattro:dcba'
+        assert (type(module.gettype2).__getattribute__(module.gettype2, 'dcBA')
+            == 'getattro:dcBA')
+        assert module.gettype1.abcd == 'getattr:abcd'
+        # GetType1 objects have a __getattribute__ method, but this
+        # doesn't call tp_getattr at all, also on CPython
+        raises(AttributeError, type(module.gettype1).__getattribute__,
+                               module.gettype1, 'dcBA')

From pypy.commits at gmail.com  Sun Apr  2 13:58:31 2017
From: pypy.commits at gmail.com (mattip)
Date: Sun, 02 Apr 2017 10:58:31 -0700 (PDT)
Subject: [pypy-commit] pypy release-pypy3.5-5.x: update version to 5.7.1
Message-ID: <58e13bc7.dd451c0a.9c183.0ce3@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: release-pypy3.5-5.x
Changeset: r90926:2875f328eae2
Date: 2017-04-02 20:48 +0300
http://bitbucket.org/pypy/pypy/changeset/2875f328eae2/

Log:	update version to 5.7.1

diff --git a/pypy/module/cpyext/include/patchlevel.h b/pypy/module/cpyext/include/patchlevel.h
--- a/pypy/module/cpyext/include/patchlevel.h
+++ b/pypy/module/cpyext/include/patchlevel.h
@@ -29,8 +29,8 @@
 #define PY_VERSION		"3.5.2"
 
 /* PyPy version as a string */
-#define PYPY_VERSION "5.7.0-beta0"
-#define PYPY_VERSION_NUM  0x05070000
+#define PYPY_VERSION "5.7.1-beta0"
+#define PYPY_VERSION_NUM  0x05070100
 
 /* Defined to mean a PyPy where cpyext holds more regular references
    to PyObjects, e.g. staying alive as long as the internal PyPy object
diff --git a/pypy/module/sys/version.py b/pypy/module/sys/version.py
--- a/pypy/module/sys/version.py
+++ b/pypy/module/sys/version.py
@@ -10,7 +10,7 @@
 #XXX # sync CPYTHON_VERSION with patchlevel.h, package.py
 CPYTHON_API_VERSION        = 1013   #XXX # sync with include/modsupport.h
 
-PYPY_VERSION               = (5, 7, 0, "beta", 0)    #XXX # sync patchlevel.h
+PYPY_VERSION               = (5, 7, 1, "beta", 0)    #XXX # sync patchlevel.h
 
 
 import pypy

From pypy.commits at gmail.com  Sun Apr  2 14:32:50 2017
From: pypy.commits at gmail.com (mattip)
Date: Sun, 02 Apr 2017 11:32:50 -0700 (PDT)
Subject: [pypy-commit] pypy default: add release note for 5.7.1
Message-ID: <58e143d2.8f8bdf0a.8999.842b@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r90927:26e8cd8592fc
Date: 2017-04-02 21:31 +0300
http://bitbucket.org/pypy/pypy/changeset/26e8cd8592fc/

Log:	add release note for 5.7.1

diff --git a/pypy/doc/index-of-release-notes.rst b/pypy/doc/index-of-release-notes.rst
--- a/pypy/doc/index-of-release-notes.rst
+++ b/pypy/doc/index-of-release-notes.rst
@@ -6,6 +6,7 @@
 
 .. toctree::
 
+   release-v5.7.1.rst
    release-v5.7.0.rst
    release-pypy2.7-v5.6.0.rst
    release-pypy2.7-v5.4.1.rst
@@ -59,6 +60,7 @@
 
 .. toctree::
 
+   release-v5.7.1.rst
    release-v5.7.0.rst
 
 CPython 3.3 compatible versions
diff --git a/pypy/doc/release-v5.7.1.rst b/pypy/doc/release-v5.7.1.rst
new file mode 100644
--- /dev/null
+++ b/pypy/doc/release-v5.7.1.rst
@@ -0,0 +1,50 @@
+==========
+PyPy 5.7.1
+==========
+
+We have released a bugfix PyPy2.7-v5.7.1 and PyPy3.5-v5.7.1 beta (Linux 64bit),
+due to the following issues:
+
+  * correctly handle an edge case in dict.pop (issue #2508_)
+
+  * fix a regression to correctly handle multiple inheritance in a C-API type
+    where the seconde base is an app-level class with a ``__new__`` function
+
+  * fix a regression to fill a C-API type's ``tp_getattr`` slot from a
+    ``__getattr__`` method (issue #2523_)
+
+Thanks to those who reported the issues.
+
+.. _2508: https://bitbucket.org/pypy/pypy/issues/2508
+.. _2523: https://bitbucket.org/pypy/pypy/issues/2523
+
+What is PyPy?
+=============
+
+PyPy is a very compliant Python interpreter, almost a drop-in replacement for
+CPython 2.7 and CPython 3.5. 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.
+
+The PyPy 2.7 release supports: 
+
+  * **x86** machines on most common operating systems
+    (Linux 32/64 bits, Mac OS X 64 bits, Windows 32 bits, OpenBSD, FreeBSD)
+  
+  * newer **ARM** hardware (ARMv6 or ARMv7, with VFPv3) running Linux,
+  
+  * big- and little-endian variants of **PPC64** running Linux,
+
+  * **s390x** running Linux
+
+.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
+.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+
+Please update, and continue to help us make PyPy better.
+
+Cheers
+
+The PyPy Team
+

From pypy.commits at gmail.com  Sun Apr  2 15:31:01 2017
From: pypy.commits at gmail.com (mattip)
Date: Sun, 02 Apr 2017 12:31:01 -0700 (PDT)
Subject: [pypy-commit] pypy.org extradoc: update for pypy2.7 5.7.1,
 regen later when more complete
Message-ID: <58e15175.4e8bdf0a.7d3f7.98d0@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: extradoc
Changeset: r876:a6f73a25f6e1
Date: 2017-04-02 22:30 +0300
http://bitbucket.org/pypy/pypy.org/changeset/a6f73a25f6e1/

Log:	update for pypy2.7 5.7.1, regen later when more complete

diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -15,14 +15,14 @@
 We provide binaries for x86, ARM, PPC and s390x running on different operating systems such as
 Linux, Mac OS/X and Windows:
 
-* the Python2.7 compatible release &#8212; **PyPy2.7 v5.7.0** &#8212; (`what's new in PyPy2.7?`_)
+* the Python2.7 compatible release &#8212; **PyPy2.7 v5.7.1** &#8212; (`what's new in PyPy2.7?`_)
 
-* the Python3.5 compatible beta quality release &#8212; **PyPy3.5 v5.7.0** &#8212; (`what's new in PyPy3.5?`_).
+* the Python3.5 compatible beta quality release &#8212; **PyPy3.5 v5.7.1** &#8212; (`what's new in PyPy3.5?`_).
 
 * the Python2.7 Software Transactional Memory special release &#8212; **PyPy-STM 2.5.1** (Linux x86-64 only)
 
-.. _what's new in PyPy2.7?: http://doc.pypy.org/en/latest/release-v5.7.0.html
-.. _what's new in PyPy3.5?: http://doc.pypy.org/en/latest/release-v5.7.0.html
+.. _what's new in PyPy2.7?: http://doc.pypy.org/en/latest/release-v5.7.1.html
+.. _what's new in PyPy3.5?: http://doc.pypy.org/en/latest/release-v5.7.1.html
 
 
 .. class:: download_menu
@@ -79,7 +79,7 @@
 
 .. _release:
 
-Python2.7 compatible PyPy 5.7.0
+Python2.7 compatible PyPy 5.7.1
 -------------------------------
 
 * `Linux x86 binary (32bit, tar.bz2 built on Ubuntu 12.04 - 14.04)`__ (see ``[1]`` below)
@@ -98,18 +98,18 @@
 * `All our downloads,`__ including previous versions.  We also have a
   mirror_, but please use only if you have troubles accessing the links above
 
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux32.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux64.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux-armhf-raspbian.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux-armhf-raring.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux-armel.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-osx64.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-win32.zip
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-ppc64.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-ppc64le.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-s390x.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-src.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-src.zip
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux32.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux64.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux-armhf-raspbian.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux-armhf-raring.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux-armel.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-osx64.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-win32.zip
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-ppc64.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-ppc64le.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-s390x.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-src.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-src.zip
 .. _`vcredist_x86.exe`: http://www.microsoft.com/en-us/download/details.aspx?id=5582
 .. __: https://bitbucket.org/pypy/pypy/downloads
 .. _mirror: http://buildbot.pypy.org/mirror/
@@ -131,9 +131,9 @@
 * `All our downloads,`__ including previous versions.  We also have a
   mirror_, but please use only if you have troubles accessing the links above
 
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.0-linux64.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.0-src.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.0-src.zip
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-linux64.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-src.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-src.zip
 .. __: https://bitbucket.org/pypy/pypy/downloads
 
 If your CPU is really, really old, it may be a x86-32 without SSE2.
@@ -203,7 +203,7 @@
 uncompressed, they run in-place.  For now you can uncompress them
 either somewhere in your home directory or, say, in ``/opt``, and
 if you want, put a symlink from somewhere like
-``/usr/local/bin/pypy`` to ``/path/to/pypy2-5.7.0/bin/pypy``.  Do
+``/usr/local/bin/pypy`` to ``/path/to/pypy2-5.7.1/bin/pypy``.  Do
 not move or copy the executable ``pypy`` outside the tree --- put
 a symlink to it, otherwise it will not find its libraries.
 
@@ -307,9 +307,9 @@
    Alternatively, the following smaller package contains the source at
    the same revision as the above binaries:
 
-   * `pypy2-v5.7.0-src.tar.bz2`__ (sources)
+   * `pypy2-v5.7.1-src.tar.bz2`__ (sources)
 
-   .. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-src.tar.bz2
+   .. __: https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-src.tar.bz2
 
 
 2. Make sure you **installed the dependencies.**  See the list here__.
@@ -439,87 +439,19 @@
 
 Here are the checksums for each of the downloads
 
-pypy2.7-v5.7.0 md5::
+pypy2.7-v5.7.1 sha256::
 
-    bb55f4a28d64d40367a58139b25b02fe  pypy2-v5.7.0-linux32.tar.bz2
-    84b542e3aaca2aec9b0ca3afb6a3373b  pypy2-v5.7.0-linux64.tar.bz2
-    9f98c917ec1dbbda821bd23734fdc4d4  pypy2-v5.7.0-linux-armel.tar.bz2
-    509539d3f5876584fa5cad6fd125e446  pypy2-v5.7.0-linux-armhf-raring.tar.bz2
-    34739358ba2e438d27b777838154f255  pypy2-v5.7.0-linux-armhf-raspbian.tar.bz2
-    6b6180f4b0932d5a3a7499ddef1c5129  pypy2-v5.7.0-osx64.tar.bz2
-    180d5cc3f58a9f9088481c7d4c6b5d68  pypy2-v5.7.0-s390x.tar.bz2
-    aa26e72c1f30b77734198af6fb6f9ad7  pypy2-v5.7.0-src.tar.bz2
-    f1633ad18e0af309aa11e3425f628cf9  pypy2-v5.7.0-src.zip
-    23f15d2bc0c29fe6948a99352962ebf0  pypy2-v5.7.0-win32.zip
+    f125a227f8c814ba1698168a639ea6ca59bb69c280529639eed29076d8429a73  pypy2-v5.7.1-linux32.tar.bz2
+    c4fa3da42156bed4a9d912433b618a141e0c5161d7cc8c328786736ea5d1c2da  pypy2-v5.7.1-linux64.tar.bz2
+    591a4a73cc945a1125848f3615a28559692db8febf677d7087eaef40cb119a8d  pypy2-v5.7.1-linux-armel.tar.bz2
+    c1b1a0968b22c58672f7492dc7900bc85e3bd02c791f219f31401a00ef387207  pypy2-v5.7.1-linux-armhf-raring.tar.bz2
+    67544f8c4b284db71cf1af74edef290722f97f82476cbdaff2015fdab244c6ee  pypy2-v5.7.1-linux-armhf-raspbian.tar.bz2
+    4e99ba356432861534917a9477ace0ccee617bd631512759a530f8383e153a3d  pypy2-v5.7.1-osx64.tar.bz2
+    395c57a1aa078c9ae9aa9f18263bb91fa23114bae4d133d10560eaea30c51892  pypy2-v5.7.1-s390x.tar.bz2
+    d01bee43c6df79f7bbc1149bb3e85f489491fb2358a6a1f9a7f0d6e07715832f  pypy2-v5.7.1-src.tar.bz2
+    f580a7b41cc09e030bbff66752044bdfbc193ec617e575c64bf65c136c298076  pypy2-v5.7.1-src.zip
+    a3ba7c946635236836f8536d8767a0f456b3b9a86876cb5c3173a04522bf451b  pypy2-v5.7.1-win32.zip
 
-pypy 3.5-v5.7.0 md5::
-
-    410fb506ac436c344f785bb77820e13e  pypy3-v5.7.0-linux64.tar.bz2
-    79b1d5749eb97be36933dbdf156fec02  pypy3-v5.7.0-src.tar.bz2
-    594f3d17be1c80181d13c0f025ae25f6  pypy3-v5.7.0-src.zip
-
-pypy3.3-v5.5.0-alpha md5::
-
-    e9bdfb330a30765eaf76ddd4e826a45e  pypy3.3-v5.5.0-alpha-linux32.tar.bz2
-    b04022a5a549bba719c9a184c783805c  pypy3.3-v5.5.0-alpha-linux64.tar.bz2
-    84424f01b2746c71f64e27cb4c7069a1  pypy3.3-v5.5.0-alpha-linux-armel.tar.bz2
-    9d18b171a7249227f3a3b74af8070c82  pypy3.3-v5.5.0-alpha-linux-armhf-raspbian.tar.bz2
-    d2424a9e3ff31e26e5b1f0ceade5e9f7  pypy3.3-v5.5.0-alpha-osx64.tar.bz2
-    c32728185d89f9c0fda9481f2f9ae61d  pypy3.3-v5.5.0-alpha-s390x.tar.bz2
-    536008fd7b17af8878915393fc1ecfc3  pypy3.3-v5.5.0-alpha-src.tar.bz2
-    4fc66068848dbfc09b210d3115380b0a  pypy3.3-v5.5.0-alpha-src.zip
-
-pypy-1.8 sandbox md5::
-
-    2c9f0054f3b93a6473f10be35277825a  pypy-1.8-sandbox-linux64.tar.bz2
-    009c970b5fa75754ae4c32a5d108a8d4  pypy-1.8-sandbox-linux.tar.bz2
-
-pypy2.7-v5.7.0 sha1::
-
-    c8cc2cbc2b75962d0e5920f4a756f7fe3f13596c  pypy2-v5.7.0-linux32.tar.bz2
-    0a831dae298fce2110626637342d0e3545a8ab47  pypy2-v5.7.0-linux64.tar.bz2
-    556face1374a75720177176a4c7517bb4f9a62a5  pypy2-v5.7.0-linux-armel.tar.bz2
-    bec04d53cd2a7cc89cf67cfdab2207ad6c08781b  pypy2-v5.7.0-linux-armhf-raring.tar.bz2
-    c510f53447fc800b4611545d2679d596d8f0c461  pypy2-v5.7.0-linux-armhf-raspbian.tar.bz2
-    097e418d5aa61c7697a50536c5b173d8211603a9  pypy2-v5.7.0-osx64.tar.bz2
-    a11cf7d95a909c8e60bafc79ff491711ecd0ee29  pypy2-v5.7.0-ppc64.tar.bz2
-    0ccb73316935c5610e5170330556443abd87d3cd  pypy2-v5.7.0-ppc64le.tar.bz2
-    20f33a4d0c08a5d4935086caec73be3d92b60b2b  pypy2-v5.7.0-s390x.tar.bz2
-    5976e1f19a42f64f778d385322723200b5c6d7c9  pypy2-v5.7.0-src.tar.bz2
-    c84ad90184edb315031074696e805ecbc08494e3  pypy2-v5.7.0-src.zip
-    15df479b08870dc6ec9cab0e4587935fc0694cb8  pypy2-v5.7.0-win32.zip
-
-pypy 3.5-v5.7.0 sha1::
-
-    e10511bde5a88c5de9fdf9234188b8df23382a6a  pypy3-v5.7.0-linux64.tar.bz2
-    0b12230025d77be26bc10cbc81671c4b3719528c  pypy3-v5.7.0-src.tar.bz2
-    ae256d83173faaadce9602594fd752fb664b813b  pypy3-v5.7.0-src.zip
-
-pypy3.3-v5.5.0-alpha sha1::
-
-    1de17b61b8d21e408a46114961659b4c0f15cb54  pypy3.3-v5.5.0-alpha-linux32.tar.bz2
-    995ae3b983d9975006b898f098b27408949d2fdf  pypy3.3-v5.5.0-alpha-linux64.tar.bz2
-    2487f726d7b50aef041beba2bb0f39fe4d7392da  pypy3.3-v5.5.0-alpha-linux-armel.tar.bz2
-    ed104a504664a7ccd971da202abe14302246175a  pypy3.3-v5.5.0-alpha-linux-armhf-raspbian.tar.bz2
-    0f6456672b02e4856421021d2ff71ffaca2e2c3e  pypy3.3-v5.5.0-alpha-osx64.tar.bz2
-    018e9e9e4c54fcef3959bc316f3e684f88231ab4  pypy3.3-v5.5.0-alpha-s390x.tar.bz2
-    9eb6aad2d41f7db16c19ae6e438c8f195b0d44fc  pypy3.3-v5.5.0-alpha-src.tar.bz2
-    b670cdc685c323b11bfdca2a15f12c5953e6d8b4  pypy3.3-v5.5.0-alpha-src.zip
-
-pypy2.7-v5.7.0 sha256::
-
-    aaa55085d11a49cb982b059b4159495d7a4fb9afcfda7bfd680cc0175e9fa33b  pypy2-v5.7.0-linux32.tar.bz2
-    64bed80e299b09c13296f577a0f52c5d4be9f7c699a390ca6026f967aeff3846  pypy2-v5.7.0-linux64.tar.bz2
-    3bc0d2616cacef9f544e739d4c25a89e16d7aa8c1ccb18c32dceeb021ed73711  pypy2-v5.7.0-linux-armel.tar.bz2
-    413df8097c87a8e79cc46df65837b1d533de83b7cb06ce88b168697807fff696  pypy2-v5.7.0-linux-armhf-raring.tar.bz2
-    6328e4767cf20d20a290739db2d1ec769f3c9c360fa9824f61581b3356add79b  pypy2-v5.7.0-linux-armhf-raspbian.tar.bz2
-    9204aa1b55771a374a3118bb43e498c88caca8c33710eecf3249855c4dd1352a  pypy2-v5.7.0-osx64.tar.bz2
-    ca936b034a5cd2decfd3b500fad3c28e5a6327a77bb56b2d2ba6ff0159c00f2c  pypy2-v5.7.0-ppc64.tar.bz2
-    3ecb3165c85df60f8e59bfdf28304cd40894d304ee04a4d58dc8b9947cbb2b01  pypy2-v5.7.0-ppc64le.tar.bz2
-    8820b36f38b4aa44c1ef2be213c7d13818c9fdb61795f24f4fb18a7a78d2dde7  pypy2-v5.7.0-s390x.tar.bz2
-    e522ea7ca51b16ee5505f22b86803664b762a263a6d69ba84c359fcf8365ad3e  pypy2-v5.7.0-src.tar.bz2
-    784be3d2b8bb12a0d88d088fd991b03324d9f84a48af5dbaf2a536eaee91d8b5  pypy2-v5.7.0-src.zip
-    09c8da3a7e09cea821f9b300c6f4f52f4a571d949d91839ecbce93b84a08d570  pypy2-v5.7.0-win32.zip
 
 pypy 3.5-v5.7.0 sha256::
 

From pypy.commits at gmail.com  Sun Apr  2 15:42:40 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sun, 02 Apr 2017 12:42:40 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Restore support for _sre.CODESIZE=2 that
 was present in Python 2.7
Message-ID: <58e15430.91581c0a.c4383.eb48@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90928:302d39bda33c
Date: 2017-04-02 21:41 +0200
http://bitbucket.org/pypy/pypy/changeset/302d39bda33c/

Log:	Restore support for _sre.CODESIZE=2 that was present in Python 2.7

diff --git a/lib-python/3/sre_compile.py b/lib-python/3/sre_compile.py
--- a/lib-python/3/sre_compile.py
+++ b/lib-python/3/sre_compile.py
@@ -378,7 +378,11 @@
 
 def _bytes_to_codes(b):
     # Convert block indices to word array
-    a = memoryview(b).cast('I')
+    if _sre.CODESIZE == 2:
+        code = 'H'
+    else:
+        code = 'I'
+    a = memoryview(b).cast(code)
     assert a.itemsize == _sre.CODESIZE
     assert len(a) * a.itemsize == len(b)
     return a.tolist()

From pypy.commits at gmail.com  Sun Apr  2 15:46:31 2017
From: pypy.commits at gmail.com (arigo)
Date: Sun, 02 Apr 2017 12:46:31 -0700 (PDT)
Subject: [pypy-commit] pypy release-pypy2.7-5.x: Support translation with
 older Linux kernel headers
Message-ID: <58e15517.2780df0a.695f5.900d@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: release-pypy2.7-5.x
Changeset: r90929:c8a8072b284d
Date: 2017-03-20 23:32 +0100
http://bitbucket.org/pypy/pypy/changeset/c8a8072b284d/

Log:	Support translation with older Linux kernel headers

diff --git a/rpython/rlib/rurandom.py b/rpython/rlib/rurandom.py
--- a/rpython/rlib/rurandom.py
+++ b/rpython/rlib/rurandom.py
@@ -99,8 +99,11 @@
         eci = eci.merge(ExternalCompilationInfo(includes=['linux/random.h']))
         class CConfig:
             _compilation_info_ = eci
-            GRND_NONBLOCK = rffi_platform.ConstantInteger('GRND_NONBLOCK')
+            GRND_NONBLOCK = rffi_platform.DefinedConstantInteger(
+                'GRND_NONBLOCK')
         globals().update(rffi_platform.configure(CConfig))
+        if GRND_NONBLOCK is None:
+            GRND_NONBLOCK = 0x0001      # from linux/random.h
 
         # On Linux, use the syscall() function because the GNU libc doesn't
         # expose the Linux getrandom() syscall yet.

From pypy.commits at gmail.com  Sun Apr  2 16:40:39 2017
From: pypy.commits at gmail.com (sirtom67)
Date: Sun, 02 Apr 2017 13:40:39 -0700 (PDT)
Subject: [pypy-commit] cffi sirtom67/float_complex: merge in default again.
 All tests pass in 2.7 on linux.
Message-ID: <58e161c7.c7321c0a.6f752.362b@mx.google.com>

Author: Tom Krauss <thomas.p.krauss at gmail.com>
Branch: sirtom67/float_complex
Changeset: r2924:67fe455916a4
Date: 2017-04-02 15:39 -0500
http://bitbucket.org/cffi/cffi/changeset/67fe455916a4/

Log:	merge in default again. All tests pass in 2.7 on linux.

diff --git a/c/misc_thread_common.h b/c/misc_thread_common.h
--- a/c/misc_thread_common.h
+++ b/c/misc_thread_common.h
@@ -29,12 +29,7 @@
     struct cffi_tls_s *tls = (struct cffi_tls_s *)p;
 
     if (tls->local_thread_state != NULL) {
-        /* We need to re-acquire the GIL temporarily to free the
-           thread state.  I hope it is not a problem to do it in
-           a thread-local destructor.
-        */
-        PyEval_RestoreThread(tls->local_thread_state);
-        PyThreadState_DeleteCurrent();
+        PyThreadState_Delete(tls->local_thread_state);
     }
     free(tls);
 }

From pypy.commits at gmail.com  Sun Apr  2 19:17:16 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sun, 02 Apr 2017 16:17:16 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: See what's wrong with distutils on our
 win32 buildbot.
Message-ID: <58e1867c.429d1c0a.1b686.614b@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90930:9c096b732bfc
Date: 2017-04-03 01:16 +0200
http://bitbucket.org/pypy/pypy/changeset/9c096b732bfc/

Log:	See what's wrong with distutils on our win32 buildbot. "Unable to
	find vcvarsall.bat" is a bit too terse.

diff --git a/lib_pypy/_audioop_build.py b/lib_pypy/_audioop_build.py
--- a/lib_pypy/_audioop_build.py
+++ b/lib_pypy/_audioop_build.py
@@ -656,4 +656,4 @@
 ffi.set_source("_audioop_cffi", C_SOURCE)
 
 if __name__ == "__main__":
-    ffi.compile()
+    ffi.compile(verbose=2)

From pypy.commits at gmail.com  Mon Apr  3 11:33:35 2017
From: pypy.commits at gmail.com (mattip)
Date: Mon, 03 Apr 2017 08:33:35 -0700 (PDT)
Subject: [pypy-commit] pypy default: Added tag release-pypy3.5-v5.7.1 for
 changeset 2875f328eae2
Message-ID: <58e26b4f.caa6df0a.bbf31.da0b@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r90931:35282ed3fcab
Date: 2017-04-03 18:32 +0300
http://bitbucket.org/pypy/pypy/changeset/35282ed3fcab/

Log:	Added tag release-pypy3.5-v5.7.1 for changeset 2875f328eae2

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -37,3 +37,4 @@
 fa3249d55d15b9829e1be69cdf45b5a44cec902d release-pypy2.7-v5.7.0
 b16a4363e930f6401bceb499b9520955504c6cb0 release-pypy3.5-v5.7.0
 1aa2d8e03cdfab54b7121e93fda7e98ea88a30bf release-pypy2.7-v5.7.1
+2875f328eae2216a87f3d6f335092832eb031f56 release-pypy3.5-v5.7.1

From pypy.commits at gmail.com  Mon Apr  3 11:38:04 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Mon, 03 Apr 2017 08:38:04 -0700 (PDT)
Subject: [pypy-commit] pypy default: copy over old version of
 vmprof_config.h and vmprof_getpc.h,
 another issue because pypy grew its own version of vmprof sources
Message-ID: <58e26c5c.6ca0df0a.13103.e10e@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r90932:209327e538f7
Date: 2017-04-03 11:35 -0400
http://bitbucket.org/pypy/pypy/changeset/209327e538f7/

Log:	copy over old version of vmprof_config.h and vmprof_getpc.h, another
	issue because pypy grew its own version of vmprof sources

diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_config.h b/rpython/rlib/rvmprof/src/shared/vmprof_config.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof_config.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof_config.h
@@ -1,8 +1,30 @@
-#pragma once
+#if !defined(__OpenBSD__)
+#  define HAVE_SYS_UCONTEXT_H
+#else
+#  define HAVE_SIGNAL_H
+#endif
 
-#define HAVE_SYS_UCONTEXT_H
-#if defined(__FreeBSD__) || defined(__APPLE__)
-#define PC_FROM_UCONTEXT uc_mcontext.mc_rip
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+  #ifdef __i386__
+    #define PC_FROM_UCONTEXT uc_mcontext.mc_eip
+  #else
+    #define PC_FROM_UCONTEXT uc_mcontext.mc_rip
+  #endif
+#elif defined(__OpenBSD__)
+#define PC_FROM_UCONTEXT sc_rip
+#elif defined( __APPLE__)
+  #if ((ULONG_MAX) == (UINT_MAX))
+    #define PC_FROM_UCONTEXT uc_mcontext->__ss.__eip
+  #else
+    #define PC_FROM_UCONTEXT uc_mcontext->__ss.__rip
+  #endif
+#elif defined(__arm__)
+  #define PC_FROM_UCONTEXT uc_mcontext.arm_ip
+#elif defined(__linux) && defined(__i386) && defined(__GNUC__)
+  #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_EIP]
+#elif defined(__s390x__)
+  #define PC_FROM_UCONTEXT uc_mcontext.psw.addr
 #else
-#define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
+  /* linux, gnuc */
+  #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
 #endif
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_getpc.h b/rpython/rlib/rvmprof/src/shared/vmprof_getpc.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof_getpc.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof_getpc.h
@@ -43,15 +43,6 @@
 
 #ifndef BASE_GETPC_H_
 #define BASE_GETPC_H_
-
-#if ((ULONG_MAX) == (UINT_MAX))
-# define IS32BIT
-#else
-# define IS64BIT
-#endif
-
-#include "vmprof_config.h"
-
 // On many linux systems, we may need _GNU_SOURCE to get access to
 // the defined constants that define the register we want to see (eg
 // REG_EIP).  Note this #define must come first!
@@ -60,8 +51,11 @@
 // 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 // __APPLE__
+#endif
+
+#include "vmprof_config.h"
 
 #include <string.h>         // for memcmp
 #if defined(HAVE_SYS_UCONTEXT_H)
@@ -71,6 +65,10 @@
 #elif defined(HAVE_CYGWIN_SIGNAL_H)
 #include <cygwin/signal.h>
 typedef ucontext ucontext_t;
+#elif defined(HAVE_SIGNAL_H)
+#include <signal.h>
+#else
+#  error "don't know how to get the pc on this platform"
 #endif
 
 
@@ -117,52 +115,8 @@
 // PC_FROM_UCONTEXT in config.h.  The only thing we need to do here,
 // then, is to do the magic call-unrolling for systems that support it.
 
-// -- Special case 1: linux x86, for which we have CallUnrollInfo
-#if defined(__linux) && defined(__i386) && defined(__GNUC__)
-static const struct CallUnrollInfo callunrollinfo[] = {
-  // Entry to a function:  push %ebp;  mov  %esp,%ebp
-  // Top-of-stack contains the caller IP.
-  { 0,
-    {0x55, 0x89, 0xe5}, 3,
-    0
-  },
-  // Entry to a function, second instruction:  push %ebp;  mov  %esp,%ebp
-  // Top-of-stack contains the old frame, caller IP is +4.
-  { -1,
-    {0x55, 0x89, 0xe5}, 3,
-    4
-  },
-  // Return from a function: RET.
-  // Top-of-stack contains the caller IP.
-  { 0,
-    {0xc3}, 1,
-    0
-  }
-};
-
-void* GetPC(ucontext_t *signal_ucontext) {
-  // See comment above struct CallUnrollInfo.  Only try instruction
-  // flow matching if both eip and esp looks reasonable.
-  const int eip = signal_ucontext->uc_mcontext.gregs[REG_EIP];
-  const int esp = signal_ucontext->uc_mcontext.gregs[REG_ESP];
-  if ((eip & 0xffff0000) != 0 && (~eip & 0xffff0000) != 0 &&
-      (esp & 0xffff0000) != 0) {
-    char* eip_char = (char*)(eip);
-    int i;
-    for (i = 0; i < sizeof(callunrollinfo)/sizeof(*callunrollinfo); ++i) {
-      if (!memcmp(eip_char + callunrollinfo[i].pc_offset,
-                  callunrollinfo[i].ins, callunrollinfo[i].ins_size)) {
-        // We have a match.
-        void **retaddr = (void**)(esp + callunrollinfo[i].return_sp_offset);
-        return *retaddr;
-      }
-    }
-  }
-  return (void*)eip;
-}
-
-// Special case #2: Windows, which has to do something totally different.
-#elif defined(_WIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(__MINGW32__)
+// Special case Windows, which has to do something totally different.
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(__MINGW32__)
 // If this is ever implemented, probably the way to do it is to have
 // profiler.cc use a high-precision timer via timeSetEvent:
 //    http://msdn2.microsoft.com/en-us/library/ms712713.aspx
@@ -172,31 +126,24 @@
 // how we'd get the PC (using StackWalk64?)
 //    http://msdn2.microsoft.com/en-us/library/ms680650.aspx
 
-#include "base/logging.h"   // for RAW_LOG
-#ifndef HAVE_CYGWIN_SIGNAL_H
-typedef int ucontext_t;
-#endif
+// #include "base/logging.h"   // for RAW_LOG
+// #ifndef HAVE_CYGWIN_SIGNAL_H
+// typedef int ucontext_t;
+// #endif
 
-void* GetPC(ucontext_t *signal_ucontext) {
-  RAW_LOG(ERROR, "GetPC is not yet implemented on Windows\n");
+static intptr_t GetPC(ucontext_t *signal_ucontext) {
+  // RAW_LOG(ERROR, "GetPC is not yet implemented on Windows\n");
+  fprintf(stderr, "GetPC is not yet implemented on Windows\n");
   return NULL;
 }
 
 // Normal cases.  If this doesn't compile, it's probably because
 // PC_FROM_UCONTEXT is the empty string.  You need to figure out
 // the right value for your system, and add it to the list in
-// configure.ac (or set it manually in your config.h).
+// vmrpof_config.h
 #else
-void* GetPC(ucontext_t *signal_ucontext) {
-#ifdef __APPLE__
- #ifdef IS32BIT
-  return (void*)(signal_ucontext->uc_mcontext->__ss.__eip);
- #else
-  return (void*)(signal_ucontext->uc_mcontext->__ss.__rip);
- #endif
-#else
-  return (void*)signal_ucontext->PC_FROM_UCONTEXT;   // defined in config.h
-#endif
+static intptr_t GetPC(ucontext_t *signal_ucontext) {
+  return signal_ucontext->PC_FROM_UCONTEXT;   // defined in config.h
 }
 
 #endif

From pypy.commits at gmail.com  Mon Apr  3 11:51:20 2017
From: pypy.commits at gmail.com (mattip)
Date: Mon, 03 Apr 2017 08:51:20 -0700 (PDT)
Subject: [pypy-commit] pypy.org extradoc: update pypy3 to 5.7.1
Message-ID: <58e26f78.0a87df0a.e22f3.e568@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: extradoc
Changeset: r877:8dc790251912
Date: 2017-04-03 18:50 +0300
http://bitbucket.org/pypy/pypy.org/changeset/8dc790251912/

Log:	update pypy3 to 5.7.1

diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -453,11 +453,11 @@
     a3ba7c946635236836f8536d8767a0f456b3b9a86876cb5c3173a04522bf451b  pypy2-v5.7.1-win32.zip
 
 
-pypy 3.5-v5.7.0 sha256::
+pypy 3.5-v5.7.1 sha256::
 
-    921894884a647220a712ecdaad516d9c22fbadf3b4bb3a5db8f3635c60eabc7b  pypy3-v5.7.0-linux64.tar.bz2
-    f0f563b74f8b82ec33b022393219b93cc0d81e9f9500614fe8417b67a52e9569  pypy3-v5.7.0-src.tar.bz2
-    fe8b9804a8599ef5b16114fb64ba8392342f0066dfe81103b89198a3c5d10989  pypy3-v5.7.0-src.zip
+    2abaa54d88c9b70b64c37083e7e430a1d3a8f78f8de92e484a988b7aca1e50a7  pypy3-v5.7.1-linux64.tar.bz2
+    40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0  pypy3-v5.7.1-src.tar.bz2
+    97fb0075ab2ecfb912fab996c71c6a8475ff18766db6c9e060f9384b809500bd  pypy3-v5.7.1-src.zip
 
 pypy3.3-v5.5.0-alpha sha256::
 

From pypy.commits at gmail.com  Mon Apr  3 11:56:29 2017
From: pypy.commits at gmail.com (arigo)
Date: Mon, 03 Apr 2017 08:56:29 -0700 (PDT)
Subject: [pypy-commit] pypy.org extradoc: sha256 for the ppc tarballs
Message-ID: <58e270ad.0a301c0a.54bd8.77df@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r878:3a8409b145d5
Date: 2017-04-03 17:56 +0200
http://bitbucket.org/pypy/pypy.org/changeset/3a8409b145d5/

Log:	sha256 for the ppc tarballs

diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -77,8 +77,8 @@
 <p>We provide binaries for x86, ARM, PPC and s390x running on different operating systems such as
 Linux, Mac OS/X and Windows:</p>
 <ul class="simple">
-<li>the Python2.7 compatible release &#8212; <strong>PyPy2.7 v5.7.0</strong> &#8212; (<a class="reference external" href="http://doc.pypy.org/en/latest/release-v5.7.0.html">what's new in PyPy2.7?</a>)</li>
-<li>the Python3.5 compatible beta quality release &#8212; <strong>PyPy3.5 v5.7.0</strong> &#8212; (<a class="reference external" href="http://doc.pypy.org/en/latest/release-v5.7.0.html">what's new in PyPy3.5?</a>).</li>
+<li>the Python2.7 compatible release &#8212; <strong>PyPy2.7 v5.7.1</strong> &#8212; (<a class="reference external" href="http://doc.pypy.org/en/latest/release-v5.7.1.html">what's new in PyPy2.7?</a>)</li>
+<li>the Python3.5 compatible beta quality release &#8212; <strong>PyPy3.5 v5.7.1</strong> &#8212; (<a class="reference external" href="http://doc.pypy.org/en/latest/release-v5.7.1.html">what's new in PyPy3.5?</a>).</li>
 <li>the Python2.7 Software Transactional Memory special release &#8212; <strong>PyPy-STM 2.5.1</strong> (Linux x86-64 only)</li>
 </ul>
 <ul class="download-menu simple">
@@ -117,22 +117,22 @@
 <li>or <a class="reference internal" href="#translate">translate</a> your own PyPy.</li>
 </ul>
 </div>
-<div class="section" id="python2-7-compatible-pypy-5-7-0">
-<span id="release"></span><h1>Python2.7 compatible PyPy 5.7.0</h1>
+<div class="section" id="python2-7-compatible-pypy-5-7-1">
+<span id="release"></span><h1>Python2.7 compatible PyPy 5.7.1</h1>
 <ul class="simple">
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux32.tar.bz2">Linux x86 binary (32bit, tar.bz2 built on Ubuntu 12.04 - 14.04)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux64.tar.bz2">Linux x86-64 binary (64bit, tar.bz2 built on Ubuntu 12.04 - 14.04)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux-armhf-raspbian.tar.bz2">ARM Hardfloat Linux binary (ARMHF/gnueabihf, tar.bz2, Raspbian)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux-armhf-raring.tar.bz2">ARM Hardfloat Linux binary (ARMHF/gnueabihf, tar.bz2, Ubuntu Raring)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux-armel.tar.bz2">ARM Softfloat Linux binary (ARMEL/gnueabi, tar.bz2,  Ubuntu Precise)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-osx64.tar.bz2">Mac OS/X binary (64bit)</a></li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux32.tar.bz2">Linux x86 binary (32bit, tar.bz2 built on Ubuntu 12.04 - 14.04)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux64.tar.bz2">Linux x86-64 binary (64bit, tar.bz2 built on Ubuntu 12.04 - 14.04)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux-armhf-raspbian.tar.bz2">ARM Hardfloat Linux binary (ARMHF/gnueabihf, tar.bz2, Raspbian)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux-armhf-raring.tar.bz2">ARM Hardfloat Linux binary (ARMHF/gnueabihf, tar.bz2, Ubuntu Raring)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux-armel.tar.bz2">ARM Softfloat Linux binary (ARMEL/gnueabi, tar.bz2,  Ubuntu Precise)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-osx64.tar.bz2">Mac OS/X binary (64bit)</a></li>
 <li>FreeBSD x86 and x86_64: see <a class="reference external" href="http://www.freshports.org/lang/pypy">FreshPorts</a></li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-win32.zip">Windows binary (32bit)</a> (you might need the VS 2008 runtime library
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-win32.zip">Windows binary (32bit)</a> (you might need the VS 2008 runtime library
 installer <a class="reference external" href="http://www.microsoft.com/en-us/download/details.aspx?id=5582">vcredist_x86.exe</a>.)</li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-ppc64.tar.bz2">PowerPC PPC64 Linux binary (64bit big-endian, Fedora 20)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-ppc64le.tar.bz2">PowerPC PPC64le Linux binary (64bit little-endian, Fedora 21)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-s390x.tar.bz2">s390x Linux binary (tar.bz2 built on Redhat Linux 7.2)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-src.tar.bz2">Source (tar.bz2)</a>; <a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-src.zip">Source (zip)</a>.  See below for more about the sources.</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-ppc64.tar.bz2">PowerPC PPC64 Linux binary (64bit big-endian, Fedora 20)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-ppc64le.tar.bz2">PowerPC PPC64le Linux binary (64bit little-endian, Fedora 21)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-s390x.tar.bz2">s390x Linux binary (tar.bz2 built on Redhat Linux 7.2)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-src.tar.bz2">Source (tar.bz2)</a>; <a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-src.zip">Source (zip)</a>.  See below for more about the sources.</li>
 <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads">All our downloads,</a> including previous versions.  We also have a
 <a class="reference external" href="http://buildbot.pypy.org/mirror/">mirror</a>, but please use only if you have troubles accessing the links above</li>
 </ul>
@@ -144,9 +144,9 @@
 PyPy 2.  You are welcome to use it anyway; if you're lucky it will
 be fast in your case.</p>
 <ul class="simple">
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.0-linux64.tar.bz2">Linux x86-64 binary (64bit, tar.bz2 built on Ubuntu 12.04 - 14.04)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.0-src.tar.bz2">Source (tar.bz2)</a></li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.0-src.zip">Source (zip)</a></li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-linux64.tar.bz2">Linux x86-64 binary (64bit, tar.bz2 built on Ubuntu 12.04 - 14.04)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-src.tar.bz2">Source (tar.bz2)</a></li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-src.zip">Source (zip)</a></li>
 <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads">All our downloads,</a> including previous versions.  We also have a
 <a class="reference external" href="http://buildbot.pypy.org/mirror/">mirror</a>, but please use only if you have troubles accessing the links above</li>
 </ul>
@@ -200,7 +200,7 @@
 uncompressed, they run in-place.  For now you can uncompress them
 either somewhere in your home directory or, say, in <tt class="docutils literal">/opt</tt>, and
 if you want, put a symlink from somewhere like
-<tt class="docutils literal">/usr/local/bin/pypy</tt> to <tt class="docutils literal"><span class="pre">/path/to/pypy2-5.7.0/bin/pypy</span></tt>.  Do
+<tt class="docutils literal">/usr/local/bin/pypy</tt> to <tt class="docutils literal"><span class="pre">/path/to/pypy2-5.7.1/bin/pypy</span></tt>.  Do
 not move or copy the executable <tt class="docutils literal">pypy</tt> outside the tree &ndash; put
 a symlink to it, otherwise it will not find its libraries.</p>
 </div>
@@ -281,7 +281,7 @@
 <p>Alternatively, the following smaller package contains the source at
 the same revision as the above binaries:</p>
 <ul class="simple">
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-src.tar.bz2">pypy2-v5.7.0-src.tar.bz2</a> (sources)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-src.tar.bz2">pypy2-v5.7.1-src.tar.bz2</a> (sources)</li>
 </ul>
 </li>
 <li><p class="first">Make sure you <strong>installed the dependencies.</strong>  See the list <a class="reference external" href="http://pypy.readthedocs.org/en/latest/build.html#install-build-time-dependencies">here</a>.</p>
@@ -396,93 +396,26 @@
 <div class="section" id="checksums">
 <h1>Checksums</h1>
 <p>Here are the checksums for each of the downloads</p>
-<p>pypy2.7-v5.7.0 md5:</p>
+<p>pypy2.7-v5.7.1 sha256:</p>
 <pre class="literal-block">
-bb55f4a28d64d40367a58139b25b02fe  pypy2-v5.7.0-linux32.tar.bz2
-84b542e3aaca2aec9b0ca3afb6a3373b  pypy2-v5.7.0-linux64.tar.bz2
-9f98c917ec1dbbda821bd23734fdc4d4  pypy2-v5.7.0-linux-armel.tar.bz2
-509539d3f5876584fa5cad6fd125e446  pypy2-v5.7.0-linux-armhf-raring.tar.bz2
-34739358ba2e438d27b777838154f255  pypy2-v5.7.0-linux-armhf-raspbian.tar.bz2
-6b6180f4b0932d5a3a7499ddef1c5129  pypy2-v5.7.0-osx64.tar.bz2
-180d5cc3f58a9f9088481c7d4c6b5d68  pypy2-v5.7.0-s390x.tar.bz2
-aa26e72c1f30b77734198af6fb6f9ad7  pypy2-v5.7.0-src.tar.bz2
-f1633ad18e0af309aa11e3425f628cf9  pypy2-v5.7.0-src.zip
-23f15d2bc0c29fe6948a99352962ebf0  pypy2-v5.7.0-win32.zip
+f125a227f8c814ba1698168a639ea6ca59bb69c280529639eed29076d8429a73  pypy2-v5.7.1-linux32.tar.bz2
+c4fa3da42156bed4a9d912433b618a141e0c5161d7cc8c328786736ea5d1c2da  pypy2-v5.7.1-linux64.tar.bz2
+591a4a73cc945a1125848f3615a28559692db8febf677d7087eaef40cb119a8d  pypy2-v5.7.1-linux-armel.tar.bz2
+c1b1a0968b22c58672f7492dc7900bc85e3bd02c791f219f31401a00ef387207  pypy2-v5.7.1-linux-armhf-raring.tar.bz2
+67544f8c4b284db71cf1af74edef290722f97f82476cbdaff2015fdab244c6ee  pypy2-v5.7.1-linux-armhf-raspbian.tar.bz2
+4e99ba356432861534917a9477ace0ccee617bd631512759a530f8383e153a3d  pypy2-v5.7.1-osx64.tar.bz2
+395c57a1aa078c9ae9aa9f18263bb91fa23114bae4d133d10560eaea30c51892  pypy2-v5.7.1-s390x.tar.bz2
+d01bee43c6df79f7bbc1149bb3e85f489491fb2358a6a1f9a7f0d6e07715832f  pypy2-v5.7.1-src.tar.bz2
+f580a7b41cc09e030bbff66752044bdfbc193ec617e575c64bf65c136c298076  pypy2-v5.7.1-src.zip
+a3ba7c946635236836f8536d8767a0f456b3b9a86876cb5c3173a04522bf451b  pypy2-v5.7.1-win32.zip
+a4edb857c1f001bab4b545f2f87f3653e8cd882a95233d60d584edb9700722e9  pypy2-v5.7.1-ppc64.tar.bz2
+5db9bb6429d9cf146f74360ec30b40bd0df78116f458cf14035a0b7daefa35eb  pypy2-v5.7.1-ppc64le.tar.bz2
 </pre>
-<p>pypy 3.5-v5.7.0 md5:</p>
+<p>pypy 3.5-v5.7.1 sha256:</p>
 <pre class="literal-block">
-410fb506ac436c344f785bb77820e13e  pypy3-v5.7.0-linux64.tar.bz2
-79b1d5749eb97be36933dbdf156fec02  pypy3-v5.7.0-src.tar.bz2
-594f3d17be1c80181d13c0f025ae25f6  pypy3-v5.7.0-src.zip
-</pre>
-<p>pypy3.3-v5.5.0-alpha md5:</p>
-<pre class="literal-block">
-e9bdfb330a30765eaf76ddd4e826a45e  pypy3.3-v5.5.0-alpha-linux32.tar.bz2
-b04022a5a549bba719c9a184c783805c  pypy3.3-v5.5.0-alpha-linux64.tar.bz2
-84424f01b2746c71f64e27cb4c7069a1  pypy3.3-v5.5.0-alpha-linux-armel.tar.bz2
-9d18b171a7249227f3a3b74af8070c82  pypy3.3-v5.5.0-alpha-linux-armhf-raspbian.tar.bz2
-d2424a9e3ff31e26e5b1f0ceade5e9f7  pypy3.3-v5.5.0-alpha-osx64.tar.bz2
-c32728185d89f9c0fda9481f2f9ae61d  pypy3.3-v5.5.0-alpha-s390x.tar.bz2
-536008fd7b17af8878915393fc1ecfc3  pypy3.3-v5.5.0-alpha-src.tar.bz2
-4fc66068848dbfc09b210d3115380b0a  pypy3.3-v5.5.0-alpha-src.zip
-</pre>
-<p>pypy-1.8 sandbox md5:</p>
-<pre class="literal-block">
-2c9f0054f3b93a6473f10be35277825a  pypy-1.8-sandbox-linux64.tar.bz2
-009c970b5fa75754ae4c32a5d108a8d4  pypy-1.8-sandbox-linux.tar.bz2
-</pre>
-<p>pypy2.7-v5.7.0 sha1:</p>
-<pre class="literal-block">
-c8cc2cbc2b75962d0e5920f4a756f7fe3f13596c  pypy2-v5.7.0-linux32.tar.bz2
-0a831dae298fce2110626637342d0e3545a8ab47  pypy2-v5.7.0-linux64.tar.bz2
-556face1374a75720177176a4c7517bb4f9a62a5  pypy2-v5.7.0-linux-armel.tar.bz2
-bec04d53cd2a7cc89cf67cfdab2207ad6c08781b  pypy2-v5.7.0-linux-armhf-raring.tar.bz2
-c510f53447fc800b4611545d2679d596d8f0c461  pypy2-v5.7.0-linux-armhf-raspbian.tar.bz2
-097e418d5aa61c7697a50536c5b173d8211603a9  pypy2-v5.7.0-osx64.tar.bz2
-a11cf7d95a909c8e60bafc79ff491711ecd0ee29  pypy2-v5.7.0-ppc64.tar.bz2
-0ccb73316935c5610e5170330556443abd87d3cd  pypy2-v5.7.0-ppc64le.tar.bz2
-20f33a4d0c08a5d4935086caec73be3d92b60b2b  pypy2-v5.7.0-s390x.tar.bz2
-5976e1f19a42f64f778d385322723200b5c6d7c9  pypy2-v5.7.0-src.tar.bz2
-c84ad90184edb315031074696e805ecbc08494e3  pypy2-v5.7.0-src.zip
-15df479b08870dc6ec9cab0e4587935fc0694cb8  pypy2-v5.7.0-win32.zip
-</pre>
-<p>pypy 3.5-v5.7.0 sha1:</p>
-<pre class="literal-block">
-e10511bde5a88c5de9fdf9234188b8df23382a6a  pypy3-v5.7.0-linux64.tar.bz2
-0b12230025d77be26bc10cbc81671c4b3719528c  pypy3-v5.7.0-src.tar.bz2
-ae256d83173faaadce9602594fd752fb664b813b  pypy3-v5.7.0-src.zip
-</pre>
-<p>pypy3.3-v5.5.0-alpha sha1:</p>
-<pre class="literal-block">
-1de17b61b8d21e408a46114961659b4c0f15cb54  pypy3.3-v5.5.0-alpha-linux32.tar.bz2
-995ae3b983d9975006b898f098b27408949d2fdf  pypy3.3-v5.5.0-alpha-linux64.tar.bz2
-2487f726d7b50aef041beba2bb0f39fe4d7392da  pypy3.3-v5.5.0-alpha-linux-armel.tar.bz2
-ed104a504664a7ccd971da202abe14302246175a  pypy3.3-v5.5.0-alpha-linux-armhf-raspbian.tar.bz2
-0f6456672b02e4856421021d2ff71ffaca2e2c3e  pypy3.3-v5.5.0-alpha-osx64.tar.bz2
-018e9e9e4c54fcef3959bc316f3e684f88231ab4  pypy3.3-v5.5.0-alpha-s390x.tar.bz2
-9eb6aad2d41f7db16c19ae6e438c8f195b0d44fc  pypy3.3-v5.5.0-alpha-src.tar.bz2
-b670cdc685c323b11bfdca2a15f12c5953e6d8b4  pypy3.3-v5.5.0-alpha-src.zip
-</pre>
-<p>pypy2.7-v5.7.0 sha256:</p>
-<pre class="literal-block">
-aaa55085d11a49cb982b059b4159495d7a4fb9afcfda7bfd680cc0175e9fa33b  pypy2-v5.7.0-linux32.tar.bz2
-64bed80e299b09c13296f577a0f52c5d4be9f7c699a390ca6026f967aeff3846  pypy2-v5.7.0-linux64.tar.bz2
-3bc0d2616cacef9f544e739d4c25a89e16d7aa8c1ccb18c32dceeb021ed73711  pypy2-v5.7.0-linux-armel.tar.bz2
-413df8097c87a8e79cc46df65837b1d533de83b7cb06ce88b168697807fff696  pypy2-v5.7.0-linux-armhf-raring.tar.bz2
-6328e4767cf20d20a290739db2d1ec769f3c9c360fa9824f61581b3356add79b  pypy2-v5.7.0-linux-armhf-raspbian.tar.bz2
-9204aa1b55771a374a3118bb43e498c88caca8c33710eecf3249855c4dd1352a  pypy2-v5.7.0-osx64.tar.bz2
-ca936b034a5cd2decfd3b500fad3c28e5a6327a77bb56b2d2ba6ff0159c00f2c  pypy2-v5.7.0-ppc64.tar.bz2
-3ecb3165c85df60f8e59bfdf28304cd40894d304ee04a4d58dc8b9947cbb2b01  pypy2-v5.7.0-ppc64le.tar.bz2
-8820b36f38b4aa44c1ef2be213c7d13818c9fdb61795f24f4fb18a7a78d2dde7  pypy2-v5.7.0-s390x.tar.bz2
-e522ea7ca51b16ee5505f22b86803664b762a263a6d69ba84c359fcf8365ad3e  pypy2-v5.7.0-src.tar.bz2
-784be3d2b8bb12a0d88d088fd991b03324d9f84a48af5dbaf2a536eaee91d8b5  pypy2-v5.7.0-src.zip
-09c8da3a7e09cea821f9b300c6f4f52f4a571d949d91839ecbce93b84a08d570  pypy2-v5.7.0-win32.zip
-</pre>
-<p>pypy 3.5-v5.7.0 sha256:</p>
-<pre class="literal-block">
-921894884a647220a712ecdaad516d9c22fbadf3b4bb3a5db8f3635c60eabc7b  pypy3-v5.7.0-linux64.tar.bz2
-f0f563b74f8b82ec33b022393219b93cc0d81e9f9500614fe8417b67a52e9569  pypy3-v5.7.0-src.tar.bz2
-fe8b9804a8599ef5b16114fb64ba8392342f0066dfe81103b89198a3c5d10989  pypy3-v5.7.0-src.zip
+2abaa54d88c9b70b64c37083e7e430a1d3a8f78f8de92e484a988b7aca1e50a7  pypy3-v5.7.1-linux64.tar.bz2
+40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0  pypy3-v5.7.1-src.tar.bz2
+97fb0075ab2ecfb912fab996c71c6a8475ff18766db6c9e060f9384b809500bd  pypy3-v5.7.1-src.zip
 </pre>
 <p>pypy3.3-v5.5.0-alpha sha256:</p>
 <pre class="literal-block">
diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -451,6 +451,8 @@
     d01bee43c6df79f7bbc1149bb3e85f489491fb2358a6a1f9a7f0d6e07715832f  pypy2-v5.7.1-src.tar.bz2
     f580a7b41cc09e030bbff66752044bdfbc193ec617e575c64bf65c136c298076  pypy2-v5.7.1-src.zip
     a3ba7c946635236836f8536d8767a0f456b3b9a86876cb5c3173a04522bf451b  pypy2-v5.7.1-win32.zip
+    a4edb857c1f001bab4b545f2f87f3653e8cd882a95233d60d584edb9700722e9  pypy2-v5.7.1-ppc64.tar.bz2
+    5db9bb6429d9cf146f74360ec30b40bd0df78116f458cf14035a0b7daefa35eb  pypy2-v5.7.1-ppc64le.tar.bz2
 
 
 pypy 3.5-v5.7.1 sha256::

From pypy.commits at gmail.com  Mon Apr  3 12:27:21 2017
From: pypy.commits at gmail.com (mattip)
Date: Mon, 03 Apr 2017 09:27:21 -0700 (PDT)
Subject: [pypy-commit] pypy default: fix links
Message-ID: <58e277e9.c43a1c0a.e8291.8405@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r90933:bf1bb149e026
Date: 2017-04-03 19:24 +0300
http://bitbucket.org/pypy/pypy/changeset/bf1bb149e026/

Log:	fix links

diff --git a/pypy/doc/release-v5.7.0.rst b/pypy/doc/release-v5.7.0.rst
--- a/pypy/doc/release-v5.7.0.rst
+++ b/pypy/doc/release-v5.7.0.rst
@@ -99,7 +99,7 @@
     tp_dealloc
   * refactor and clean up poor handling of unicode exposed in work on py3.5
   * builtin module cppyy_ supports C++ 11, 14, etc. via cling (reflex has been removed)
-  * adapt ``weakref`` according to CPython issue #19542_, will be in CPython 2.7.14
+  * adapt ``weakref`` according to CPython issue 19542_, will be in CPython 2.7.14
   * support translations with cpyext and the Boehm GC (for special cases like
     RevDB_
   * implement ``StringBuffer.get_raw_address`` for the buffer protocol, it is
@@ -125,18 +125,18 @@
   * disable ``clock_gettime()`` on OS/X, since we support 10.11 and it was only
     added in 10.12
   * support ``HAVE_FSTATVFS`` which was unintentionally always false
-  * fix user-created C-API heaptype, issue #2434_
+  * fix user-created C-API heaptype, issue 2434_
   * fix ``PyDict_Update`` is not actually the same as ``dict.update``
   * assign ``tp_doc`` on ``PyTypeObject`` and tie it to the app-level ``__doc__`` attribute
-    issue #2446_
+    issue 2446_
   * clean up memory leaks around ``PyObject_GetBuffer``, ``PyMemoryView_GET_BUFFER``,
     ``PyMemoryView_FromBuffer``, and ``PyBuffer_Release``
   * improve support for creating C-extension objects from app-level classes,
     filling more slots, especially ``tp_new`` and ``tp_dealloc``
-  * fix for ``ctypes.c_bool`` returning ``bool`` restype, issue #2475_
+  * fix for ``ctypes.c_bool`` returning ``bool`` restype, issue 2475_
   * fix in corner cases with the GIL and C-API functions
-  * allow overriding thread.local.__init__ in a subclass, issue #2501_
-  * allow ``PyClass_New`` to be called with NULL as the first arguemnt, issue #2504_
+  * allow overriding thread.local.__init__ in a subclass, issue 2501_
+  * allow ``PyClass_New`` to be called with NULL as the first arguemnt, issue 2504_
 
 
 * Performance improvements:
diff --git a/pypy/doc/release-v5.7.1.rst b/pypy/doc/release-v5.7.1.rst
--- a/pypy/doc/release-v5.7.1.rst
+++ b/pypy/doc/release-v5.7.1.rst
@@ -5,13 +5,13 @@
 We have released a bugfix PyPy2.7-v5.7.1 and PyPy3.5-v5.7.1 beta (Linux 64bit),
 due to the following issues:
 
-  * correctly handle an edge case in dict.pop (issue #2508_)
+  * correctly handle an edge case in dict.pop (issue 2508_)
 
   * fix a regression to correctly handle multiple inheritance in a C-API type
     where the seconde base is an app-level class with a ``__new__`` function
 
   * fix a regression to fill a C-API type's ``tp_getattr`` slot from a
-    ``__getattr__`` method (issue #2523_)
+    ``__getattr__`` method (issue 2523_)
 
 Thanks to those who reported the issues.
 

From pypy.commits at gmail.com  Mon Apr  3 12:45:20 2017
From: pypy.commits at gmail.com (mattip)
Date: Mon, 03 Apr 2017 09:45:20 -0700 (PDT)
Subject: [pypy-commit] pypy default: typo (marky1991)
Message-ID: <58e27c20.8c091c0a.f8deb.75b6@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r90934:5a015a054c16
Date: 2017-04-03 19:44 +0300
http://bitbucket.org/pypy/pypy/changeset/5a015a054c16/

Log:	typo (marky1991)

diff --git a/pypy/doc/release-v5.7.1.rst b/pypy/doc/release-v5.7.1.rst
--- a/pypy/doc/release-v5.7.1.rst
+++ b/pypy/doc/release-v5.7.1.rst
@@ -8,7 +8,7 @@
   * correctly handle an edge case in dict.pop (issue 2508_)
 
   * fix a regression to correctly handle multiple inheritance in a C-API type
-    where the seconde base is an app-level class with a ``__new__`` function
+    where the second base is an app-level class with a ``__new__`` function
 
   * fix a regression to fill a C-API type's ``tp_getattr`` slot from a
     ``__getattr__`` method (issue 2523_)

From pypy.commits at gmail.com  Mon Apr  3 13:20:13 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Mon, 03 Apr 2017 10:20:13 -0700 (PDT)
Subject: [pypy-commit] pypy default: include signal.h for mac os x
Message-ID: <58e2844d.c3a4df0a.f3a44.1fd6@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r90935:94bf0cac414f
Date: 2017-04-03 13:14 -0400
http://bitbucket.org/pypy/pypy/changeset/94bf0cac414f/

Log:	include signal.h for mac os x

diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <signal.h>
 #include "shared/vmprof.h"
 
 #define SINGLE_BUF_SIZE (8192 - 2 * sizeof(unsigned int))

From pypy.commits at gmail.com  Mon Apr  3 14:00:13 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Mon, 03 Apr 2017 11:00:13 -0700 (PDT)
Subject: [pypy-commit] pypy default: define VMPROF_WINDOWS if it has not
 already been defined (only on windows),
 this should simplify the vmprof setup
Message-ID: <58e28dad.16a1df0a.1334f.93cf@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r90936:a73be2d612a2
Date: 2017-04-03 13:58 -0400
http://bitbucket.org/pypy/pypy/changeset/a73be2d612a2/

Log:	define VMPROF_WINDOWS if it has not already been defined (only on
	windows), this should simplify the vmprof setup

diff --git a/pypy/module/_vmprof/test/test_direct.py b/pypy/module/_vmprof/test/test_direct.py
--- a/pypy/module/_vmprof/test/test_direct.py
+++ b/pypy/module/_vmprof/test/test_direct.py
@@ -1,4 +1,4 @@
-
+import sys
 import py
 try:
     import cffi
@@ -7,6 +7,7 @@
 
 from rpython.rlib import rvmprof
 srcdir = py.path.local(rvmprof.__file__).join("..", "src")
+shareddir = srcdir.join('shared')
 
 ffi = cffi.FFI()
 ffi.cdef("""
@@ -43,7 +44,7 @@
 }
 
 
-""" + open(str(srcdir.join("shared/vmprof_get_custom_offset.h"))).read(), include_dirs=[str(srcdir)])
+""" + open(str(srcdir.join("shared/vmprof_get_custom_offset.h"))).read(), include_dirs=[str(srcdir), str(shareddir)])
 
 class TestDirect(object):
     def test_infrastructure(self):
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof.h b/rpython/rlib/rvmprof/src/shared/vmprof.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof.h
@@ -29,6 +29,12 @@
 
 #define DYN_JIT_FLAG 0xbeefbeef
 
+#ifdef _WIN32
+#ifndef VMPROF_WINDOWS
+#define VMPROF_WINDOWS
+#endif
+#endif
+
 #ifdef VMPROF_UNIX
 #define VMP_SUPPORTS_NATIVE_PROFILING
 #endif
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_get_custom_offset.h b/rpython/rlib/rvmprof/src/shared/vmprof_get_custom_offset.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof_get_custom_offset.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof_get_custom_offset.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "vmprof.h"
+
 #ifdef VMPROF_WINDOWS
 #include "msiinttypes/stdint.h"
 #else

From pypy.commits at gmail.com  Mon Apr  3 16:11:45 2017
From: pypy.commits at gmail.com (arigo)
Date: Mon, 03 Apr 2017 13:11:45 -0700 (PDT)
Subject: [pypy-commit] pypy.org extradoc: Remove checksums of outdated
 downloads
Message-ID: <58e2ac81.08a7df0a.72f48.2fd5@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r879:46aed66e3f34
Date: 2017-04-03 22:11 +0200
http://bitbucket.org/pypy/pypy.org/changeset/46aed66e3f34/

Log:	Remove checksums of outdated downloads

diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -417,22 +417,6 @@
 40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0  pypy3-v5.7.1-src.tar.bz2
 97fb0075ab2ecfb912fab996c71c6a8475ff18766db6c9e060f9384b809500bd  pypy3-v5.7.1-src.zip
 </pre>
-<p>pypy3.3-v5.5.0-alpha sha256:</p>
-<pre class="literal-block">
-966ee7951ad497ac907e01554fe48da77cc64a5e35a1307477c2f78652eba622  pypy3.3-v5.5.0-alpha-linux32.tar.bz2
-41ef7c25fd04eeb20deaa83c5d88c10aef2bbc8bcfd9e53e7cc61136220861cc  pypy3.3-v5.5.0-alpha-linux64.tar.bz2
-9f081041867f434f18456f936befbacd9f40c0ede24137cbf80f9f45ff37b69f  pypy3.3-v5.5.0-alpha-linux-armel.tar.bz2
-d8e94c834307081d5c4be863fab935e34df360a77b06e8bc833624c4b712b2aa  pypy3.3-v5.5.0-alpha-linux-armhf-raspbian.tar.bz2
-fa45f861a6c40ae44f99ec94c521adfb6b64b0c9c0b6fc6e9df018241a648986  pypy3.3-v5.5.0-alpha-osx64.tar.bz2
-c4a0a75a987b3dacd811c653e57b6a0a01fc31cdaf671e83ad43f4c107961a02  pypy3.3-v5.5.0-alpha-s390x.tar.bz2
-d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f  pypy3.3-v5.5.0-alpha-src.tar.bz2
-43b3791f77f253d4da59fdeeec49b1daefea9a57321c726a19b4924c520a0b49  pypy3.3-v5.5.0-alpha-src.zip
-</pre>
-<p>pypy-1.8 sandbox sha1:</p>
-<pre class="literal-block">
-895aaf7bba5787dd30adda5cc0e0e7fc297c0ca7  pypy-1.8-sandbox-linux64.tar.bz2
-be94460bed8b2682880495435c309b6611ae2c31  pypy-1.8-sandbox-linux.tar.bz2
-</pre>
 </div>
 </div>
 <div id="sidebar">
diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -460,20 +460,3 @@
     2abaa54d88c9b70b64c37083e7e430a1d3a8f78f8de92e484a988b7aca1e50a7  pypy3-v5.7.1-linux64.tar.bz2
     40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0  pypy3-v5.7.1-src.tar.bz2
     97fb0075ab2ecfb912fab996c71c6a8475ff18766db6c9e060f9384b809500bd  pypy3-v5.7.1-src.zip
-
-pypy3.3-v5.5.0-alpha sha256::
-
-    966ee7951ad497ac907e01554fe48da77cc64a5e35a1307477c2f78652eba622  pypy3.3-v5.5.0-alpha-linux32.tar.bz2
-    41ef7c25fd04eeb20deaa83c5d88c10aef2bbc8bcfd9e53e7cc61136220861cc  pypy3.3-v5.5.0-alpha-linux64.tar.bz2
-    9f081041867f434f18456f936befbacd9f40c0ede24137cbf80f9f45ff37b69f  pypy3.3-v5.5.0-alpha-linux-armel.tar.bz2
-    d8e94c834307081d5c4be863fab935e34df360a77b06e8bc833624c4b712b2aa  pypy3.3-v5.5.0-alpha-linux-armhf-raspbian.tar.bz2
-    fa45f861a6c40ae44f99ec94c521adfb6b64b0c9c0b6fc6e9df018241a648986  pypy3.3-v5.5.0-alpha-osx64.tar.bz2
-    c4a0a75a987b3dacd811c653e57b6a0a01fc31cdaf671e83ad43f4c107961a02  pypy3.3-v5.5.0-alpha-s390x.tar.bz2
-    d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f  pypy3.3-v5.5.0-alpha-src.tar.bz2
-    43b3791f77f253d4da59fdeeec49b1daefea9a57321c726a19b4924c520a0b49  pypy3.3-v5.5.0-alpha-src.zip
-
-pypy-1.8 sandbox sha1::
-
-   895aaf7bba5787dd30adda5cc0e0e7fc297c0ca7  pypy-1.8-sandbox-linux64.tar.bz2
-   be94460bed8b2682880495435c309b6611ae2c31  pypy-1.8-sandbox-linux.tar.bz2
-

From pypy.commits at gmail.com  Mon Apr  3 17:19:18 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Mon, 03 Apr 2017 14:19:18 -0700 (PDT)
Subject: [pypy-commit] pypy vmprof-multiple-eval-funcs: add new API to
 register more evaluation functions
Message-ID: <58e2bc56.85131c0a.f64c2.d552@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: vmprof-multiple-eval-funcs
Changeset: r90937:d9c9cd171e95
Date: 2017-04-03 17:18 -0400
http://bitbucket.org/pypy/pypy/changeset/d9c9cd171e95/

Log:	add new API to register more evaluation functions

diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -97,6 +97,10 @@
                                   lltype.Signed, compilation_info=eci,
                                   _nowrapper=True)
 
+    vmprof_register_eval = rffi.llexternal("vmprof_register_eval",
+                                           [rffi.VOIDP], rffi.INT,
+                                           compilation_info=eci)
+
     return CInterface(locals())
 
 
diff --git a/rpython/rlib/rvmprof/src/rvmprof.c b/rpython/rlib/rvmprof/src/rvmprof.c
--- a/rpython/rlib/rvmprof/src/rvmprof.c
+++ b/rpython/rlib/rvmprof/src/rvmprof.c
@@ -20,12 +20,32 @@
 #include "shared/vmprof_main_win32.h"
 #endif
 
+int _vmprof_eval_count = 0;
+void _vmprof_eval_funcs[5];
 
-#ifdef RPYTHON_LL2CTYPES
-int IS_VMPROF_EVAL(void * ptr) { return 0; }
-#else
+int vmprof_register_eval(void * function)
+{
+    if (_vmprof_eval_count >= 5) {
+        fprintf(stderr, "WARNING: cannot register more than 5 rpython interpreter " \
+                        "evaluation functions (you can increase the amount in rvmprof.c)\n");
+        return -1;
+    }
+    if (function == NULL) { 
+        _vmprof_eval_count = 0;
+    } else {
+        _vmprof_eval_funcs[_vmprof_eval_count++] = function;
+    }
+
+    return 0;
+}
+
 int IS_VMPROF_EVAL(void * ptr)
 {
-    return ptr == __vmprof_eval_vmprof;
+    int i = 0;
+    for (i = 0; i < _vmprof_eval_count; i++) {
+        if (ptr == _vmprof_eval_funcs[i]) {
+            return 1;
+        }
+    }
+    return 0;
 }
-#endif
diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -35,6 +35,15 @@
 RPY_EXTERN long vmprof_stack_pop(void*);
 RPY_EXTERN void vmprof_stack_free(void*);
 RPY_EXTERN intptr_t vmprof_get_traceback(void *, void *, intptr_t*, intptr_t);
+/**
+ * Registers the first argument as a evaluation function. If NULL is provided,
+ * it resets the registers eval functions.
+ *
+ * Note that a maximum of 5 evaluation functions is supported.
+ *
+ * Return 0 on success, any other value on failure.
+ */
+RPY_EXTERN int vmprof_register_eval(void *);
 
 long vmprof_write_header_for_jit_addr(intptr_t *result, long n,
                                       intptr_t addr, int max_depth);

From pypy.commits at gmail.com  Mon Apr  3 17:42:02 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Mon, 03 Apr 2017 14:42:02 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Attempt to fix distutils on win32
Message-ID: <58e2c1aa.9da0df0a.d2e00.48eb@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90938:76f19ed84438
Date: 2017-04-03 23:41 +0200
http://bitbucket.org/pypy/pypy/changeset/76f19ed84438/

Log:	Attempt to fix distutils on win32

diff --git a/lib-python/3/distutils/ccompiler.py b/lib-python/3/distutils/ccompiler.py
--- a/lib-python/3/distutils/ccompiler.py
+++ b/lib-python/3/distutils/ccompiler.py
@@ -959,7 +959,9 @@
 # is assumed to be in the 'distutils' package.)
 compiler_class = { 'unix':    ('unixccompiler', 'UnixCCompiler',
                                "standard UNIX-style compiler"),
-                   'msvc':    ('_msvccompiler', 'MSVCCompiler',
+                   # PyPy change: On win32 PyPy is translated with the
+                   # "msvc9compiler", force the same here.
+                   'msvc':    ('msvc9compiler', 'MSVCCompiler',
                                "Microsoft Visual C++"),
                    'cygwin':  ('cygwinccompiler', 'CygwinCCompiler',
                                "Cygwin port of GNU C Compiler for Win32"),

From pypy.commits at gmail.com  Mon Apr  3 20:35:14 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Mon, 03 Apr 2017 17:35:14 -0700 (PDT)
Subject: [pypy-commit] pypy default: fix non x86 platforms (cond. call
 vmp_native_enable/disable)
Message-ID: <58e2ea42.ec88df0a.eb7dc.64c3@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r90940:3bf2eb1a9009
Date: 2017-04-03 20:18 -0400
http://bitbucket.org/pypy/pypy/changeset/3bf2eb1a9009/

Log:	fix non x86 platforms (cond. call vmp_native_enable/disable)

diff --git a/rpython/rlib/rvmprof/src/shared/unwind/vmprof_unwind.h b/rpython/rlib/rvmprof/src/shared/unwind/vmprof_unwind.h
--- a/rpython/rlib/rvmprof/src/shared/unwind/vmprof_unwind.h
+++ b/rpython/rlib/rvmprof/src/shared/unwind/vmprof_unwind.h
@@ -15,11 +15,14 @@
 #define UNW_REG_IP 16
 typedef uint64_t unw_word_t;
 typedef int64_t unw_sword_t;
+#else
+// platform not supported
 #endif
 
 
 #define UNW_TDEP_CURSOR_LEN	127
 
+#ifdef VMP_SUPPORTS_NATIVE_PROFILING
 typedef struct unw_cursor
   {
     unw_word_t opaque[UNW_TDEP_CURSOR_LEN];
@@ -42,4 +45,4 @@
 
 // end of copy
 
-
+#endif
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof.h b/rpython/rlib/rvmprof/src/shared/vmprof.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof.h
@@ -35,16 +35,18 @@
 #endif
 #endif
 
-#ifdef VMPROF_UNIX
-#define VMP_SUPPORTS_NATIVE_PROFILING
-#endif
-
 #ifdef __x86_64__
 #define X86_64
 #elif defined(__i386__)
 #define X86_32
 #endif
 
+#ifdef VMPROF_UNIX
+#if defined(X86_64) || defined(X86_32)
+#define VMP_SUPPORTS_NATIVE_PROFILING
+#endif
+#endif
+
 #ifdef RPYTHON_VMPROF
 // only for pypy
 #include "rvmprof.h"
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_common.h b/rpython/rlib/rvmprof/src/shared/vmprof_common.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof_common.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof_common.h
@@ -190,12 +190,16 @@
     if (stack == NULL) {
         stack = get_vmprof_stack();
     }
+#ifdef VMP_SUPPORTS_NATIVE_PROFILING
     enabled = vmp_native_enabled();
     vmp_native_disable();
+#endif
     n = get_stack_trace(stack, result_p, result_length - 2, pc);
+#ifdef VMP_SUPPORTS_NATIVE_PROFILING
     if (enabled) {
         vmp_native_enable();
     }
+#endif
     return (intptr_t)n;
 }
 #endif

From pypy.commits at gmail.com  Mon Apr  3 20:35:16 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Mon, 03 Apr 2017 17:35:16 -0700 (PDT)
Subject: [pypy-commit] pypy default: vmprof linux MUST also resolve the
 native symbol (cpython fix)
Message-ID: <58e2ea44.d01b1c0a.c33e0.f609@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r90941:f9b9c84c9ce7
Date: 2017-04-03 20:26 -0400
http://bitbucket.org/pypy/pypy/changeset/f9b9c84c9ce7/

Log:	vmprof linux MUST also resolve the native symbol (cpython fix)

diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c b/rpython/rlib/rvmprof/src/shared/symboltable.c
--- a/rpython/rlib/rvmprof/src/shared/symboltable.c
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.c
@@ -215,7 +215,7 @@
         name[name_len-1] = 0;
     }
     lookup_vmprof_debug_info(name, info.dli_fbase, srcfile, srcfile_len, lineno);
-#elif defined(RVMPROF_BACKTRACE)
+#elif defined(RVMPROF_BACKTRACE) || defined(VMPROF_LINUX)
     if (bstate == NULL) {
         bstate = backtrace_create_state (NULL, 1, backtrace_error_cb, NULL);
     }

From pypy.commits at gmail.com  Mon Apr  3 20:35:18 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Mon, 03 Apr 2017 17:35:18 -0700 (PDT)
Subject: [pypy-commit] pypy default: merge heads
Message-ID: <58e2ea46.f781df0a.374e.5b42@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r90942:83f4ee0e2106
Date: 2017-04-03 20:32 -0400
http://bitbucket.org/pypy/pypy/changeset/83f4ee0e2106/

Log:	merge heads

diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c b/rpython/rlib/rvmprof/src/shared/symboltable.c
--- a/rpython/rlib/rvmprof/src/shared/symboltable.c
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.c
@@ -215,7 +215,7 @@
         name[name_len-1] = 0;
     }
     lookup_vmprof_debug_info(name, info.dli_fbase, srcfile, srcfile_len, lineno);
-#elif defined(RVMPROF_BACKTRACE)
+#elif defined(RVMPROF_BACKTRACE) || defined(VMPROF_LINUX)
     if (bstate == NULL) {
         bstate = backtrace_create_state (NULL, 1, backtrace_error_cb, NULL);
     }
diff --git a/rpython/rlib/rvmprof/src/shared/unwind/vmprof_unwind.h b/rpython/rlib/rvmprof/src/shared/unwind/vmprof_unwind.h
--- a/rpython/rlib/rvmprof/src/shared/unwind/vmprof_unwind.h
+++ b/rpython/rlib/rvmprof/src/shared/unwind/vmprof_unwind.h
@@ -20,9 +20,9 @@
 #endif
 
 
-#ifdef VMP_SUPPORTS_NATIVE_PROFILING
 #define UNW_TDEP_CURSOR_LEN	127
 
+#ifdef VMP_SUPPORTS_NATIVE_PROFILING
 typedef struct unw_cursor
   {
     unw_word_t opaque[UNW_TDEP_CURSOR_LEN];
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof.h b/rpython/rlib/rvmprof/src/shared/vmprof.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof.h
@@ -47,7 +47,6 @@
 #endif
 #endif
 
-
 #ifdef RPYTHON_VMPROF
 // only for pypy
 #include "rvmprof.h"

From pypy.commits at gmail.com  Tue Apr  4 02:33:01 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Mon, 03 Apr 2017 23:33:01 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: The import library should be called
 python35.lib, and not hardcode python27...
Message-ID: <58e33e1d.c899df0a.c6ef.859d@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90944:4d18a461a973
Date: 2017-04-04 08:32 +0200
http://bitbucket.org/pypy/pypy/changeset/4d18a461a973/

Log:	The import library should be called python35.lib, and not hardcode
	python27...

diff --git a/lib_pypy/cffi/api.py b/lib_pypy/cffi/api.py
--- a/lib_pypy/cffi/api.py
+++ b/lib_pypy/cffi/api.py
@@ -563,7 +563,7 @@
             if sys.platform == "win32":
                 # we need 'libpypy-c.lib'.  Current distributions of
                 # pypy (>= 4.1) contain it as 'libs/python27.lib'.
-                pythonlib = "python27"
+                pythonlib = "python{0[0]}{0[1]}".format(sys.version_info)
                 if hasattr(sys, 'prefix'):
                     ensure('library_dirs', os.path.join(sys.prefix, 'libs'))
             else:
diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -13,6 +13,7 @@
 from pypy import pypydir
 from rpython.rlib import rthread
 from pypy.module.thread import os_thread
+from pypy.module.sys.version import CPYTHON_VERSION
 
 thisdir = py.path.local(__file__).dirpath()
 
@@ -285,7 +286,8 @@
         if sys.platform == 'win32':
             libdir = thisdir.join('..', '..', 'libs')
             libdir.ensure(dir=1)
-            config.translation.libname = str(libdir.join('python27.lib'))
+            pythonlib = "python{0[0]}{0[1]}.lib".format(CPYTHON_VERSION)
+            config.translation.libname = str(libdir.join(pythonlib))
 
         if config.translation.thread:
             config.objspace.usemodules.thread = True

From pypy.commits at gmail.com  Tue Apr  4 02:32:59 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Mon, 03 Apr 2017 23:32:59 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Module init functions return PyObject*,
 on win32 as well
Message-ID: <58e33e1b.f781df0a.374e.9f12@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90943:85278857eb41
Date: 2017-04-04 08:15 +0200
http://bitbucket.org/pypy/pypy/changeset/85278857eb41/

Log:	Module init functions return PyObject*, on win32 as well

diff --git a/pypy/module/cpyext/include/modsupport.h b/pypy/module/cpyext/include/modsupport.h
--- a/pypy/module/cpyext/include/modsupport.h
+++ b/pypy/module/cpyext/include/modsupport.h
@@ -87,9 +87,9 @@
 #ifdef _WIN32
 /* explicitly export since PyAPI_FUNC is usually dllimport */
 #ifdef __cplusplus
-#define PyMODINIT_FUNC extern "C" __declspec(dllexport) void
+#define PyMODINIT_FUNC extern "C" __declspec(dllexport) PyObject*
 #else
-#define PyMODINIT_FUNC __declspec(dllexport) void
+#define PyMODINIT_FUNC __declspec(dllexport) PyObject*
 #endif
 #else
 #ifdef __cplusplus

From pypy.commits at gmail.com  Tue Apr  4 12:03:24 2017
From: pypy.commits at gmail.com (arigo)
Date: Tue, 04 Apr 2017 09:03:24 -0700 (PDT)
Subject: [pypy-commit] pypy default: Don't hard-code the version number in
 the doc
Message-ID: <58e3c3cc.07d11c0a.ba268.fbdf@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90945:d681bf28da20
Date: 2017-04-04 18:02 +0200
http://bitbucket.org/pypy/pypy/changeset/d681bf28da20/

Log:	Don't hard-code the version number in the doc

diff --git a/pypy/doc/install.rst b/pypy/doc/install.rst
--- a/pypy/doc/install.rst
+++ b/pypy/doc/install.rst
@@ -32,10 +32,10 @@
 
 .. code-block:: console
 
-    $ tar xf pypy-2.1.tar.bz2
-    $ ./pypy-2.1/bin/pypy
-    Python 2.7.3 (480845e6b1dd, Jul 31 2013, 11:05:31)
-    [PyPy 2.1.0 with GCC 4.4.3] on linux2
+    $ tar xf pypy-x.y.z.tar.bz2
+    $ ./pypy-x.y.z/bin/pypy
+    Python 2.7.x (xxxxxxxxxxxx, Date, Time)
+    [PyPy x.y.z with GCC x.y.z] on linux2
     Type "help", "copyright", "credits" or "license" for more information.
     And now for something completely different: ``PyPy is an exciting technology
     that lets you to write fast, portable, multi-platform interpreters with less

From pypy.commits at gmail.com  Tue Apr  4 13:37:24 2017
From: pypy.commits at gmail.com (rlamy)
Date: Tue, 04 Apr 2017 10:37:24 -0700 (PDT)
Subject: [pypy-commit] pypy mtest: Use CPython's documented way of running
 its test suite, instead of our hacked script
Message-ID: <58e3d9d4.8c091c0a.f8deb.09cf@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: mtest
Changeset: r90946:d601c5fc81dc
Date: 2017-04-04 18:28 +0100
http://bitbucket.org/pypy/pypy/changeset/d601c5fc81dc/

Log:	Use CPython's documented way of running its test suite, instead of
	our hacked script

diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -597,7 +597,7 @@
                     py.test.skip("%s module not included in %s" % (mod,
                                                                    execpath))
 
-            cmd = "%s %s %s" % (execpath, regrrun, fspath.purebasename)
+            cmd = "%s -m test -v %s" % (execpath, fspath.purebasename)
             # add watchdog for timing out
             cmd = "%s %s %s %s" % (python, watchdog_script, TIMEOUT, cmd)
         else:

From pypy.commits at gmail.com  Tue Apr  4 14:36:17 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Tue, 04 Apr 2017 11:36:17 -0700 (PDT)
Subject: [pypy-commit] pypy default: include link.h also on linux
Message-ID: <58e3e7a1.b686df0a.53915.acb7@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r90947:ea8db5425a1c
Date: 2017-04-04 14:35 -0400
http://bitbucket.org/pypy/pypy/changeset/ea8db5425a1c/

Log:	include link.h also on linux

diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c b/rpython/rlib/rvmprof/src/shared/symboltable.c
--- a/rpython/rlib/rvmprof/src/shared/symboltable.c
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 
 #include <dlfcn.h>
-#ifdef VMPROF_BACKTRACE
+#if defined(VMPROF_BACKTRACE) || defined(VMPROF_LINUX)
 #include <link.h>
 #endif
 

From pypy.commits at gmail.com  Tue Apr  4 14:48:54 2017
From: pypy.commits at gmail.com (arigo)
Date: Tue, 04 Apr 2017 11:48:54 -0700 (PDT)
Subject: [pypy-commit] pypy default: Remove a corner case where lower ==
 MININT/2 or upper = MAXINT/2, 
Message-ID: <58e3ea96.c32f1c0a.3475d.302a@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90948:144118957d4a
Date: 2017-04-04 20:29 +0200
http://bitbucket.org/pypy/pypy/changeset/144118957d4a/

Log:	Remove a corner case where lower == MININT/2 or upper = MAXINT/2,
	which is recorded as if "not too big", but actually not used as "too
	big"

diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -86,12 +86,14 @@
             if preamble_info.is_nonnull():
                 self.make_nonnull(op)
         elif isinstance(preamble_info, intutils.IntBound):
-            if preamble_info.lower > MININT/2 or preamble_info.upper < MAXINT/2:
+            fix_lo = preamble_info.has_lower and preamble_info.lower >= MININT/2
+            fix_up = preamble_info.has_upper and preamble_info.upper <= MAXINT/2
+            if fix_lo or fix_up:
                 intbound = self.getintbound(op)
-                if preamble_info.has_lower and preamble_info.lower > MININT/2:
+                if fix_lo:
                     intbound.has_lower = True
                     intbound.lower = preamble_info.lower
-                if preamble_info.has_upper and preamble_info.upper < MAXINT/2:
+                if fix_up:
                     intbound.has_upper = True
                     intbound.upper = preamble_info.upper
         elif isinstance(preamble_info, info.FloatConstInfo):

From pypy.commits at gmail.com  Tue Apr  4 14:49:00 2017
From: pypy.commits at gmail.com (arigo)
Date: Tue, 04 Apr 2017 11:49:00 -0700 (PDT)
Subject: [pypy-commit] pypy default: Another case where we read .upper
 without checking .has_upper
Message-ID: <58e3ea9c.179d1c0a.74294.30aa@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90951:e691a4f66264
Date: 2017-04-04 20:47 +0200
http://bitbucket.org/pypy/pypy/changeset/e691a4f66264/

Log:	Another case where we read .upper without checking .has_upper

diff --git a/rpython/jit/metainterp/optimizeopt/intbounds.py b/rpython/jit/metainterp/optimizeopt/intbounds.py
--- a/rpython/jit/metainterp/optimizeopt/intbounds.py
+++ b/rpython/jit/metainterp/optimizeopt/intbounds.py
@@ -94,8 +94,11 @@
         if b1.known_ge(IntBound(0, 0)) and \
            b2.known_ge(IntBound(0, 0)):
             r = self.getintbound(op)
-            mostsignificant = b1.upper | b2.upper
-            r.intersect(IntBound(0, next_pow2_m1(mostsignificant)))
+            if b1.has_upper and b2.has_upper:
+                mostsignificant = b1.upper | b2.upper
+                r.intersect(IntBound(0, next_pow2_m1(mostsignificant)))
+            else:
+                r.make_ge(IntBound(0, 0))
 
     optimize_INT_OR = optimize_INT_OR_or_XOR
     optimize_INT_XOR = optimize_INT_OR_or_XOR
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -5643,6 +5643,51 @@
         """
         self.optimize_loop(ops, ops)
 
+    def test_bug_int_or(self):
+        ops = """
+        [p0, p1]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i52 = arraylen_gc(p1, descr=arraydescr)
+        i57 = int_or(i51, i52)
+        i62 = int_eq(i57, 0)
+        guard_false(i62) []
+        """
+        self.optimize_loop(ops, ops)
+
+    def test_int_and_positive(self):
+        ops = """
+        [p0, p1]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i52 = arraylen_gc(p1, descr=arraydescr)
+        i57 = int_and(i51, i52)
+        i62 = int_lt(i57, 0)
+        guard_false(i62) []
+        """
+        expected = """
+        [p0, p1]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i52 = arraylen_gc(p1, descr=arraydescr)
+        i57 = int_and(i51, i52)
+        """
+        self.optimize_loop(ops, expected)
+
+    def test_int_or_positive(self):
+        ops = """
+        [p0, p1]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i52 = arraylen_gc(p1, descr=arraydescr)
+        i57 = int_or(i51, i52)
+        i62 = int_lt(i57, 0)
+        guard_false(i62) []
+        """
+        expected = """
+        [p0, p1]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i52 = arraylen_gc(p1, descr=arraydescr)
+        i57 = int_or(i51, i52)
+        """
+        self.optimize_loop(ops, expected)
+
 
 class TestLLtype(BaseTestOptimizeBasic, LLtypeMixin):
     pass

From pypy.commits at gmail.com  Tue Apr  4 14:48:56 2017
From: pypy.commits at gmail.com (arigo)
Date: Tue, 04 Apr 2017 11:48:56 -0700 (PDT)
Subject: [pypy-commit] pypy default: Corner case, probably not testable,
 if we get a bound that has no lower
Message-ID: <58e3ea98.8bd11c0a.3a02e.2d0f@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90949:d7fc76979470
Date: 2017-04-04 20:32 +0200
http://bitbucket.org/pypy/pypy/changeset/d7fc76979470/

Log:	Corner case, probably not testable, if we get a bound that has no
	lower bound but a greater-than-zero 'lower' value (which should not
	be read). Worst case here is that we'd generate a dummy STRLEN.

diff --git a/rpython/jit/metainterp/optimizeopt/vstring.py b/rpython/jit/metainterp/optimizeopt/vstring.py
--- a/rpython/jit/metainterp/optimizeopt/vstring.py
+++ b/rpython/jit/metainterp/optimizeopt/vstring.py
@@ -122,7 +122,8 @@
 
     def make_guards(self, op, short, optimizer):
         info.AbstractVirtualPtrInfo.make_guards(self, op, short, optimizer)
-        if self.lenbound and self.lenbound.lower >= 1:
+        if (self.lenbound and
+                self.lenbound.has_lower and self.lenbound.lower >= 1):
             if self.mode is mode_string:
                 lenop = ResOperation(rop.STRLEN, [op])
             else:

From pypy.commits at gmail.com  Tue Apr  4 14:48:58 2017
From: pypy.commits at gmail.com (arigo)
Date: Tue, 04 Apr 2017 11:48:58 -0700 (PDT)
Subject: [pypy-commit] pypy default: Issue #2528: test and fix for int_and()
 propagating wrong bounds
Message-ID: <58e3ea9a.55061c0a.4b93.2748@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90950:42ab42428685
Date: 2017-04-04 20:37 +0200
http://bitbucket.org/pypy/pypy/changeset/42ab42428685/

Log:	Issue #2528: test and fix for int_and() propagating wrong bounds

diff --git a/rpython/jit/metainterp/optimizeopt/rewrite.py b/rpython/jit/metainterp/optimizeopt/rewrite.py
--- a/rpython/jit/metainterp/optimizeopt/rewrite.py
+++ b/rpython/jit/metainterp/optimizeopt/rewrite.py
@@ -104,14 +104,14 @@
             return
         elif b2.is_constant():
             val = b2.lower
-            if val == -1 or b1.lower >= 0 \
-                and b1.upper <= val & ~(val + 1):
+            if val == -1 or (b1.bounded() and b1.lower >= 0
+                                          and b1.upper <= val & ~(val + 1)):
                 self.make_equal_to(op, op.getarg(0))
                 return
         elif b1.is_constant():
             val = b1.lower
-            if val == -1 or b2.lower >= 0 \
-                and b2.upper <= val & ~(val + 1):
+            if val == -1 or (b2.bounded() and b2.lower >= 0
+                                          and b2.upper <= val & ~(val + 1)):
                 self.make_equal_to(op, op.getarg(1))
                 return
 
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -5623,6 +5623,26 @@
         """
         self.optimize_loop(ops, expected)
 
+    def test_bug_int_and_1(self):
+        ops = """
+        [p0]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i57 = int_and(i51, 1)
+        i62 = int_eq(i57, 0)
+        guard_false(i62) []
+        """
+        self.optimize_loop(ops, ops)
+
+    def test_bug_int_and_2(self):
+        ops = """
+        [p0]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i57 = int_and(4, i51)
+        i62 = int_eq(i57, 0)
+        guard_false(i62) []
+        """
+        self.optimize_loop(ops, ops)
+
 
 class TestLLtype(BaseTestOptimizeBasic, LLtypeMixin):
     pass

From pypy.commits at gmail.com  Tue Apr  4 14:49:02 2017
From: pypy.commits at gmail.com (arigo)
Date: Tue, 04 Apr 2017 11:49:02 -0700 (PDT)
Subject: [pypy-commit] pypy default: merge heads
Message-ID: <58e3ea9e.429d1c0a.1b686.37f5@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90952:d130be27596c
Date: 2017-04-04 20:47 +0200
http://bitbucket.org/pypy/pypy/changeset/d130be27596c/

Log:	merge heads

diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c b/rpython/rlib/rvmprof/src/shared/symboltable.c
--- a/rpython/rlib/rvmprof/src/shared/symboltable.c
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 
 #include <dlfcn.h>
-#ifdef VMPROF_BACKTRACE
+#if defined(VMPROF_BACKTRACE) || defined(VMPROF_LINUX)
 #include <link.h>
 #endif
 

From pypy.commits at gmail.com  Tue Apr  4 15:20:33 2017
From: pypy.commits at gmail.com (mattip)
Date: Tue, 04 Apr 2017 12:20:33 -0700 (PDT)
Subject: [pypy-commit] buildbot default: disable nightly runs of
 PYPYBUILDBOT, NUMPY_64, NUMPY_WIN, move PYPYBUILDBOT to cobra
Message-ID: <58e3f201.429d1c0a.1b686.4374@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r1022:7839f69fbbc6
Date: 2017-04-04 22:20 +0300
http://bitbucket.org/pypy/buildbot/changeset/7839f69fbbc6/

Log:	disable nightly runs of PYPYBUILDBOT, NUMPY_64, NUMPY_WIN, move
	PYPYBUILDBOT to cobra

diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -297,7 +297,7 @@
             JITFREEBSD964,             # on tavendo
             JITMACOSX64,               # on xerxes
             # buildbot selftest
-            PYPYBUILDBOT               # on bencher4
+            #PYPYBUILDBOT               # on cobra
             ], branch='default', hour=0, minute=0),
 
         Nightly("nightly-1-00", [
@@ -308,11 +308,11 @@
         ], branch=None, hour=5, minute=0),
 
         Triggerable("NUMPY64_scheduler", [
-            NUMPY_64,                  # on tannit64, uses 1 core, takes about 5min.
+            #NUMPY_64,                  # on tannit64, uses 1 core, takes about 5min.
         ]),
 
         Triggerable("NUMPYWIN_scheduler", [
-            NUMPY_WIN,                  # on allegro_win32, SalsaSalsa
+            #NUMPY_WIN,                  # on allegro_win32, SalsaSalsa
         ]),
 
         #Nightly("nightly-3-01-py3.5", [LINUX64, JITLINUX64,],
@@ -538,7 +538,7 @@
                    'category': 'numpy',
                   },
                   {'name': PYPYBUILDBOT,
-                   'slavenames': ['bencher4'],
+                   'slavenames': ['cobra'],
                    'builddir': PYPYBUILDBOT,
                    'factory': pypybuilds.PyPyBuildbotTestFactory(),
                    'category': 'buildbot',

From pypy.commits at gmail.com  Tue Apr  4 15:47:18 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Tue, 04 Apr 2017 12:47:18 -0700 (PDT)
Subject: [pypy-commit] pypy default: copy over new backtrace library and
 remove generated sources
Message-ID: <58e3f846.d01b1c0a.c33e0.4220@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r90954:8bdfec6268dc
Date: 2017-04-04 15:14 -0400
http://bitbucket.org/pypy/pypy/changeset/8bdfec6268dc/

Log:	copy over new backtrace library and remove generated sources

diff too long, truncating to 2000 out of 2055 lines

diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -22,19 +22,17 @@
     SHARED.join('symboltable.c')
 ]
 if sys.platform.startswith('linux'):
-    if sys.maxint > 2**32:     # doesn't seem to compile on 32-bit Linux
-        separate_module_files += [
-           BACKTRACE.join('backtrace.c'),
-           BACKTRACE.join('state.c'),
-           BACKTRACE.join('elf.c'),
-           BACKTRACE.join('dwarf.c'),
-           BACKTRACE.join('fileline.c'),
-           BACKTRACE.join('mmap.c'),
-           BACKTRACE.join('mmapio.c'),
-           BACKTRACE.join('posix.c'),
-           BACKTRACE.join('sort.c'),
-        ]
-        compile_extra += ['-DVMPROF_BACKTRACE']
+    separate_module_files += [
+       BACKTRACE.join('backtrace.c'),
+       BACKTRACE.join('state.c'),
+       BACKTRACE.join('elf.c'),
+       BACKTRACE.join('dwarf.c'),
+       BACKTRACE.join('fileline.c'),
+       BACKTRACE.join('mmap.c'),
+       BACKTRACE.join('mmapio.c'),
+       BACKTRACE.join('posix.c'),
+       BACKTRACE.join('sort.c'),
+    ]
     _libs = ['dl']
     compile_extra += ['-DVMPROF_UNIX']
     compile_extra += ['-DVMPROF_LINUX']
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/ChangeLog b/rpython/rlib/rvmprof/src/shared/libbacktrace/ChangeLog
--- a/rpython/rlib/rvmprof/src/shared/libbacktrace/ChangeLog
+++ b/rpython/rlib/rvmprof/src/shared/libbacktrace/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-08  Sam Thursfield  <sam.thursfield at codethink.co.uk>
+
+	* btest.c (test5): Replace #ifdef guard with 'unused' attribute
+	to fix compile warning when BACKTRACE_SUPPORTED isn't defined.
+
 2017-01-01  Jakub Jelinek  <jakub at redhat.com>
 
 	Update copyright years.
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/ansidecl.h b/rpython/rlib/rvmprof/src/shared/libbacktrace/ansidecl.h
deleted file mode 100644
--- a/rpython/rlib/rvmprof/src/shared/libbacktrace/ansidecl.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/* ANSI and traditional C compatability macros
-   Copyright (C) 1991-2015 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-/* ANSI and traditional C compatibility macros
-
-   ANSI C is assumed if __STDC__ is #defined.
-
-   Macro		ANSI C definition	Traditional C definition
-   -----		---- - ----------	----------- - ----------
-   PTR			`void *'		`char *'
-   const		not defined		`'
-   volatile		not defined		`'
-   signed		not defined		`'
-
-   For ease of writing code which uses GCC extensions but needs to be
-   portable to other compilers, we provide the GCC_VERSION macro that
-   simplifies testing __GNUC__ and __GNUC_MINOR__ together, and various
-   wrappers around __attribute__.  Also, __extension__ will be #defined
-   to nothing if it doesn't work.  See below.  */
-
-#ifndef	_ANSIDECL_H
-#define _ANSIDECL_H	1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Every source file includes this file,
-   so they will all get the switch for lint.  */
-/* LINTLIBRARY */
-
-/* Using MACRO(x,y) in cpp #if conditionals does not work with some
-   older preprocessors.  Thus we can't define something like this:
-
-#define HAVE_GCC_VERSION(MAJOR, MINOR) \
-  (__GNUC__ > (MAJOR) || (__GNUC__ == (MAJOR) && __GNUC_MINOR__ >= (MINOR)))
-
-and then test "#if HAVE_GCC_VERSION(2,7)".
-
-So instead we use the macro below and test it against specific values.  */
-
-/* This macro simplifies testing whether we are using gcc, and if it
-   is of a particular minimum version. (Both major & minor numbers are
-   significant.)  This macro will evaluate to 0 if we are not using
-   gcc at all.  */
-#ifndef GCC_VERSION
-#define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
-#endif /* GCC_VERSION */
-
-#if defined (__STDC__) || defined(__cplusplus) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(_WIN32)
-/* All known AIX compilers implement these things (but don't always
-   define __STDC__).  The RISC/OS MIPS compiler defines these things
-   in SVR4 mode, but does not define __STDC__.  */
-/* eraxxon at alumni.rice.edu: The Compaq C++ compiler, unlike many other
-   C++ compilers, does not define __STDC__, though it acts as if this
-   was so. (Verified versions: 5.7, 6.2, 6.3, 6.5) */
-
-#define PTR		void *
-
-#undef const
-#undef volatile
-#undef signed
-
-/* inline requires special treatment; it's in C99, and GCC >=2.7 supports
-   it too, but it's not in C89.  */
-#undef inline
-#if __STDC_VERSION__ >= 199901L || defined(__cplusplus) || (defined(__SUNPRO_C) && defined(__C99FEATURES__))
-/* it's a keyword */
-#else
-# if GCC_VERSION >= 2007
-#  define inline __inline__   /* __inline__ prevents -pedantic warnings */
-# else
-#  define inline  /* nothing */
-# endif
-#endif
-
-#else	/* Not ANSI C.  */
-
-#define PTR		char *
-
-/* some systems define these in header files for non-ansi mode */
-#undef const
-#undef volatile
-#undef signed
-#undef inline
-#define const
-#define volatile
-#define signed
-#define inline
-
-#endif	/* ANSI C.  */
-
-/* Define macros for some gcc attributes.  This permits us to use the
-   macros freely, and know that they will come into play for the
-   version of gcc in which they are supported.  */
-
-#if (GCC_VERSION < 2007)
-# define __attribute__(x)
-#endif
-
-/* Attribute __malloc__ on functions was valid as of gcc 2.96. */
-#ifndef ATTRIBUTE_MALLOC
-# if (GCC_VERSION >= 2096)
-#  define ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
-# else
-#  define ATTRIBUTE_MALLOC
-# endif /* GNUC >= 2.96 */
-#endif /* ATTRIBUTE_MALLOC */
-
-/* Attributes on labels were valid as of gcc 2.93 and g++ 4.5.  For
-   g++ an attribute on a label must be followed by a semicolon.  */
-#ifndef ATTRIBUTE_UNUSED_LABEL
-# ifndef __cplusplus
-#  if GCC_VERSION >= 2093
-#   define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED
-#  else
-#   define ATTRIBUTE_UNUSED_LABEL
-#  endif
-# else
-#  if GCC_VERSION >= 4005
-#   define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED ;
-#  else
-#   define ATTRIBUTE_UNUSED_LABEL
-#  endif
-# endif
-#endif
-
-/* Similarly to ARG_UNUSED below.  Prior to GCC 3.4, the C++ frontend
-   couldn't parse attributes placed after the identifier name, and now
-   the entire compiler is built with C++.  */
-#ifndef ATTRIBUTE_UNUSED
-#if GCC_VERSION >= 3004
-#  define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-#else
-#define ATTRIBUTE_UNUSED
-#endif
-#endif /* ATTRIBUTE_UNUSED */
-
-/* Before GCC 3.4, the C++ frontend couldn't parse attributes placed after the
-   identifier name.  */
-#if ! defined(__cplusplus) || (GCC_VERSION >= 3004)
-# define ARG_UNUSED(NAME) NAME ATTRIBUTE_UNUSED
-#else /* !__cplusplus || GNUC >= 3.4 */
-# define ARG_UNUSED(NAME) NAME
-#endif /* !__cplusplus || GNUC >= 3.4 */
-
-#ifndef ATTRIBUTE_NORETURN
-#define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
-#endif /* ATTRIBUTE_NORETURN */
-
-/* Attribute `nonnull' was valid as of gcc 3.3.  */
-#ifndef ATTRIBUTE_NONNULL
-# if (GCC_VERSION >= 3003)
-#  define ATTRIBUTE_NONNULL(m) __attribute__ ((__nonnull__ (m)))
-# else
-#  define ATTRIBUTE_NONNULL(m)
-# endif /* GNUC >= 3.3 */
-#endif /* ATTRIBUTE_NONNULL */
-
-/* Attribute `returns_nonnull' was valid as of gcc 4.9.  */
-#ifndef ATTRIBUTE_RETURNS_NONNULL
-# if (GCC_VERSION >= 4009)
-#  define ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__))
-# else
-#  define ATTRIBUTE_RETURNS_NONNULL
-# endif /* GNUC >= 4.9 */
-#endif /* ATTRIBUTE_RETURNS_NONNULL */
-
-/* Attribute `pure' was valid as of gcc 3.0.  */
-#ifndef ATTRIBUTE_PURE
-# if (GCC_VERSION >= 3000)
-#  define ATTRIBUTE_PURE __attribute__ ((__pure__))
-# else
-#  define ATTRIBUTE_PURE
-# endif /* GNUC >= 3.0 */
-#endif /* ATTRIBUTE_PURE */
-
-/* Use ATTRIBUTE_PRINTF when the format specifier must not be NULL.
-   This was the case for the `printf' format attribute by itself
-   before GCC 3.3, but as of 3.3 we need to add the `nonnull'
-   attribute to retain this behavior.  */
-#ifndef ATTRIBUTE_PRINTF
-#define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n))) ATTRIBUTE_NONNULL(m)
-#define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
-#define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
-#define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
-#define ATTRIBUTE_PRINTF_4 ATTRIBUTE_PRINTF(4, 5)
-#define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6)
-#endif /* ATTRIBUTE_PRINTF */
-
-/* Use ATTRIBUTE_FPTR_PRINTF when the format attribute is to be set on
-   a function pointer.  Format attributes were allowed on function
-   pointers as of gcc 3.1.  */
-#ifndef ATTRIBUTE_FPTR_PRINTF
-# if (GCC_VERSION >= 3001)
-#  define ATTRIBUTE_FPTR_PRINTF(m, n) ATTRIBUTE_PRINTF(m, n)
-# else
-#  define ATTRIBUTE_FPTR_PRINTF(m, n)
-# endif /* GNUC >= 3.1 */
-# define ATTRIBUTE_FPTR_PRINTF_1 ATTRIBUTE_FPTR_PRINTF(1, 2)
-# define ATTRIBUTE_FPTR_PRINTF_2 ATTRIBUTE_FPTR_PRINTF(2, 3)
-# define ATTRIBUTE_FPTR_PRINTF_3 ATTRIBUTE_FPTR_PRINTF(3, 4)
-# define ATTRIBUTE_FPTR_PRINTF_4 ATTRIBUTE_FPTR_PRINTF(4, 5)
-# define ATTRIBUTE_FPTR_PRINTF_5 ATTRIBUTE_FPTR_PRINTF(5, 6)
-#endif /* ATTRIBUTE_FPTR_PRINTF */
-
-/* Use ATTRIBUTE_NULL_PRINTF when the format specifier may be NULL.  A
-   NULL format specifier was allowed as of gcc 3.3.  */
-#ifndef ATTRIBUTE_NULL_PRINTF
-# if (GCC_VERSION >= 3003)
-#  define ATTRIBUTE_NULL_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
-# else
-#  define ATTRIBUTE_NULL_PRINTF(m, n)
-# endif /* GNUC >= 3.3 */
-# define ATTRIBUTE_NULL_PRINTF_1 ATTRIBUTE_NULL_PRINTF(1, 2)
-# define ATTRIBUTE_NULL_PRINTF_2 ATTRIBUTE_NULL_PRINTF(2, 3)
-# define ATTRIBUTE_NULL_PRINTF_3 ATTRIBUTE_NULL_PRINTF(3, 4)
-# define ATTRIBUTE_NULL_PRINTF_4 ATTRIBUTE_NULL_PRINTF(4, 5)
-# define ATTRIBUTE_NULL_PRINTF_5 ATTRIBUTE_NULL_PRINTF(5, 6)
-#endif /* ATTRIBUTE_NULL_PRINTF */
-
-/* Attribute `sentinel' was valid as of gcc 3.5.  */
-#ifndef ATTRIBUTE_SENTINEL
-# if (GCC_VERSION >= 3005)
-#  define ATTRIBUTE_SENTINEL __attribute__ ((__sentinel__))
-# else
-#  define ATTRIBUTE_SENTINEL
-# endif /* GNUC >= 3.5 */
-#endif /* ATTRIBUTE_SENTINEL */
-
-
-#ifndef ATTRIBUTE_ALIGNED_ALIGNOF
-# if (GCC_VERSION >= 3000)
-#  define ATTRIBUTE_ALIGNED_ALIGNOF(m) __attribute__ ((__aligned__ (__alignof__ (m))))
-# else
-#  define ATTRIBUTE_ALIGNED_ALIGNOF(m)
-# endif /* GNUC >= 3.0 */
-#endif /* ATTRIBUTE_ALIGNED_ALIGNOF */
-
-/* Useful for structures whose layout must much some binary specification
-   regardless of the alignment and padding qualities of the compiler.  */
-#ifndef ATTRIBUTE_PACKED
-# define ATTRIBUTE_PACKED __attribute__ ((packed))
-#endif
-
-/* Attribute `hot' and `cold' was valid as of gcc 4.3.  */
-#ifndef ATTRIBUTE_COLD
-# if (GCC_VERSION >= 4003)
-#  define ATTRIBUTE_COLD __attribute__ ((__cold__))
-# else
-#  define ATTRIBUTE_COLD
-# endif /* GNUC >= 4.3 */
-#endif /* ATTRIBUTE_COLD */
-#ifndef ATTRIBUTE_HOT
-# if (GCC_VERSION >= 4003)
-#  define ATTRIBUTE_HOT __attribute__ ((__hot__))
-# else
-#  define ATTRIBUTE_HOT
-# endif /* GNUC >= 4.3 */
-#endif /* ATTRIBUTE_HOT */
-
-/* Attribute 'no_sanitize_undefined' was valid as of gcc 4.9.  */
-#ifndef ATTRIBUTE_NO_SANITIZE_UNDEFINED
-# if (GCC_VERSION >= 4009)
-#  define ATTRIBUTE_NO_SANITIZE_UNDEFINED __attribute__ ((no_sanitize_undefined))
-# else
-#  define ATTRIBUTE_NO_SANITIZE_UNDEFINED
-# endif /* GNUC >= 4.9 */
-#endif /* ATTRIBUTE_NO_SANITIZE_UNDEFINED */
-
-/* We use __extension__ in some places to suppress -pedantic warnings
-   about GCC extensions.  This feature didn't work properly before
-   gcc 2.8.  */
-#if GCC_VERSION < 2008
-#define __extension__
-#endif
-
-/* This is used to declare a const variable which should be visible
-   outside of the current compilation unit.  Use it as
-     EXPORTED_CONST int i = 1;
-   This is because the semantics of const are different in C and C++.
-   "extern const" is permitted in C but it looks strange, and gcc
-   warns about it when -Wc++-compat is not used.  */
-#ifdef __cplusplus
-#define EXPORTED_CONST extern const
-#else
-#define EXPORTED_CONST const
-#endif
-
-/* Be conservative and only use enum bitfields with C++ or GCC.
-   FIXME: provide a complete autoconf test for buggy enum bitfields.  */
-
-#ifdef __cplusplus
-#define ENUM_BITFIELD(TYPE) enum TYPE
-#elif (GCC_VERSION > 2000)
-#define ENUM_BITFIELD(TYPE) __extension__ enum TYPE
-#else
-#define ENUM_BITFIELD(TYPE) unsigned int
-#endif
-
-/* C++11 adds the ability to add "override" after an implementation of a
-   virtual function in a subclass, to:
-     (A) document that this is an override of a virtual function
-     (B) allow the compiler to issue a warning if it isn't (e.g. a mismatch
-         of the type signature).
-
-   Similarly, it allows us to add a "final" to indicate that no subclass
-   may subsequently override the vfunc.
-
-   Provide OVERRIDE and FINAL as macros, allowing us to get these benefits
-   when compiling with C++11 support, but without requiring C++11.
-
-   For gcc, use "-std=c++11" to enable C++11 support; gcc 6 onwards enables
-   this by default (actually GNU++14).  */
-
-#if __cplusplus >= 201103
-/* C++11 claims to be available: use it.  final/override were only
-   implemented in 4.7, though.  */
-# if GCC_VERSION < 4007
-#  define OVERRIDE
-#  define FINAL
-# else
-#  define OVERRIDE override
-#  define FINAL final
-# endif
-#elif GCC_VERSION >= 4007
-/* G++ 4.7 supports __final in C++98.  */
-# define OVERRIDE
-# define FINAL __final
-#else
-/* No C++11 support; leave the macros empty: */
-# define OVERRIDE
-# define FINAL
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* ansidecl.h	*/
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/btest.c b/rpython/rlib/rvmprof/src/shared/libbacktrace/btest.c
--- a/rpython/rlib/rvmprof/src/shared/libbacktrace/btest.c
+++ b/rpython/rlib/rvmprof/src/shared/libbacktrace/btest.c
@@ -616,7 +616,7 @@
   return failures;
 }
 
-#if BACKTRACE_SUPPORTS_DATA
+static int test5 (void) __attribute__ ((unused));
 
 int global = 1;
 
@@ -686,8 +686,6 @@
   return failures;
 }
 
-#endif /* BACKTRACE_SUPPORTS_DATA  */
-
 static void
 error_callback_create (void *data ATTRIBUTE_UNUSED, const char *msg,
 		       int errnum)
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/dwarf2.def b/rpython/rlib/rvmprof/src/shared/libbacktrace/dwarf2.def
deleted file mode 100644
--- a/rpython/rlib/rvmprof/src/shared/libbacktrace/dwarf2.def
+++ /dev/null
@@ -1,773 +0,0 @@
-/* -*- c -*-
-   Declarations and definitions of codes relating to the DWARF2 and
-   DWARF3 symbolic debugging information formats.
-   Copyright (C) 1992-2015 Free Software Foundation, Inc.
-
-   Written by Gary Funck (gary at intrepid.com) The Ada Joint Program
-   Office (AJPO), Florida State University and Silicon Graphics Inc.
-   provided support for this effort -- June 21, 1995.
-
-   Derived from the DWARF 1 implementation written by Ron Guilmette
-   (rfg at netcom.com), November 1990.
-
-   This file is part of GCC.
-
-   GCC is free software; you can redistribute it and/or modify it under
-   the terms of the GNU General Public License as published by the Free
-   Software Foundation; either version 3, or (at your option) any later
-   version.
-
-   GCC is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-   License for more details.
-
-   Under Section 7 of GPL version 3, you are granted additional
-   permissions described in the GCC Runtime Library Exception, version
-   3.1, as published by the Free Software Foundation.
-
-   You should have received a copy of the GNU General Public License and
-   a copy of the GCC Runtime Library Exception along with this program;
-   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* This file is derived from the DWARF specification (a public document)
-   Revision 2.0.0 (July 27, 1993) developed by the UNIX International
-   Programming Languages Special Interest Group (UI/PLSIG) and distributed
-   by UNIX International.  Copies of this specification are available from
-   UNIX International, 20 Waterview Boulevard, Parsippany, NJ, 07054.
-
-   This file also now contains definitions from the DWARF 3 specification
-   published Dec 20, 2005, available from: http://dwarf.freestandards.org.
-
-   This file also now contains definitions from the DWARF 4
-   specification, available from: http://dwarfstd.org/ */
-
-/* This file declares various DWARF-related constants using a set of
-   macros which can be redefined by the including file.
-   
-   The macros are in sections.  Each section corresponds to a single
-   set of DWARF constants and has a corresponding key.  The key is
-   used in all the macro names.
-   
-   The sections are TAG (for DW_TAG_ constants), FORM (DW_FORM_), AT
-   (DW_AT_), OP (DW_OP_), ATE (DW_ATE_), and CFA (DW_CFA_).
-   
-   Using TAG as an example, the following macros may be used for each
-   key:
-   
-   DW_FIRST_TAG(name, value) - Introduce the first DW_TAG constant.
-   
-   DW_TAG(name, value) - Define a subsequent constant.
-   
-   DW_TAG_DUP(name, value) - Define a subsequent constant whose value
-   is a duplicate of some other constant.  Not all keys use the _DUP
-   macro form.  If more than one name shares a value, then the base
-   (DW_TAG) form will be the preferred name and DW_TAG_DUP will hold
-   any alternate names.
-   
-   DW_END_TAG - Invoked at the end of the DW_TAG constants.  */
-
-DW_FIRST_TAG (DW_TAG_padding, 0x00)
-DW_TAG (DW_TAG_array_type, 0x01)
-DW_TAG (DW_TAG_class_type, 0x02)
-DW_TAG (DW_TAG_entry_point, 0x03)
-DW_TAG (DW_TAG_enumeration_type, 0x04)
-DW_TAG (DW_TAG_formal_parameter, 0x05)
-DW_TAG (DW_TAG_imported_declaration, 0x08)
-DW_TAG (DW_TAG_label, 0x0a)
-DW_TAG (DW_TAG_lexical_block, 0x0b)
-DW_TAG (DW_TAG_member, 0x0d)
-DW_TAG (DW_TAG_pointer_type, 0x0f)
-DW_TAG (DW_TAG_reference_type, 0x10)
-DW_TAG (DW_TAG_compile_unit, 0x11)
-DW_TAG (DW_TAG_string_type, 0x12)
-DW_TAG (DW_TAG_structure_type, 0x13)
-DW_TAG (DW_TAG_subroutine_type, 0x15)
-DW_TAG (DW_TAG_typedef, 0x16)
-DW_TAG (DW_TAG_union_type, 0x17)
-DW_TAG (DW_TAG_unspecified_parameters, 0x18)
-DW_TAG (DW_TAG_variant, 0x19)
-DW_TAG (DW_TAG_common_block, 0x1a)
-DW_TAG (DW_TAG_common_inclusion, 0x1b)
-DW_TAG (DW_TAG_inheritance, 0x1c)
-DW_TAG (DW_TAG_inlined_subroutine, 0x1d)
-DW_TAG (DW_TAG_module, 0x1e)
-DW_TAG (DW_TAG_ptr_to_member_type, 0x1f)
-DW_TAG (DW_TAG_set_type, 0x20)
-DW_TAG (DW_TAG_subrange_type, 0x21)
-DW_TAG (DW_TAG_with_stmt, 0x22)
-DW_TAG (DW_TAG_access_declaration, 0x23)
-DW_TAG (DW_TAG_base_type, 0x24)
-DW_TAG (DW_TAG_catch_block, 0x25)
-DW_TAG (DW_TAG_const_type, 0x26)
-DW_TAG (DW_TAG_constant, 0x27)
-DW_TAG (DW_TAG_enumerator, 0x28)
-DW_TAG (DW_TAG_file_type, 0x29)
-DW_TAG (DW_TAG_friend, 0x2a)
-DW_TAG (DW_TAG_namelist, 0x2b)
-DW_TAG (DW_TAG_namelist_item, 0x2c)
-DW_TAG (DW_TAG_packed_type, 0x2d)
-DW_TAG (DW_TAG_subprogram, 0x2e)
-DW_TAG (DW_TAG_template_type_param, 0x2f)
-DW_TAG (DW_TAG_template_value_param, 0x30)
-DW_TAG (DW_TAG_thrown_type, 0x31)
-DW_TAG (DW_TAG_try_block, 0x32)
-DW_TAG (DW_TAG_variant_part, 0x33)
-DW_TAG (DW_TAG_variable, 0x34)
-DW_TAG (DW_TAG_volatile_type, 0x35)
-/* DWARF 3.  */
-DW_TAG (DW_TAG_dwarf_procedure, 0x36)
-DW_TAG (DW_TAG_restrict_type, 0x37)
-DW_TAG (DW_TAG_interface_type, 0x38)
-DW_TAG (DW_TAG_namespace, 0x39)
-DW_TAG (DW_TAG_imported_module, 0x3a)
-DW_TAG (DW_TAG_unspecified_type, 0x3b)
-DW_TAG (DW_TAG_partial_unit, 0x3c)
-DW_TAG (DW_TAG_imported_unit, 0x3d)
-DW_TAG (DW_TAG_condition, 0x3f)
-DW_TAG (DW_TAG_shared_type, 0x40)
-/* DWARF 4.  */
-DW_TAG (DW_TAG_type_unit, 0x41)
-DW_TAG (DW_TAG_rvalue_reference_type, 0x42)
-DW_TAG (DW_TAG_template_alias, 0x43)
-/* DWARF 5.  */
-DW_TAG (DW_TAG_coarray_type, 0x44)
-DW_TAG (DW_TAG_generic_subrange, 0x45)
-DW_TAG (DW_TAG_dynamic_type, 0x46)
-DW_TAG (DW_TAG_atomic_type, 0x47)
-DW_TAG (DW_TAG_call_site, 0x48)
-DW_TAG (DW_TAG_call_site_parameter, 0x49)
-DW_TAG (DW_TAG_skeleton_unit, 0x4a)
-DW_TAG (DW_TAG_immutable_type, 0x4b)
-
-DW_TAG_DUP (DW_TAG_lo_user, 0x4080)
-DW_TAG_DUP (DW_TAG_hi_user, 0xffff)
-
-/* SGI/MIPS Extensions.  */
-DW_TAG (DW_TAG_MIPS_loop, 0x4081)
-
-/* HP extensions.  See: ftp://ftp.hp.com/pub/lang/tools/WDB/wdb-4.0.tar.gz .  */
-DW_TAG (DW_TAG_HP_array_descriptor, 0x4090)
-DW_TAG (DW_TAG_HP_Bliss_field, 0x4091)
-DW_TAG (DW_TAG_HP_Bliss_field_set, 0x4092)
-
-/* GNU extensions.  */
-DW_TAG (DW_TAG_format_label, 0x4101)	/* For FORTRAN 77 and Fortran 90.  */
-DW_TAG (DW_TAG_function_template, 0x4102)	/* For C++.  */
-DW_TAG (DW_TAG_class_template, 0x4103)	/* For C++.  */
-DW_TAG (DW_TAG_GNU_BINCL, 0x4104)
-DW_TAG (DW_TAG_GNU_EINCL, 0x4105)
-/* Template template parameter.
-   See http://gcc.gnu.org/wiki/TemplateParmsDwarf .  */
-DW_TAG (DW_TAG_GNU_template_template_param, 0x4106)
-
-/* Template parameter pack extension, specified at
-   http://wiki.dwarfstd.org/index.php?title=C%2B%2B0x:_Variadic_templates
-   The values of these two TAGS are in the DW_TAG_GNU_* space until the tags
-   are properly part of DWARF 5.  */
-DW_TAG (DW_TAG_GNU_template_parameter_pack, 0x4107)
-DW_TAG (DW_TAG_GNU_formal_parameter_pack, 0x4108)
-/* The GNU call site extension, specified at
-   http://www.dwarfstd.org/ShowIssue.php?issue=100909.2&type=open .
-   The values of these two TAGS are in the DW_TAG_GNU_* space until the tags
-   are properly part of DWARF 5.  */
-DW_TAG (DW_TAG_GNU_call_site, 0x4109)
-DW_TAG (DW_TAG_GNU_call_site_parameter, 0x410a)
-/* Extensions for UPC.  See: http://dwarfstd.org/doc/DWARF4.pdf.  */
-DW_TAG (DW_TAG_upc_shared_type, 0x8765)
-DW_TAG (DW_TAG_upc_strict_type, 0x8766)
-DW_TAG (DW_TAG_upc_relaxed_type, 0x8767)
-/* PGI (STMicroelectronics) extensions.  No documentation available.  */
-DW_TAG (DW_TAG_PGI_kanji_type, 0xA000)
-DW_TAG (DW_TAG_PGI_interface_block, 0xA020)
-DW_END_TAG
-
-DW_FIRST_FORM (DW_FORM_addr, 0x01)
-DW_FORM (DW_FORM_block2, 0x03)
-DW_FORM (DW_FORM_block4, 0x04)
-DW_FORM (DW_FORM_data2, 0x05)
-DW_FORM (DW_FORM_data4, 0x06)
-DW_FORM (DW_FORM_data8, 0x07)
-DW_FORM (DW_FORM_string, 0x08)
-DW_FORM (DW_FORM_block, 0x09)
-DW_FORM (DW_FORM_block1, 0x0a)
-DW_FORM (DW_FORM_data1, 0x0b)
-DW_FORM (DW_FORM_flag, 0x0c)
-DW_FORM (DW_FORM_sdata, 0x0d)
-DW_FORM (DW_FORM_strp, 0x0e)
-DW_FORM (DW_FORM_udata, 0x0f)
-DW_FORM (DW_FORM_ref_addr, 0x10)
-DW_FORM (DW_FORM_ref1, 0x11)
-DW_FORM (DW_FORM_ref2, 0x12)
-DW_FORM (DW_FORM_ref4, 0x13)
-DW_FORM (DW_FORM_ref8, 0x14)
-DW_FORM (DW_FORM_ref_udata, 0x15)
-DW_FORM (DW_FORM_indirect, 0x16)
-/* DWARF 4.  */
-DW_FORM (DW_FORM_sec_offset, 0x17)
-DW_FORM (DW_FORM_exprloc, 0x18)
-DW_FORM (DW_FORM_flag_present, 0x19)
-DW_FORM (DW_FORM_ref_sig8, 0x20)
-/* DWARF 5.  */
-DW_FORM (DW_FORM_strx, 0x1a)
-DW_FORM (DW_FORM_addrx, 0x1b)
-DW_FORM (DW_FORM_ref_sup, 0x1c)
-DW_FORM (DW_FORM_strp_sup, 0x1d)
-DW_FORM (DW_FORM_data16, 0x1e)
-DW_FORM (DW_FORM_line_strp, 0x1f)
-DW_FORM (DW_FORM_implicit_const, 0x21)
-DW_FORM (DW_FORM_loclistx, 0x22)
-DW_FORM (DW_FORM_rnglistx, 0x23)
-/* Extensions for Fission.  See http://gcc.gnu.org/wiki/DebugFission.  */
-DW_FORM (DW_FORM_GNU_addr_index, 0x1f01)
-DW_FORM (DW_FORM_GNU_str_index, 0x1f02)
-/* Extensions for DWZ multifile.
-   See http://www.dwarfstd.org/ShowIssue.php?issue=120604.1&type=open .  */
-DW_FORM (DW_FORM_GNU_ref_alt, 0x1f20)
-DW_FORM (DW_FORM_GNU_strp_alt, 0x1f21)
-DW_END_FORM
-
-DW_FIRST_AT (DW_AT_sibling, 0x01)
-DW_AT (DW_AT_location, 0x02)
-DW_AT (DW_AT_name, 0x03)
-DW_AT (DW_AT_ordering, 0x09)
-DW_AT (DW_AT_subscr_data, 0x0a)
-DW_AT (DW_AT_byte_size, 0x0b)
-DW_AT (DW_AT_bit_offset, 0x0c)
-DW_AT (DW_AT_bit_size, 0x0d)
-DW_AT (DW_AT_element_list, 0x0f)
-DW_AT (DW_AT_stmt_list, 0x10)
-DW_AT (DW_AT_low_pc, 0x11)
-DW_AT (DW_AT_high_pc, 0x12)
-DW_AT (DW_AT_language, 0x13)
-DW_AT (DW_AT_member, 0x14)
-DW_AT (DW_AT_discr, 0x15)
-DW_AT (DW_AT_discr_value, 0x16)
-DW_AT (DW_AT_visibility, 0x17)
-DW_AT (DW_AT_import, 0x18)
-DW_AT (DW_AT_string_length, 0x19)
-DW_AT (DW_AT_common_reference, 0x1a)
-DW_AT (DW_AT_comp_dir, 0x1b)
-DW_AT (DW_AT_const_value, 0x1c)
-DW_AT (DW_AT_containing_type, 0x1d)
-DW_AT (DW_AT_default_value, 0x1e)
-DW_AT (DW_AT_inline, 0x20)
-DW_AT (DW_AT_is_optional, 0x21)
-DW_AT (DW_AT_lower_bound, 0x22)
-DW_AT (DW_AT_producer, 0x25)
-DW_AT (DW_AT_prototyped, 0x27)
-DW_AT (DW_AT_return_addr, 0x2a)
-DW_AT (DW_AT_start_scope, 0x2c)
-DW_AT (DW_AT_bit_stride, 0x2e)
-DW_AT (DW_AT_upper_bound, 0x2f)
-DW_AT (DW_AT_abstract_origin, 0x31)
-DW_AT (DW_AT_accessibility, 0x32)
-DW_AT (DW_AT_address_class, 0x33)
-DW_AT (DW_AT_artificial, 0x34)
-DW_AT (DW_AT_base_types, 0x35)
-DW_AT (DW_AT_calling_convention, 0x36)
-DW_AT (DW_AT_count, 0x37)
-DW_AT (DW_AT_data_member_location, 0x38)
-DW_AT (DW_AT_decl_column, 0x39)
-DW_AT (DW_AT_decl_file, 0x3a)
-DW_AT (DW_AT_decl_line, 0x3b)
-DW_AT (DW_AT_declaration, 0x3c)
-DW_AT (DW_AT_discr_list, 0x3d)
-DW_AT (DW_AT_encoding, 0x3e)
-DW_AT (DW_AT_external, 0x3f)
-DW_AT (DW_AT_frame_base, 0x40)
-DW_AT (DW_AT_friend, 0x41)
-DW_AT (DW_AT_identifier_case, 0x42)
-DW_AT (DW_AT_macro_info, 0x43)
-DW_AT (DW_AT_namelist_items, 0x44)
-DW_AT (DW_AT_priority, 0x45)
-DW_AT (DW_AT_segment, 0x46)
-DW_AT (DW_AT_specification, 0x47)
-DW_AT (DW_AT_static_link, 0x48)
-DW_AT (DW_AT_type, 0x49)
-DW_AT (DW_AT_use_location, 0x4a)
-DW_AT (DW_AT_variable_parameter, 0x4b)
-DW_AT (DW_AT_virtuality, 0x4c)
-DW_AT (DW_AT_vtable_elem_location, 0x4d)
-/* DWARF 3 values.  */
-DW_AT (DW_AT_allocated, 0x4e)
-DW_AT (DW_AT_associated, 0x4f)
-DW_AT (DW_AT_data_location, 0x50)
-DW_AT (DW_AT_byte_stride, 0x51)
-DW_AT (DW_AT_entry_pc, 0x52)
-DW_AT (DW_AT_use_UTF8, 0x53)
-DW_AT (DW_AT_extension, 0x54)
-DW_AT (DW_AT_ranges, 0x55)
-DW_AT (DW_AT_trampoline, 0x56)
-DW_AT (DW_AT_call_column, 0x57)
-DW_AT (DW_AT_call_file, 0x58)
-DW_AT (DW_AT_call_line, 0x59)
-DW_AT (DW_AT_description, 0x5a)
-DW_AT (DW_AT_binary_scale, 0x5b)
-DW_AT (DW_AT_decimal_scale, 0x5c)
-DW_AT (DW_AT_small, 0x5d)
-DW_AT (DW_AT_decimal_sign, 0x5e)
-DW_AT (DW_AT_digit_count, 0x5f)
-DW_AT (DW_AT_picture_string, 0x60)
-DW_AT (DW_AT_mutable, 0x61)
-DW_AT (DW_AT_threads_scaled, 0x62)
-DW_AT (DW_AT_explicit, 0x63)
-DW_AT (DW_AT_object_pointer, 0x64)
-DW_AT (DW_AT_endianity, 0x65)
-DW_AT (DW_AT_elemental, 0x66)
-DW_AT (DW_AT_pure, 0x67)
-DW_AT (DW_AT_recursive, 0x68)
-/* DWARF 4.  */
-DW_AT (DW_AT_signature, 0x69)
-DW_AT (DW_AT_main_subprogram, 0x6a)
-DW_AT (DW_AT_data_bit_offset, 0x6b)
-DW_AT (DW_AT_const_expr, 0x6c)
-DW_AT (DW_AT_enum_class, 0x6d)
-DW_AT (DW_AT_linkage_name, 0x6e)
-/* DWARF 5.  */
-DW_AT (DW_AT_string_length_bit_size, 0x6f)
-DW_AT (DW_AT_string_length_byte_size, 0x70)
-DW_AT (DW_AT_rank, 0x71)
-DW_AT (DW_AT_str_offsets_base, 0x72)
-DW_AT (DW_AT_addr_base, 0x73)
-DW_AT (DW_AT_rnglists_base, 0x74)
-DW_AT (DW_AT_dwo_name, 0x76)
-DW_AT (DW_AT_reference, 0x77)
-DW_AT (DW_AT_rvalue_reference, 0x78)
-DW_AT (DW_AT_macros, 0x79)
-DW_AT (DW_AT_call_all_calls, 0x7a)
-DW_AT (DW_AT_call_all_source_calls, 0x7b)
-DW_AT (DW_AT_call_all_tail_calls, 0x7c)
-DW_AT (DW_AT_call_return_pc, 0x7d)
-DW_AT (DW_AT_call_value, 0x7e)
-DW_AT (DW_AT_call_origin, 0x7f)
-DW_AT (DW_AT_call_parameter, 0x80)
-DW_AT (DW_AT_call_pc, 0x81)
-DW_AT (DW_AT_call_tail_call, 0x82)
-DW_AT (DW_AT_call_target, 0x83)
-DW_AT (DW_AT_call_target_clobbered, 0x84)
-DW_AT (DW_AT_call_data_location, 0x85)
-DW_AT (DW_AT_call_data_value, 0x86)
-DW_AT (DW_AT_noreturn, 0x87)
-DW_AT (DW_AT_alignment, 0x88)
-DW_AT (DW_AT_export_symbols, 0x89)
-DW_AT (DW_AT_deleted, 0x8a)
-DW_AT (DW_AT_defaulted, 0x8b)
-DW_AT (DW_AT_loclists_base, 0x8c)
-
-DW_AT_DUP (DW_AT_lo_user, 0x2000) /* Implementation-defined range start.  */
-DW_AT_DUP (DW_AT_hi_user, 0x3fff) /* Implementation-defined range end.  */
-
-/* SGI/MIPS extensions.  */
-DW_AT (DW_AT_MIPS_fde, 0x2001)
-DW_AT (DW_AT_MIPS_loop_begin, 0x2002)
-DW_AT (DW_AT_MIPS_tail_loop_begin, 0x2003)
-DW_AT (DW_AT_MIPS_epilog_begin, 0x2004)
-DW_AT (DW_AT_MIPS_loop_unroll_factor, 0x2005)
-DW_AT (DW_AT_MIPS_software_pipeline_depth, 0x2006)
-DW_AT (DW_AT_MIPS_linkage_name, 0x2007)
-DW_AT (DW_AT_MIPS_stride, 0x2008)
-DW_AT (DW_AT_MIPS_abstract_name, 0x2009)
-DW_AT (DW_AT_MIPS_clone_origin, 0x200a)
-DW_AT (DW_AT_MIPS_has_inlines, 0x200b)
-/* HP extensions.  */
-DW_AT (DW_AT_HP_block_index, 0x2000)
-DW_AT_DUP (DW_AT_HP_unmodifiable, 0x2001) /* Same as DW_AT_MIPS_fde.  */
-DW_AT_DUP (DW_AT_HP_prologue, 0x2005) /* Same as DW_AT_MIPS_loop_unroll.  */
-DW_AT_DUP (DW_AT_HP_epilogue, 0x2008) /* Same as DW_AT_MIPS_stride.  */
-DW_AT (DW_AT_HP_actuals_stmt_list, 0x2010)
-DW_AT (DW_AT_HP_proc_per_section, 0x2011)
-DW_AT (DW_AT_HP_raw_data_ptr, 0x2012)
-DW_AT (DW_AT_HP_pass_by_reference, 0x2013)
-DW_AT (DW_AT_HP_opt_level, 0x2014)
-DW_AT (DW_AT_HP_prof_version_id, 0x2015)
-DW_AT (DW_AT_HP_opt_flags, 0x2016)
-DW_AT (DW_AT_HP_cold_region_low_pc, 0x2017)
-DW_AT (DW_AT_HP_cold_region_high_pc, 0x2018)
-DW_AT (DW_AT_HP_all_variables_modifiable, 0x2019)
-DW_AT (DW_AT_HP_linkage_name, 0x201a)
-DW_AT (DW_AT_HP_prof_flags, 0x201b)  /* In comp unit of procs_info for -g.  */
-DW_AT (DW_AT_HP_unit_name, 0x201f)
-DW_AT (DW_AT_HP_unit_size, 0x2020)
-DW_AT (DW_AT_HP_widened_byte_size, 0x2021)
-DW_AT (DW_AT_HP_definition_points, 0x2022)
-DW_AT (DW_AT_HP_default_location, 0x2023)
-DW_AT (DW_AT_HP_is_result_param, 0x2029)
-
-/* GNU extensions.  */
-DW_AT (DW_AT_sf_names, 0x2101)
-DW_AT (DW_AT_src_info, 0x2102)
-DW_AT (DW_AT_mac_info, 0x2103)
-DW_AT (DW_AT_src_coords, 0x2104)
-DW_AT (DW_AT_body_begin, 0x2105)
-DW_AT (DW_AT_body_end, 0x2106)
-DW_AT (DW_AT_GNU_vector, 0x2107)
-/* Thread-safety annotations.
-   See http://gcc.gnu.org/wiki/ThreadSafetyAnnotation .  */
-DW_AT (DW_AT_GNU_guarded_by, 0x2108)
-DW_AT (DW_AT_GNU_pt_guarded_by, 0x2109)
-DW_AT (DW_AT_GNU_guarded, 0x210a)
-DW_AT (DW_AT_GNU_pt_guarded, 0x210b)
-DW_AT (DW_AT_GNU_locks_excluded, 0x210c)
-DW_AT (DW_AT_GNU_exclusive_locks_required, 0x210d)
-DW_AT (DW_AT_GNU_shared_locks_required, 0x210e)
-/* One-definition rule violation detection.
-   See http://gcc.gnu.org/wiki/DwarfSeparateTypeInfo .  */
-DW_AT (DW_AT_GNU_odr_signature, 0x210f)
-/* Template template argument name.
-   See http://gcc.gnu.org/wiki/TemplateParmsDwarf .  */
-DW_AT (DW_AT_GNU_template_name, 0x2110)
-/* The GNU call site extension.
-   See http://www.dwarfstd.org/ShowIssue.php?issue=100909.2&type=open .  */
-DW_AT (DW_AT_GNU_call_site_value, 0x2111)
-DW_AT (DW_AT_GNU_call_site_data_value, 0x2112)
-DW_AT (DW_AT_GNU_call_site_target, 0x2113)
-DW_AT (DW_AT_GNU_call_site_target_clobbered, 0x2114)
-DW_AT (DW_AT_GNU_tail_call, 0x2115)
-DW_AT (DW_AT_GNU_all_tail_call_sites, 0x2116)
-DW_AT (DW_AT_GNU_all_call_sites, 0x2117)
-DW_AT (DW_AT_GNU_all_source_call_sites, 0x2118)
-/* Section offset into .debug_macro section.  */
-DW_AT (DW_AT_GNU_macros, 0x2119)
-/* Attribute for C++ deleted special member functions (= delete;).  */
-DW_AT (DW_AT_GNU_deleted, 0x211a)
-/* Extensions for Fission.  See http://gcc.gnu.org/wiki/DebugFission.  */
-DW_AT (DW_AT_GNU_dwo_name, 0x2130)
-DW_AT (DW_AT_GNU_dwo_id, 0x2131)
-DW_AT (DW_AT_GNU_ranges_base, 0x2132)
-DW_AT (DW_AT_GNU_addr_base, 0x2133)
-DW_AT (DW_AT_GNU_pubnames, 0x2134)
-DW_AT (DW_AT_GNU_pubtypes, 0x2135)
-/* Attribute for discriminator.
-   See http://gcc.gnu.org/wiki/Discriminator  */
-DW_AT (DW_AT_GNU_discriminator, 0x2136)
-/* VMS extensions.  */
-DW_AT (DW_AT_VMS_rtnbeg_pd_address, 0x2201)
-/* GNAT extensions.  */
-/* GNAT descriptive type.
-   See http://gcc.gnu.org/wiki/DW_AT_GNAT_descriptive_type .  */
-DW_AT (DW_AT_use_GNAT_descriptive_type, 0x2301)
-DW_AT (DW_AT_GNAT_descriptive_type, 0x2302)
-/* Rational constant extension.
-   See https://gcc.gnu.org/wiki/DW_AT_GNU_numerator_denominator .  */
-DW_TAG (DW_AT_GNU_numerator, 0x2303)
-DW_TAG (DW_AT_GNU_denominator, 0x2304)
-/* Biased integer extension.
-   See https://gcc.gnu.org/wiki/DW_AT_GNU_bias .  */
-DW_TAG (DW_AT_GNU_bias, 0x2305)
-/* UPC extension.  */
-DW_AT (DW_AT_upc_threads_scaled, 0x3210)
-/* PGI (STMicroelectronics) extensions.  */
-DW_AT (DW_AT_PGI_lbase, 0x3a00)
-DW_AT (DW_AT_PGI_soffset, 0x3a01)
-DW_AT (DW_AT_PGI_lstride, 0x3a02)
-/* Apple extensions.  */
-DW_AT (DW_AT_APPLE_optimized, 0x3fe1)
-DW_AT (DW_AT_APPLE_flags, 0x3fe2)
-DW_AT (DW_AT_APPLE_isa, 0x3fe3)
-DW_AT (DW_AT_APPLE_block, 0x3fe4)
-DW_AT (DW_AT_APPLE_major_runtime_vers, 0x3fe5)
-DW_AT (DW_AT_APPLE_runtime_class, 0x3fe6)
-DW_AT (DW_AT_APPLE_omit_frame_ptr, 0x3fe7)
-DW_AT (DW_AT_APPLE_property_name, 0x3fe8)
-DW_AT (DW_AT_APPLE_property_getter, 0x3fe9)
-DW_AT (DW_AT_APPLE_property_setter, 0x3fea)
-DW_AT (DW_AT_APPLE_property_attribute, 0x3feb)
-DW_AT (DW_AT_APPLE_objc_complete_type, 0x3fec)
-DW_AT (DW_AT_APPLE_property, 0x3fed)
-DW_END_AT
-
-DW_FIRST_OP (DW_OP_addr, 0x03)
-DW_OP (DW_OP_deref, 0x06)
-DW_OP (DW_OP_const1u, 0x08)
-DW_OP (DW_OP_const1s, 0x09)
-DW_OP (DW_OP_const2u, 0x0a)
-DW_OP (DW_OP_const2s, 0x0b)
-DW_OP (DW_OP_const4u, 0x0c)
-DW_OP (DW_OP_const4s, 0x0d)
-DW_OP (DW_OP_const8u, 0x0e)
-DW_OP (DW_OP_const8s, 0x0f)
-DW_OP (DW_OP_constu, 0x10)
-DW_OP (DW_OP_consts, 0x11)
-DW_OP (DW_OP_dup, 0x12)
-DW_OP (DW_OP_drop, 0x13)
-DW_OP (DW_OP_over, 0x14)
-DW_OP (DW_OP_pick, 0x15)
-DW_OP (DW_OP_swap, 0x16)
-DW_OP (DW_OP_rot, 0x17)
-DW_OP (DW_OP_xderef, 0x18)
-DW_OP (DW_OP_abs, 0x19)
-DW_OP (DW_OP_and, 0x1a)
-DW_OP (DW_OP_div, 0x1b)
-DW_OP (DW_OP_minus, 0x1c)
-DW_OP (DW_OP_mod, 0x1d)
-DW_OP (DW_OP_mul, 0x1e)
-DW_OP (DW_OP_neg, 0x1f)
-DW_OP (DW_OP_not, 0x20)
-DW_OP (DW_OP_or, 0x21)
-DW_OP (DW_OP_plus, 0x22)
-DW_OP (DW_OP_plus_uconst, 0x23)
-DW_OP (DW_OP_shl, 0x24)
-DW_OP (DW_OP_shr, 0x25)
-DW_OP (DW_OP_shra, 0x26)
-DW_OP (DW_OP_xor, 0x27)
-DW_OP (DW_OP_bra, 0x28)
-DW_OP (DW_OP_eq, 0x29)
-DW_OP (DW_OP_ge, 0x2a)
-DW_OP (DW_OP_gt, 0x2b)
-DW_OP (DW_OP_le, 0x2c)
-DW_OP (DW_OP_lt, 0x2d)
-DW_OP (DW_OP_ne, 0x2e)
-DW_OP (DW_OP_skip, 0x2f)
-DW_OP (DW_OP_lit0, 0x30)
-DW_OP (DW_OP_lit1, 0x31)
-DW_OP (DW_OP_lit2, 0x32)
-DW_OP (DW_OP_lit3, 0x33)
-DW_OP (DW_OP_lit4, 0x34)
-DW_OP (DW_OP_lit5, 0x35)
-DW_OP (DW_OP_lit6, 0x36)
-DW_OP (DW_OP_lit7, 0x37)
-DW_OP (DW_OP_lit8, 0x38)
-DW_OP (DW_OP_lit9, 0x39)
-DW_OP (DW_OP_lit10, 0x3a)
-DW_OP (DW_OP_lit11, 0x3b)
-DW_OP (DW_OP_lit12, 0x3c)
-DW_OP (DW_OP_lit13, 0x3d)
-DW_OP (DW_OP_lit14, 0x3e)
-DW_OP (DW_OP_lit15, 0x3f)
-DW_OP (DW_OP_lit16, 0x40)
-DW_OP (DW_OP_lit17, 0x41)
-DW_OP (DW_OP_lit18, 0x42)
-DW_OP (DW_OP_lit19, 0x43)
-DW_OP (DW_OP_lit20, 0x44)
-DW_OP (DW_OP_lit21, 0x45)
-DW_OP (DW_OP_lit22, 0x46)
-DW_OP (DW_OP_lit23, 0x47)
-DW_OP (DW_OP_lit24, 0x48)
-DW_OP (DW_OP_lit25, 0x49)
-DW_OP (DW_OP_lit26, 0x4a)
-DW_OP (DW_OP_lit27, 0x4b)
-DW_OP (DW_OP_lit28, 0x4c)
-DW_OP (DW_OP_lit29, 0x4d)
-DW_OP (DW_OP_lit30, 0x4e)
-DW_OP (DW_OP_lit31, 0x4f)
-DW_OP (DW_OP_reg0, 0x50)
-DW_OP (DW_OP_reg1, 0x51)
-DW_OP (DW_OP_reg2, 0x52)
-DW_OP (DW_OP_reg3, 0x53)
-DW_OP (DW_OP_reg4, 0x54)
-DW_OP (DW_OP_reg5, 0x55)
-DW_OP (DW_OP_reg6, 0x56)
-DW_OP (DW_OP_reg7, 0x57)
-DW_OP (DW_OP_reg8, 0x58)
-DW_OP (DW_OP_reg9, 0x59)
-DW_OP (DW_OP_reg10, 0x5a)
-DW_OP (DW_OP_reg11, 0x5b)
-DW_OP (DW_OP_reg12, 0x5c)
-DW_OP (DW_OP_reg13, 0x5d)
-DW_OP (DW_OP_reg14, 0x5e)
-DW_OP (DW_OP_reg15, 0x5f)
-DW_OP (DW_OP_reg16, 0x60)
-DW_OP (DW_OP_reg17, 0x61)
-DW_OP (DW_OP_reg18, 0x62)
-DW_OP (DW_OP_reg19, 0x63)
-DW_OP (DW_OP_reg20, 0x64)
-DW_OP (DW_OP_reg21, 0x65)
-DW_OP (DW_OP_reg22, 0x66)
-DW_OP (DW_OP_reg23, 0x67)
-DW_OP (DW_OP_reg24, 0x68)
-DW_OP (DW_OP_reg25, 0x69)
-DW_OP (DW_OP_reg26, 0x6a)
-DW_OP (DW_OP_reg27, 0x6b)
-DW_OP (DW_OP_reg28, 0x6c)
-DW_OP (DW_OP_reg29, 0x6d)
-DW_OP (DW_OP_reg30, 0x6e)
-DW_OP (DW_OP_reg31, 0x6f)
-DW_OP (DW_OP_breg0, 0x70)
-DW_OP (DW_OP_breg1, 0x71)
-DW_OP (DW_OP_breg2, 0x72)
-DW_OP (DW_OP_breg3, 0x73)
-DW_OP (DW_OP_breg4, 0x74)
-DW_OP (DW_OP_breg5, 0x75)
-DW_OP (DW_OP_breg6, 0x76)
-DW_OP (DW_OP_breg7, 0x77)
-DW_OP (DW_OP_breg8, 0x78)
-DW_OP (DW_OP_breg9, 0x79)
-DW_OP (DW_OP_breg10, 0x7a)
-DW_OP (DW_OP_breg11, 0x7b)
-DW_OP (DW_OP_breg12, 0x7c)
-DW_OP (DW_OP_breg13, 0x7d)
-DW_OP (DW_OP_breg14, 0x7e)
-DW_OP (DW_OP_breg15, 0x7f)
-DW_OP (DW_OP_breg16, 0x80)
-DW_OP (DW_OP_breg17, 0x81)
-DW_OP (DW_OP_breg18, 0x82)
-DW_OP (DW_OP_breg19, 0x83)
-DW_OP (DW_OP_breg20, 0x84)
-DW_OP (DW_OP_breg21, 0x85)
-DW_OP (DW_OP_breg22, 0x86)
-DW_OP (DW_OP_breg23, 0x87)
-DW_OP (DW_OP_breg24, 0x88)
-DW_OP (DW_OP_breg25, 0x89)
-DW_OP (DW_OP_breg26, 0x8a)
-DW_OP (DW_OP_breg27, 0x8b)
-DW_OP (DW_OP_breg28, 0x8c)
-DW_OP (DW_OP_breg29, 0x8d)
-DW_OP (DW_OP_breg30, 0x8e)
-DW_OP (DW_OP_breg31, 0x8f)
-DW_OP (DW_OP_regx, 0x90)
-DW_OP (DW_OP_fbreg, 0x91)
-DW_OP (DW_OP_bregx, 0x92)
-DW_OP (DW_OP_piece, 0x93)
-DW_OP (DW_OP_deref_size, 0x94)
-DW_OP (DW_OP_xderef_size, 0x95)
-DW_OP (DW_OP_nop, 0x96)
-/* DWARF 3 extensions.  */
-DW_OP (DW_OP_push_object_address, 0x97)
-DW_OP (DW_OP_call2, 0x98)
-DW_OP (DW_OP_call4, 0x99)
-DW_OP (DW_OP_call_ref, 0x9a)
-DW_OP (DW_OP_form_tls_address, 0x9b)
-DW_OP (DW_OP_call_frame_cfa, 0x9c)
-DW_OP (DW_OP_bit_piece, 0x9d)
-
-/* DWARF 4 extensions.  */
-DW_OP (DW_OP_implicit_value, 0x9e)
-DW_OP (DW_OP_stack_value, 0x9f)
-
-/* DWARF 5 extensions.  */
-DW_OP (DW_OP_implicit_pointer, 0xa0)
-DW_OP (DW_OP_addrx, 0xa1)
-DW_OP (DW_OP_constx, 0xa2)
-DW_OP (DW_OP_entry_value, 0xa3)
-DW_OP (DW_OP_const_type, 0xa4)
-DW_OP (DW_OP_regval_type, 0xa5)
-DW_OP (DW_OP_deref_type, 0xa6)
-DW_OP (DW_OP_xderef_type, 0xa7)
-DW_OP (DW_OP_convert, 0xa8)
-DW_OP (DW_OP_reinterpret, 0xa9)
-
-DW_OP_DUP (DW_OP_lo_user, 0xe0)	/* Implementation-defined range start.  */
-DW_OP_DUP (DW_OP_hi_user, 0xff)	/* Implementation-defined range end.  */
-
-/* GNU extensions.  */
-DW_OP (DW_OP_GNU_push_tls_address, 0xe0)
-/* The following is for marking variables that are uninitialized.  */
-DW_OP (DW_OP_GNU_uninit, 0xf0)
-DW_OP (DW_OP_GNU_encoded_addr, 0xf1)
-/* The GNU implicit pointer extension.
-   See http://www.dwarfstd.org/ShowIssue.php?issue=100831.1&type=open .  */
-DW_OP (DW_OP_GNU_implicit_pointer, 0xf2)
-/* The GNU entry value extension.
-   See http://www.dwarfstd.org/ShowIssue.php?issue=100909.1&type=open .  */
-DW_OP (DW_OP_GNU_entry_value, 0xf3)
-/* The GNU typed stack extension.
-   See http://www.dwarfstd.org/doc/040408.1.html .  */
-DW_OP (DW_OP_GNU_const_type, 0xf4)
-DW_OP (DW_OP_GNU_regval_type, 0xf5)
-DW_OP (DW_OP_GNU_deref_type, 0xf6)
-DW_OP (DW_OP_GNU_convert, 0xf7)
-DW_OP (DW_OP_GNU_reinterpret, 0xf9)
-/* The GNU parameter ref extension.  */
-DW_OP (DW_OP_GNU_parameter_ref, 0xfa)
-/* Extensions for Fission.  See http://gcc.gnu.org/wiki/DebugFission.  */
-DW_OP (DW_OP_GNU_addr_index, 0xfb)
-DW_OP (DW_OP_GNU_const_index, 0xfc)
-/* HP extensions.  */
-DW_OP_DUP (DW_OP_HP_unknown, 0xe0) /* Ouch, the same as GNU_push_tls_address.  */
-DW_OP (DW_OP_HP_is_value, 0xe1)
-DW_OP (DW_OP_HP_fltconst4, 0xe2)
-DW_OP (DW_OP_HP_fltconst8, 0xe3)
-DW_OP (DW_OP_HP_mod_range, 0xe4)
-DW_OP (DW_OP_HP_unmod_range, 0xe5)
-DW_OP (DW_OP_HP_tls, 0xe6)
-/* PGI (STMicroelectronics) extensions.  */
-DW_OP (DW_OP_PGI_omp_thread_num, 0xf8)
-DW_END_OP
-
-DW_FIRST_ATE (DW_ATE_void, 0x0)
-DW_ATE (DW_ATE_address, 0x1)
-DW_ATE (DW_ATE_boolean, 0x2)
-DW_ATE (DW_ATE_complex_float, 0x3)
-DW_ATE (DW_ATE_float, 0x4)
-DW_ATE (DW_ATE_signed, 0x5)
-DW_ATE (DW_ATE_signed_char, 0x6)
-DW_ATE (DW_ATE_unsigned, 0x7)
-DW_ATE (DW_ATE_unsigned_char, 0x8)
-/* DWARF 3.  */
-DW_ATE (DW_ATE_imaginary_float, 0x9)
-DW_ATE (DW_ATE_packed_decimal, 0xa)
-DW_ATE (DW_ATE_numeric_string, 0xb)
-DW_ATE (DW_ATE_edited, 0xc)
-DW_ATE (DW_ATE_signed_fixed, 0xd)
-DW_ATE (DW_ATE_unsigned_fixed, 0xe)
-DW_ATE (DW_ATE_decimal_float, 0xf)
-/* DWARF 4.  */
-DW_ATE (DW_ATE_UTF, 0x10)
-/* DWARF 5.  */
-DW_ATE (DW_ATE_UCS, 0x11)
-DW_ATE (DW_ATE_ASCII, 0x12)
-
-DW_ATE_DUP (DW_ATE_lo_user, 0x80)
-DW_ATE_DUP (DW_ATE_hi_user, 0xff)
-
-/* HP extensions.  */
-DW_ATE (DW_ATE_HP_float80, 0x80) /* Floating-point (80 bit).  */
-DW_ATE (DW_ATE_HP_complex_float80, 0x81) /* Complex floating-point (80 bit).  */
-DW_ATE (DW_ATE_HP_float128, 0x82) /* Floating-point (128 bit).  */
-DW_ATE (DW_ATE_HP_complex_float128, 0x83) /* Complex fp (128 bit).  */
-DW_ATE (DW_ATE_HP_floathpintel, 0x84) /* Floating-point (82 bit IA64).  */
-DW_ATE (DW_ATE_HP_imaginary_float80, 0x85)
-DW_ATE (DW_ATE_HP_imaginary_float128, 0x86)
-DW_ATE (DW_ATE_HP_VAX_float, 0x88) /* F or G floating.  */
-DW_ATE (DW_ATE_HP_VAX_float_d, 0x89) /* D floating.  */
-DW_ATE (DW_ATE_HP_packed_decimal, 0x8a) /* Cobol.  */
-DW_ATE (DW_ATE_HP_zoned_decimal, 0x8b) /* Cobol.  */
-DW_ATE (DW_ATE_HP_edited, 0x8c) /* Cobol.  */
-DW_ATE (DW_ATE_HP_signed_fixed, 0x8d) /* Cobol.  */
-DW_ATE (DW_ATE_HP_unsigned_fixed, 0x8e) /* Cobol.  */
-DW_ATE (DW_ATE_HP_VAX_complex_float, 0x8f) /* F or G floating complex.  */
-DW_ATE (DW_ATE_HP_VAX_complex_float_d, 0x90) /* D floating complex.  */
-
-DW_END_ATE
-
-DW_FIRST_CFA (DW_CFA_advance_loc, 0x40)
-DW_CFA (DW_CFA_offset, 0x80)
-DW_CFA (DW_CFA_restore, 0xc0)
-DW_CFA (DW_CFA_nop, 0x00)
-DW_CFA (DW_CFA_set_loc, 0x01)
-DW_CFA (DW_CFA_advance_loc1, 0x02)
-DW_CFA (DW_CFA_advance_loc2, 0x03)
-DW_CFA (DW_CFA_advance_loc4, 0x04)
-DW_CFA (DW_CFA_offset_extended, 0x05)
-DW_CFA (DW_CFA_restore_extended, 0x06)
-DW_CFA (DW_CFA_undefined, 0x07)
-DW_CFA (DW_CFA_same_value, 0x08)
-DW_CFA (DW_CFA_register, 0x09)
-DW_CFA (DW_CFA_remember_state, 0x0a)
-DW_CFA (DW_CFA_restore_state, 0x0b)
-DW_CFA (DW_CFA_def_cfa, 0x0c)
-DW_CFA (DW_CFA_def_cfa_register, 0x0d)
-DW_CFA (DW_CFA_def_cfa_offset, 0x0e)
-/* DWARF 3.  */
-DW_CFA (DW_CFA_def_cfa_expression, 0x0f)
-DW_CFA (DW_CFA_expression, 0x10)
-DW_CFA (DW_CFA_offset_extended_sf, 0x11)
-DW_CFA (DW_CFA_def_cfa_sf, 0x12)
-DW_CFA (DW_CFA_def_cfa_offset_sf, 0x13)
-DW_CFA (DW_CFA_val_offset, 0x14)
-DW_CFA (DW_CFA_val_offset_sf, 0x15)
-DW_CFA (DW_CFA_val_expression, 0x16)
-
-DW_CFA (DW_CFA_lo_user, 0x1c)
-DW_CFA (DW_CFA_hi_user, 0x3f)
-
-/* SGI/MIPS specific.  */
-DW_CFA (DW_CFA_MIPS_advance_loc8, 0x1d)
-/* GNU extensions.  */
-DW_CFA (DW_CFA_GNU_window_save, 0x2d)
-DW_CFA (DW_CFA_GNU_args_size, 0x2e)
-DW_CFA (DW_CFA_GNU_negative_offset_extended, 0x2f)
-
-DW_END_CFA
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/dwarf2.h b/rpython/rlib/rvmprof/src/shared/libbacktrace/dwarf2.h
deleted file mode 100644
--- a/rpython/rlib/rvmprof/src/shared/libbacktrace/dwarf2.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/* Declarations and definitions of codes relating to the DWARF2 and
-   DWARF3 symbolic debugging information formats.
-   Copyright (C) 1992-2016 Free Software Foundation, Inc.
-
-   Written by Gary Funck (gary at intrepid.com) The Ada Joint Program
-   Office (AJPO), Florida State University and Silicon Graphics Inc.
-   provided support for this effort -- June 21, 1995.
-
-   Derived from the DWARF 1 implementation written by Ron Guilmette
-   (rfg at netcom.com), November 1990.
-
-   This file is part of GCC.
-
-   GCC is free software; you can redistribute it and/or modify it under
-   the terms of the GNU General Public License as published by the Free
-   Software Foundation; either version 3, or (at your option) any later
-   version.
-
-   GCC is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-   License for more details.
-
-   Under Section 7 of GPL version 3, you are granted additional
-   permissions described in the GCC Runtime Library Exception, version
-   3.1, as published by the Free Software Foundation.
-
-   You should have received a copy of the GNU General Public License and
-   a copy of the GCC Runtime Library Exception along with this program;
-   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* This file is derived from the DWARF specification (a public document)
-   Revision 2.0.0 (July 27, 1993) developed by the UNIX International
-   Programming Languages Special Interest Group (UI/PLSIG) and distributed
-   by UNIX International.  Copies of this specification are available from
-   UNIX International, 20 Waterview Boulevard, Parsippany, NJ, 07054.
-
-   This file also now contains definitions from the DWARF 3 specification
-   published Dec 20, 2005, available from: http://dwarf.freestandards.org.  */
-
-#ifndef _DWARF2_H
-#define _DWARF2_H
-
-#define DW_TAG(name, value) , name = value
-#define DW_TAG_DUP(name, value) , name = value
-#define DW_FORM(name, value) , name = value
-#define DW_AT(name, value) , name = value
-#define DW_AT_DUP(name, value) , name = value
-#define DW_OP(name, value) , name = value
-#define DW_OP_DUP(name, value) , name = value
-#define DW_ATE(name, value) , name = value
-#define DW_ATE_DUP(name, value) , name = value
-#define DW_CFA(name, value) , name = value
-
-#define DW_FIRST_TAG(name, value) enum dwarf_tag { \
-  name = value
-#define DW_END_TAG };
-#define DW_FIRST_FORM(name, value) enum dwarf_form { \
-  name = value
-#define DW_END_FORM };
-#define DW_FIRST_AT(name, value) enum dwarf_attribute { \
-  name = value
-#define DW_END_AT };
-#define DW_FIRST_OP(name, value) enum dwarf_location_atom { \
-  name = value
-#define DW_END_OP };
-#define DW_FIRST_ATE(name, value) enum dwarf_type { \
-  name = value
-#define DW_END_ATE };
-#define DW_FIRST_CFA(name, value) enum dwarf_call_frame_info { \
-  name = value
-#define DW_END_CFA };
-
-#include "dwarf2.def"
-
-#undef DW_FIRST_TAG
-#undef DW_END_TAG
-#undef DW_FIRST_FORM
-#undef DW_END_FORM
-#undef DW_FIRST_AT
-#undef DW_END_AT
-#undef DW_FIRST_OP
-#undef DW_END_OP
-#undef DW_FIRST_ATE
-#undef DW_END_ATE
-#undef DW_FIRST_CFA
-#undef DW_END_CFA
-
-#undef DW_TAG
-#undef DW_TAG_DUP
-#undef DW_FORM
-#undef DW_AT
-#undef DW_AT_DUP
-#undef DW_OP
-#undef DW_OP_DUP
-#undef DW_ATE
-#undef DW_ATE_DUP
-#undef DW_CFA
-
-/* Flag that tells whether entry has a child or not.  */
-#define DW_children_no   0
-#define	DW_children_yes  1
-
-#define DW_AT_stride_size   DW_AT_bit_stride  /* Note: The use of DW_AT_stride_size is deprecated.  */
-#define DW_AT_stride   DW_AT_byte_stride  /* Note: The use of DW_AT_stride is deprecated.  */
-
-/* Decimal sign encodings.  */
-enum dwarf_decimal_sign_encoding
-  {
-    /* DWARF 3.  */
-    DW_DS_unsigned = 0x01,
-    DW_DS_leading_overpunch = 0x02,
-    DW_DS_trailing_overpunch = 0x03,
-    DW_DS_leading_separate = 0x04,
-    DW_DS_trailing_separate = 0x05
-  };
-
-/* Endianity encodings.  */
-enum dwarf_endianity_encoding
-  {
-    /* DWARF 3.  */
-    DW_END_default = 0x00,
-    DW_END_big = 0x01,
-    DW_END_little = 0x02,
-
-    DW_END_lo_user = 0x40,
-    DW_END_hi_user = 0xff
-  };
-
-/* Array ordering names and codes.  */
-enum dwarf_array_dim_ordering
-  {
-    DW_ORD_row_major = 0,
-    DW_ORD_col_major = 1
-  };
-
-/* Access attribute.  */
-enum dwarf_access_attribute
-  {
-    DW_ACCESS_public = 1,
-    DW_ACCESS_protected = 2,
-    DW_ACCESS_private = 3
-  };
-
-/* Visibility.  */
-enum dwarf_visibility_attribute
-  {
-    DW_VIS_local = 1,
-    DW_VIS_exported = 2,
-    DW_VIS_qualified = 3
-  };
-
-/* Virtuality.  */
-enum dwarf_virtuality_attribute
-  {
-    DW_VIRTUALITY_none = 0,
-    DW_VIRTUALITY_virtual = 1,
-    DW_VIRTUALITY_pure_virtual = 2
-  };
-
-/* Case sensitivity.  */
-enum dwarf_id_case
-  {
-    DW_ID_case_sensitive = 0,
-    DW_ID_up_case = 1,
-    DW_ID_down_case = 2,
-    DW_ID_case_insensitive = 3
-  };
-
-/* Calling convention.  */
-enum dwarf_calling_convention
-  {
-    DW_CC_normal = 0x1,
-    DW_CC_program = 0x2,
-    DW_CC_nocall = 0x3,
-
-    /* DWARF 5.  */
-    DW_CC_pass_by_reference = 0x4,
-    DW_CC_pass_by_value = 0x5,
-
-    DW_CC_lo_user = 0x40,
-    DW_CC_hi_user = 0xff,
-
-    DW_CC_GNU_renesas_sh = 0x40,
-    DW_CC_GNU_borland_fastcall_i386 = 0x41,
-
-    /* This DW_CC_ value is not currently generated by any toolchain.  It is
-       used internally to GDB to indicate OpenCL C functions that have been
-       compiled with the IBM XL C for OpenCL compiler and use a non-platform
-       calling convention for passing OpenCL C vector types.  This value may
-       be changed freely as long as it does not conflict with any other DW_CC_
-       value defined here.  */
-    DW_CC_GDB_IBM_OpenCL = 0xff
-  };
-
-/* Inline attribute.  */
-enum dwarf_inline_attribute
-  {
-    DW_INL_not_inlined = 0,
-    DW_INL_inlined = 1,
-    DW_INL_declared_not_inlined = 2,
-    DW_INL_declared_inlined = 3
-  };
-
-/* Discriminant lists.  */
-enum dwarf_discrim_list
-  {
-    DW_DSC_label = 0,
-    DW_DSC_range = 1
-  };
-
-/* Line number opcodes.  */
-enum dwarf_line_number_ops
-  {
-    DW_LNS_extended_op = 0,
-    DW_LNS_copy = 1,
-    DW_LNS_advance_pc = 2,
-    DW_LNS_advance_line = 3,
-    DW_LNS_set_file = 4,
-    DW_LNS_set_column = 5,
-    DW_LNS_negate_stmt = 6,
-    DW_LNS_set_basic_block = 7,
-    DW_LNS_const_add_pc = 8,
-    DW_LNS_fixed_advance_pc = 9,
-    /* DWARF 3.  */
-    DW_LNS_set_prologue_end = 10,
-    DW_LNS_set_epilogue_begin = 11,
-    DW_LNS_set_isa = 12
-  };
-
-/* Line number extended opcodes.  */
-enum dwarf_line_number_x_ops
-  {
-    DW_LNE_end_sequence = 1,
-    DW_LNE_set_address = 2,
-    DW_LNE_define_file = 3,
-    DW_LNE_set_discriminator = 4,
-    /* HP extensions.  */
-    DW_LNE_HP_negate_is_UV_update      = 0x11,
-    DW_LNE_HP_push_context             = 0x12,
-    DW_LNE_HP_pop_context              = 0x13,
-    DW_LNE_HP_set_file_line_column     = 0x14,
-    DW_LNE_HP_set_routine_name         = 0x15,
-    DW_LNE_HP_set_sequence             = 0x16,
-    DW_LNE_HP_negate_post_semantics    = 0x17,
-    DW_LNE_HP_negate_function_exit     = 0x18,
-    DW_LNE_HP_negate_front_end_logical = 0x19,
-    DW_LNE_HP_define_proc              = 0x20,
-    DW_LNE_HP_source_file_correlation  = 0x80,
-
-    DW_LNE_lo_user = 0x80,
-    DW_LNE_hi_user = 0xff
-  };
-
-/* Sub-opcodes for DW_LNE_HP_source_file_correlation.  */
-enum dwarf_line_number_hp_sfc_ops
-  {
-    DW_LNE_HP_SFC_formfeed = 1,
-    DW_LNE_HP_SFC_set_listing_line = 2,
-    DW_LNE_HP_SFC_associate = 3
-  };
-
-/* Content type codes in line table directory_entry_format
-   and file_name_entry_format sequences.  */
-enum dwarf_line_number_content_type
-  {
-    DW_LNCT_path = 0x1,
-    DW_LNCT_directory_index = 0x2,
-    DW_LNCT_timestamp = 0x3,
-    DW_LNCT_size = 0x4,
-    DW_LNCT_MD5 = 0x5,
-    DW_LNCT_lo_user = 0x2000,
-    DW_LNCT_hi_user = 0x3fff
-  };
-
-/* Type codes for location list entries.  */
-enum dwarf_location_list_entry_type
-  {
-    DW_LLE_end_of_list = 0x00,
-    DW_LLE_base_addressx = 0x01,
-    DW_LLE_startx_endx = 0x02,
-    DW_LLE_startx_length = 0x03,
-    DW_LLE_offset_pair = 0x04,
-    DW_LLE_default_location = 0x05,
-    DW_LLE_base_address = 0x06,
-    DW_LLE_start_end = 0x07,
-    DW_LLE_start_length = 0x08,
-
-    /* Former extension for Fission.
-       See http://gcc.gnu.org/wiki/DebugFission.  */
-    DW_LLE_GNU_end_of_list_entry = 0x00,
-    DW_LLE_GNU_base_address_selection_entry = 0x01,
-    DW_LLE_GNU_start_end_entry = 0x02,
-    DW_LLE_GNU_start_length_entry = 0x03
-  };
-
-#define DW_CIE_ID	  0xffffffff
-#define DW64_CIE_ID	  0xffffffffffffffffULL
-#define DW_CIE_VERSION	  1
-
-#define DW_CFA_extended   0
-
-#define DW_CHILDREN_no		     0x00
-#define DW_CHILDREN_yes		     0x01
-
-#define DW_ADDR_none		0
-
-/* Source language names and codes.  */
-enum dwarf_source_language
-  {
-    DW_LANG_C89 = 0x0001,
-    DW_LANG_C = 0x0002,
-    DW_LANG_Ada83 = 0x0003,
-    DW_LANG_C_plus_plus = 0x0004,
-    DW_LANG_Cobol74 = 0x0005,
-    DW_LANG_Cobol85 = 0x0006,
-    DW_LANG_Fortran77 = 0x0007,
-    DW_LANG_Fortran90 = 0x0008,
-    DW_LANG_Pascal83 = 0x0009,
-    DW_LANG_Modula2 = 0x000a,
-    /* DWARF 3.  */
-    DW_LANG_Java = 0x000b,
-    DW_LANG_C99 = 0x000c,
-    DW_LANG_Ada95 = 0x000d,
-    DW_LANG_Fortran95 = 0x000e,
-    DW_LANG_PLI = 0x000f,
-    DW_LANG_ObjC = 0x0010,
-    DW_LANG_ObjC_plus_plus = 0x0011,
-    DW_LANG_UPC = 0x0012,
-    DW_LANG_D = 0x0013,
-    /* DWARF 4.  */
-    DW_LANG_Python = 0x0014,
-    /* DWARF 5.  */
-    DW_LANG_OpenCL = 0x0015,
-    DW_LANG_Go = 0x0016,
-    DW_LANG_Modula3 = 0x0017,
-    DW_LANG_Haskell = 0x0018,
-    DW_LANG_C_plus_plus_03 = 0x0019,
-    DW_LANG_C_plus_plus_11 = 0x001a,
-    DW_LANG_OCaml = 0x001b,
-    DW_LANG_Rust = 0x001c,
-    DW_LANG_C11 = 0x001d,
-    DW_LANG_Swift = 0x001e,
-    DW_LANG_Julia = 0x001f,
-    DW_LANG_Dylan = 0x0020,
-    DW_LANG_C_plus_plus_14 = 0x0021,
-    DW_LANG_Fortran03 = 0x0022,
-    DW_LANG_Fortran08 = 0x0023,
-    DW_LANG_RenderScript = 0x0024,
-
-    DW_LANG_lo_user = 0x8000,	/* Implementation-defined range start.  */
-    DW_LANG_hi_user = 0xffff,	/* Implementation-defined range start.  */
-
-    /* MIPS.  */
-    DW_LANG_Mips_Assembler = 0x8001,
-    /* UPC.  */
-    DW_LANG_Upc = 0x8765,
-    /* HP extensions.  */
-    DW_LANG_HP_Bliss     = 0x8003,
-    DW_LANG_HP_Basic91   = 0x8004,
-    DW_LANG_HP_Pascal91  = 0x8005,
-    DW_LANG_HP_IMacro    = 0x8006,
-    DW_LANG_HP_Assembler = 0x8007,
-
-    /* Rust extension, but replaced in DWARF 5.  */
-    DW_LANG_Rust_old = 0x9000
-  };
-
-/* Names and codes for macro information.  */
-enum dwarf_macinfo_record_type
-  {
-    DW_MACINFO_define = 1,
-    DW_MACINFO_undef = 2,
-    DW_MACINFO_start_file = 3,
-    DW_MACINFO_end_file = 4,
-    DW_MACINFO_vendor_ext = 255
-  };
-
-/* DW_TAG_defaulted/DW_TAG_GNU_defaulted attributes.  */
-enum dwarf_defaulted_attribute
-  {
-    DW_DEFAULTED_no = 0x00,
-    DW_DEFAULTED_in_class = 0x01,
-    DW_DEFAULTED_out_of_class = 0x02
-  };
-
-/* Names and codes for new style macro information.  */
-enum dwarf_macro_record_type
-  {
-    DW_MACRO_define = 0x01,
-    DW_MACRO_undef = 0x02,
-    DW_MACRO_start_file = 0x03,
-    DW_MACRO_end_file = 0x04,
-    DW_MACRO_define_strp = 0x05,
-    DW_MACRO_undef_strp = 0x06,
-    DW_MACRO_import = 0x07,
-    DW_MACRO_define_sup = 0x08,
-    DW_MACRO_undef_sup = 0x09,
-    DW_MACRO_import_sup = 0x0a,
-    DW_MACRO_define_strx = 0x0b,
-    DW_MACRO_undef_strx = 0x0c,
-    DW_MACRO_lo_user = 0xe0,
-    DW_MACRO_hi_user = 0xff,
-
-    /* Compatibility macros for the GNU .debug_macro extension.  */
-    DW_MACRO_GNU_define = 0x01,
-    DW_MACRO_GNU_undef = 0x02,
-    DW_MACRO_GNU_start_file = 0x03,
-    DW_MACRO_GNU_end_file = 0x04,
-    DW_MACRO_GNU_define_indirect = 0x05,
-    DW_MACRO_GNU_undef_indirect = 0x06,
-    DW_MACRO_GNU_transparent_include = 0x07,
-    /* Extensions for DWZ multifile.
-       See http://www.dwarfstd.org/ShowIssue.php?issue=120604.1&type=open .  */
-    DW_MACRO_GNU_define_indirect_alt = 0x08,
-    DW_MACRO_GNU_undef_indirect_alt = 0x09,
-    DW_MACRO_GNU_transparent_include_alt = 0x0a,
-    DW_MACRO_GNU_lo_user = 0xe0,
-    DW_MACRO_GNU_hi_user = 0xff
-  };
-
-/* Index attributes in the Abbreviations Table.  */
-enum dwarf_name_index_attribute
-  {
-    DW_IDX_compile_unit = 1,
-    DW_IDX_type_unit = 2,
-    DW_IDX_die_offset = 3,
-    DW_IDX_parent = 4,
-    DW_IDX_type_hash = 5,
-    DW_IDX_lo_user = 0x2000,
-    DW_IDX_hi_user = 0x3fff
-  };
-
-/* Range list entry kinds in .debug_rnglists* section.  */
-enum dwarf_range_list_entry
-  {
-    DW_RLE_end_of_list = 0x00,
-    DW_RLE_base_addressx = 0x01,
-    DW_RLE_startx_endx = 0x02,
-    DW_RLE_startx_length = 0x03,
-    DW_RLE_offset_pair = 0x04,
-    DW_RLE_base_address = 0x05,
-    DW_RLE_start_end = 0x06,
-    DW_RLE_start_length = 0x07
-  };
-
-/* Unit types in unit_type unit header field.  */
-enum dwarf_unit_type
-  {
-    DW_UT_compile = 0x01,
-    DW_UT_type = 0x02,
-    DW_UT_partial = 0x03,
-    DW_UT_skeleton = 0x04,
-    DW_UT_split_compile = 0x05,
-    DW_UT_split_type = 0x06,
-    DW_UT_lo_user = 0x80,
-    DW_UT_hi_user = 0xff
-  };
-

-/* @@@ For use with GNU frame unwind information.  */
-
-#define DW_EH_PE_absptr		0x00
-#define DW_EH_PE_omit		0xff
-
-#define DW_EH_PE_uleb128	0x01
-#define DW_EH_PE_udata2		0x02
-#define DW_EH_PE_udata4		0x03
-#define DW_EH_PE_udata8		0x04
-#define DW_EH_PE_sleb128	0x09
-#define DW_EH_PE_sdata2		0x0A
-#define DW_EH_PE_sdata4		0x0B
-#define DW_EH_PE_sdata8		0x0C
-#define DW_EH_PE_signed		0x08
-
-#define DW_EH_PE_pcrel		0x10
-#define DW_EH_PE_textrel	0x20
-#define DW_EH_PE_datarel	0x30
-#define DW_EH_PE_funcrel	0x40
-#define DW_EH_PE_aligned	0x50
-
-#define DW_EH_PE_indirect	0x80
-
-/* Codes for the debug sections in a dwarf package (.dwp) file.
-   Extensions for Fission.  See http://gcc.gnu.org/wiki/DebugFissionDWP.  */
-enum dwarf_sect
-  {
-    DW_SECT_INFO = 1,
-    DW_SECT_TYPES = 2,
-    DW_SECT_ABBREV = 3,
-    DW_SECT_LINE = 4,
-    DW_SECT_LOC = 5,
-    DW_SECT_STR_OFFSETS = 6,
-    DW_SECT_MACINFO = 7,
-    DW_SECT_MACRO = 8,
-    DW_SECT_MAX = 8
-  };
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Return the name of a DW_TAG_ constant, or NULL if the value is not
-   recognized.  */
-extern const char *get_DW_TAG_name (unsigned int tag);
-
-/* Return the name of a DW_AT_ constant, or NULL if the value is not
-   recognized.  */
-extern const char *get_DW_AT_name (unsigned int attr);
-
-/* Return the name of a DW_FORM_ constant, or NULL if the value is not
-   recognized.  */
-extern const char *get_DW_FORM_name (unsigned int form);
-
-/* Return the name of a DW_OP_ constant, or NULL if the value is not
-   recognized.  */
-extern const char *get_DW_OP_name (unsigned int op);
-
-/* Return the name of a DW_ATE_ constant, or NULL if the value is not
-   recognized.  */
-extern const char *get_DW_ATE_name (unsigned int enc);
-
-/* Return the name of a DW_CFA_ constant, or NULL if the value is not
-   recognized.  */
-extern const char *get_DW_CFA_name (unsigned int opc);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _DWARF2_H */
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/filenames.h b/rpython/rlib/rvmprof/src/shared/libbacktrace/filenames.h
deleted file mode 100644
--- a/rpython/rlib/rvmprof/src/shared/libbacktrace/filenames.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Macros for taking apart, interpreting and processing file names.
-
-   These are here because some non-Posix (a.k.a. DOSish) systems have
-   drive letter brain-damage at the beginning of an absolute file name,
-   use forward- and back-slash in path names interchangeably, and
-   some of them have case-insensitive file names.
-
-   Copyright (C) 2000-2015 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef FILENAMES_H
-#define FILENAMES_H
-
-#include "hashtab.h" /* for hashval_t */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__) || defined (__CYGWIN__)
-#  ifndef HAVE_DOS_BASED_FILE_SYSTEM
-#    define HAVE_DOS_BASED_FILE_SYSTEM 1
-#  endif
-#  ifndef HAVE_CASE_INSENSITIVE_FILE_SYSTEM
-#    define HAVE_CASE_INSENSITIVE_FILE_SYSTEM 1
-#  endif
-#  define HAS_DRIVE_SPEC(f) HAS_DOS_DRIVE_SPEC (f)
-#  define IS_DIR_SEPARATOR(c) IS_DOS_DIR_SEPARATOR (c)
-#  define IS_ABSOLUTE_PATH(f) IS_DOS_ABSOLUTE_PATH (f)
-#else /* not DOSish */
-#  if defined(__APPLE__)
-#    ifndef HAVE_CASE_INSENSITIVE_FILE_SYSTEM
-#      define HAVE_CASE_INSENSITIVE_FILE_SYSTEM 1
-#    endif
-#  endif /* __APPLE__ */
-#  define HAS_DRIVE_SPEC(f) (0)
-#  define IS_DIR_SEPARATOR(c) IS_UNIX_DIR_SEPARATOR (c)
-#  define IS_ABSOLUTE_PATH(f) IS_UNIX_ABSOLUTE_PATH (f)
-#endif
-
-#define IS_DIR_SEPARATOR_1(dos_based, c)				\
-  (((c) == '/')								\
-   || (((c) == '\\') && (dos_based)))
-
-#define HAS_DRIVE_SPEC_1(dos_based, f)			\
-  ((f)[0] && ((f)[1] == ':') && (dos_based))
-
-/* Remove the drive spec from F, assuming HAS_DRIVE_SPEC (f).
-   The result is a pointer to the remainder of F.  */
-#define STRIP_DRIVE_SPEC(f)	((f) + 2)
-
-#define IS_DOS_DIR_SEPARATOR(c) IS_DIR_SEPARATOR_1 (1, c)
-#define IS_DOS_ABSOLUTE_PATH(f) IS_ABSOLUTE_PATH_1 (1, f)
-#define HAS_DOS_DRIVE_SPEC(f) HAS_DRIVE_SPEC_1 (1, f)
-
-#define IS_UNIX_DIR_SEPARATOR(c) IS_DIR_SEPARATOR_1 (0, c)
-#define IS_UNIX_ABSOLUTE_PATH(f) IS_ABSOLUTE_PATH_1 (0, f)
-
-/* Note that when DOS_BASED is true, IS_ABSOLUTE_PATH accepts d:foo as
-   well, although it is only semi-absolute.  This is because the users
-   of IS_ABSOLUTE_PATH want to know whether to prepend the current
-   working directory to a file name, which should not be done with a
-   name like d:foo.  */
-#define IS_ABSOLUTE_PATH_1(dos_based, f)		 \
-  (IS_DIR_SEPARATOR_1 (dos_based, (f)[0])		 \
-   || HAS_DRIVE_SPEC_1 (dos_based, f))
-
-extern int filename_cmp (const char *s1, const char *s2);
-#define FILENAME_CMP(s1, s2)	filename_cmp(s1, s2)
-
-extern int filename_ncmp (const char *s1, const char *s2,
-			  size_t n);
-
-extern hashval_t filename_hash (const void *s);
-
-extern int filename_eq (const void *s1, const void *s2);
-
-extern int canonical_filename_eq (const char *a, const char *b);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* FILENAMES_H */
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/hashtab.h b/rpython/rlib/rvmprof/src/shared/libbacktrace/hashtab.h
deleted file mode 100644
--- a/rpython/rlib/rvmprof/src/shared/libbacktrace/hashtab.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* An expandable hash tables datatype.  
-   Copyright (C) 1999-2015 Free Software Foundation, Inc.
-   Contributed by Vladimir Makarov (vmakarov at cygnus.com).
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-/* This package implements basic hash table functionality.  It is possible
-   to search for an entry, create an entry and destroy an entry.
-
-   Elements in the table are generic pointers.
-
-   The size of the table is not fixed; if the occupancy of the table
-   grows too high the hash table will be expanded.
-
-   The abstract data implementation is based on generalized Algorithm D
-   from Knuth's book "The art of computer programming".  Hash table is
-   expanded by creation of new hash table and transferring elements from
-   the old table to the new table.  */
-
-#ifndef __HASHTAB_H__
-#define __HASHTAB_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include "ansidecl.h"
-
-/* The type for a hash code.  */
-typedef unsigned int hashval_t;
-
-/* Callback function pointer types.  */
-
-/* Calculate hash of a table entry.  */
-typedef hashval_t (*htab_hash) (const void *);
-
-/* Compare a table entry with a possible entry.  The entry already in
-   the table always comes first, so the second element can be of a
-   different type (but in this case htab_find and htab_find_slot
-   cannot be used; instead the variants that accept a hash value
-   must be used).  */
-typedef int (*htab_eq) (const void *, const void *);
-
-/* Cleanup function called whenever a live element is removed from
-   the hash table.  */
-typedef void (*htab_del) (void *);
-  
-/* Function called by htab_traverse for each live element.  The first
-   arg is the slot of the element (which can be passed to htab_clear_slot
-   if desired), the second arg is the auxiliary pointer handed to
-   htab_traverse.  Return 1 to continue scan, 0 to stop.  */
-typedef int (*htab_trav) (void **, void *);
-
-/* Memory-allocation function, with the same functionality as calloc().
-   Iff it returns NULL, the hash table implementation will pass an error
-   code back to the user, so if your code doesn't handle errors,
-   best if you use xcalloc instead.  */
-typedef void *(*htab_alloc) (size_t, size_t);
-
-/* We also need a free() routine.  */
-typedef void (*htab_free) (void *);
-
-/* Memory allocation and deallocation; variants which take an extra
-   argument.  */
-typedef void *(*htab_alloc_with_arg) (void *, size_t, size_t);
-typedef void (*htab_free_with_arg) (void *, void *);
-
-/* This macro defines reserved value for empty table entry.  */
-
-#define HTAB_EMPTY_ENTRY    ((PTR) 0)
-
-/* This macro defines reserved value for table entry which contained
-   a deleted element. */
-
-#define HTAB_DELETED_ENTRY  ((PTR) 1)
-
-/* Hash tables are of the following type.  The structure
-   (implementation) of this type is not needed for using the hash
-   tables.  All work with hash table should be executed only through
-   functions mentioned below.  The size of this structure is subject to
-   change.  */
-
-struct htab {
-  /* Pointer to hash function.  */
-  htab_hash hash_f;
-
-  /* Pointer to comparison function.  */
-  htab_eq eq_f;
-
-  /* Pointer to cleanup function.  */
-  htab_del del_f;
-
-  /* Table itself.  */
-  void **entries;
-
-  /* Current size (in entries) of the hash table.  */
-  size_t size;
-
-  /* Current number of elements including also deleted elements.  */
-  size_t n_elements;
-
-  /* Current number of deleted elements in the table.  */
-  size_t n_deleted;
-
-  /* The following member is used for debugging. Its value is number
-     of all calls of `htab_find_slot' for the hash table. */
-  unsigned int searches;
-
-  /* The following member is used for debugging.  Its value is number
-     of collisions fixed for time of work with the hash table. */
-  unsigned int collisions;
-
-  /* Pointers to allocate/free functions.  */
-  htab_alloc alloc_f;
-  htab_free free_f;
-
-  /* Alternate allocate/free functions, which take an extra argument.  */
-  void *alloc_arg;
-  htab_alloc_with_arg alloc_with_arg_f;
-  htab_free_with_arg free_with_arg_f;
-
-  /* Current size (in entries) of the hash table, as an index into the
-     table of primes.  */
-  unsigned int size_prime_index;
-};
-
-typedef struct htab *htab_t;
-
-/* An enum saying whether we insert into the hash table or not.  */
-enum insert_option {NO_INSERT, INSERT};
-
-/* The prototypes of the package functions. */
-
-extern htab_t	htab_create_alloc  (size_t, htab_hash,
-                                    htab_eq, htab_del,
-                                    htab_alloc, htab_free);
-

From pypy.commits at gmail.com  Tue Apr  4 15:47:16 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Tue, 04 Apr 2017 12:47:16 -0700 (PDT)
Subject: [pypy-commit] pypy vmprof-multiple-eval-funcs: merge default
Message-ID: <58e3f844.04a71c0a.cccd9.3d36@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: vmprof-multiple-eval-funcs
Changeset: r90953:35bfe43fcd84
Date: 2017-04-04 14:45 -0400
http://bitbucket.org/pypy/pypy/changeset/35bfe43fcd84/

Log:	merge default

diff too long, truncating to 2000 out of 5520 lines

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/.hgignore b/.hgignore
old mode 100644
new mode 100755
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
diff --git a/dotviewer/__init__.py b/dotviewer/__init__.py
old mode 100644
new mode 100755
diff --git a/dotviewer/conftest.py b/dotviewer/conftest.py
old mode 100644
new mode 100755
diff --git a/dotviewer/drawgraph.py b/dotviewer/drawgraph.py
old mode 100644
new mode 100755
diff --git a/dotviewer/font/DroidSans-Bold.ttf b/dotviewer/font/DroidSans-Bold.ttf
old mode 100644
new mode 100755
diff --git a/dotviewer/font/DroidSans.ttf b/dotviewer/font/DroidSans.ttf
old mode 100644
new mode 100755
diff --git a/dotviewer/font/DroidSansMono.ttf b/dotviewer/font/DroidSansMono.ttf
old mode 100644
new mode 100755
diff --git a/dotviewer/font/NOTICE b/dotviewer/font/NOTICE
old mode 100644
new mode 100755
diff --git a/dotviewer/font/README.txt b/dotviewer/font/README.txt
old mode 100644
new mode 100755
diff --git a/dotviewer/graphclient.py b/dotviewer/graphclient.py
old mode 100644
new mode 100755
diff --git a/dotviewer/graphdisplay.py b/dotviewer/graphdisplay.py
old mode 100644
new mode 100755
diff --git a/dotviewer/graphpage.py b/dotviewer/graphpage.py
old mode 100644
new mode 100755
diff --git a/dotviewer/graphparse.py b/dotviewer/graphparse.py
old mode 100644
new mode 100755
diff --git a/dotviewer/msgstruct.py b/dotviewer/msgstruct.py
old mode 100644
new mode 100755
diff --git a/dotviewer/strunicode.py b/dotviewer/strunicode.py
old mode 100644
new mode 100755
diff --git a/dotviewer/test/__init__.py b/dotviewer/test/__init__.py
old mode 100644
new mode 100755
diff --git a/dotviewer/test/test_interactive.py b/dotviewer/test/test_interactive.py
old mode 100644
new mode 100755
diff --git a/dotviewer/test/test_msgstruct.py b/dotviewer/test/test_msgstruct.py
old mode 100644
new mode 100755
diff --git a/dotviewer/test/test_translator.py b/dotviewer/test/test_translator.py
old mode 100644
new mode 100755
diff --git a/extra_tests/README.txt b/extra_tests/README.txt
old mode 100644
new mode 100755
diff --git a/extra_tests/pytest.ini b/extra_tests/pytest.ini
old mode 100644
new mode 100755
diff --git a/extra_tests/test_unicode.py b/extra_tests/test_unicode.py
old mode 100644
new mode 100755
diff --git a/py/README-BEFORE-UPDATING b/py/README-BEFORE-UPDATING
old mode 100644
new mode 100755
diff --git a/py/__init__.py b/py/__init__.py
old mode 100644
new mode 100755
diff --git a/py/__metainfo.py b/py/__metainfo.py
old mode 100644
new mode 100755
diff --git a/py/_apipkg.py b/py/_apipkg.py
old mode 100644
new mode 100755
diff --git a/py/_builtin.py b/py/_builtin.py
old mode 100644
new mode 100755
diff --git a/py/_code/__init__.py b/py/_code/__init__.py
old mode 100644
new mode 100755
diff --git a/py/_code/_assertionnew.py b/py/_code/_assertionnew.py
old mode 100644
new mode 100755
diff --git a/py/_code/_assertionold.py b/py/_code/_assertionold.py
old mode 100644
new mode 100755
diff --git a/py/_code/_py2traceback.py b/py/_code/_py2traceback.py
old mode 100644
new mode 100755
diff --git a/py/_code/assertion.py b/py/_code/assertion.py
old mode 100644
new mode 100755
diff --git a/py/_code/code.py b/py/_code/code.py
old mode 100644
new mode 100755
diff --git a/py/_code/source.py b/py/_code/source.py
old mode 100644
new mode 100755
diff --git a/py/_error.py b/py/_error.py
old mode 100644
new mode 100755
diff --git a/py/_iniconfig.py b/py/_iniconfig.py
old mode 100644
new mode 100755
diff --git a/py/_io/__init__.py b/py/_io/__init__.py
old mode 100644
new mode 100755
diff --git a/py/_io/capture.py b/py/_io/capture.py
old mode 100644
new mode 100755
diff --git a/py/_io/saferepr.py b/py/_io/saferepr.py
old mode 100644
new mode 100755
diff --git a/py/_io/terminalwriter.py b/py/_io/terminalwriter.py
old mode 100644
new mode 100755
diff --git a/py/_log/__init__.py b/py/_log/__init__.py
old mode 100644
new mode 100755
diff --git a/py/_log/log.py b/py/_log/log.py
old mode 100644
new mode 100755
diff --git a/py/_log/warning.py b/py/_log/warning.py
old mode 100644
new mode 100755
diff --git a/py/_path/__init__.py b/py/_path/__init__.py
old mode 100644
new mode 100755
diff --git a/py/_path/cacheutil.py b/py/_path/cacheutil.py
old mode 100644
new mode 100755
diff --git a/py/_path/common.py b/py/_path/common.py
old mode 100644
new mode 100755
diff --git a/py/_path/local.py b/py/_path/local.py
old mode 100644
new mode 100755
diff --git a/py/_path/svnurl.py b/py/_path/svnurl.py
old mode 100644
new mode 100755
diff --git a/py/_path/svnwc.py b/py/_path/svnwc.py
old mode 100644
new mode 100755
diff --git a/py/_process/__init__.py b/py/_process/__init__.py
old mode 100644
new mode 100755
diff --git a/py/_process/cmdexec.py b/py/_process/cmdexec.py
old mode 100644
new mode 100755
diff --git a/py/_process/forkedfunc.py b/py/_process/forkedfunc.py
old mode 100644
new mode 100755
diff --git a/py/_process/killproc.py b/py/_process/killproc.py
old mode 100644
new mode 100755
diff --git a/py/_std.py b/py/_std.py
old mode 100644
new mode 100755
diff --git a/py/_xmlgen.py b/py/_xmlgen.py
old mode 100644
new mode 100755
diff --git a/py/test.py b/py/test.py
old mode 100644
new mode 100755
diff --git a/pypy/__init__.py b/pypy/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/bin/pypy_interact b/pypy/bin/pypy_interact
old mode 100644
new mode 100755
diff --git a/pypy/config/__init__.py b/pypy/config/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/config/makerestdoc.py b/pypy/config/makerestdoc.py
old mode 100644
new mode 100755
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
old mode 100644
new mode 100755
diff --git a/pypy/config/test/__init__.py b/pypy/config/test/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/config/test/test_makerestdoc.py b/pypy/config/test/test_makerestdoc.py
old mode 100644
new mode 100755
diff --git a/pypy/config/test/test_pypyoption.py b/pypy/config/test/test_pypyoption.py
old mode 100644
new mode 100755
diff --git a/pypy/conftest.py b/pypy/conftest.py
old mode 100644
new mode 100755
diff --git a/pypy/doc/Makefile b/pypy/doc/Makefile
old mode 100644
new mode 100755
diff --git a/pypy/doc/TODO b/pypy/doc/TODO
old mode 100644
new mode 100755
diff --git a/pypy/doc/__init__.py b/pypy/doc/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/doc/__pypy__-module.rst b/pypy/doc/__pypy__-module.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/architecture.rst b/pypy/doc/architecture.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/build.rst b/pypy/doc/build.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/coding-guide.rst b/pypy/doc/coding-guide.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/commandline_ref.rst b/pypy/doc/commandline_ref.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/__init__.py b/pypy/doc/config/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/commandline.txt b/pypy/doc/config/commandline.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/generate.py b/pypy/doc/config/generate.py
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/index.rst b/pypy/doc/config/index.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/makemodules.py b/pypy/doc/config/makemodules.py
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/mergedblocks.png b/pypy/doc/config/mergedblocks.png
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.allworkingmodules.txt b/pypy/doc/config/objspace.allworkingmodules.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.disable_call_speedhacks.txt b/pypy/doc/config/objspace.disable_call_speedhacks.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.extmodules.txt b/pypy/doc/config/objspace.extmodules.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.geninterp.txt b/pypy/doc/config/objspace.geninterp.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.honor__builtins__.txt b/pypy/doc/config/objspace.honor__builtins__.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.lonepycfiles.txt b/pypy/doc/config/objspace.lonepycfiles.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.nofaking.txt b/pypy/doc/config/objspace.nofaking.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.soabi.txt b/pypy/doc/config/objspace.soabi.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.intshortcut.txt b/pypy/doc/config/objspace.std.intshortcut.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.methodcachesizeexp.txt b/pypy/doc/config/objspace.std.methodcachesizeexp.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.newshortcut.txt b/pypy/doc/config/objspace.std.newshortcut.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.optimized_comparison_op.txt b/pypy/doc/config/objspace.std.optimized_comparison_op.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.optimized_list_getitem.txt b/pypy/doc/config/objspace.std.optimized_list_getitem.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.prebuiltintfrom.txt b/pypy/doc/config/objspace.std.prebuiltintfrom.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.prebuiltintto.txt b/pypy/doc/config/objspace.std.prebuiltintto.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.sharesmallstr.txt b/pypy/doc/config/objspace.std.sharesmallstr.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.txt b/pypy/doc/config/objspace.std.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.withcelldict.txt b/pypy/doc/config/objspace.std.withcelldict.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.withliststrategies.txt b/pypy/doc/config/objspace.std.withliststrategies.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.withmethodcachecounter.txt b/pypy/doc/config/objspace.std.withmethodcachecounter.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.withprebuiltint.txt b/pypy/doc/config/objspace.std.withprebuiltint.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.withsmalllong.txt b/pypy/doc/config/objspace.std.withsmalllong.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.withsmalltuple.txt b/pypy/doc/config/objspace.std.withsmalltuple.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.withspecialisedtuple.txt b/pypy/doc/config/objspace.std.withspecialisedtuple.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.withstrbuf.txt b/pypy/doc/config/objspace.std.withstrbuf.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.std.withtproxy.txt b/pypy/doc/config/objspace.std.withtproxy.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.translationmodules.txt b/pypy/doc/config/objspace.translationmodules.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.txt b/pypy/doc/config/objspace.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.__builtin__.txt b/pypy/doc/config/objspace.usemodules.__builtin__.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.__pypy__.txt b/pypy/doc/config/objspace.usemodules.__pypy__.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._ast.txt b/pypy/doc/config/objspace.usemodules._ast.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._cffi_backend.txt b/pypy/doc/config/objspace.usemodules._cffi_backend.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._codecs.txt b/pypy/doc/config/objspace.usemodules._codecs.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._collections.txt b/pypy/doc/config/objspace.usemodules._collections.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._continuation.txt b/pypy/doc/config/objspace.usemodules._continuation.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._csv.txt b/pypy/doc/config/objspace.usemodules._csv.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._demo.txt b/pypy/doc/config/objspace.usemodules._demo.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._ffi.txt b/pypy/doc/config/objspace.usemodules._ffi.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._file.txt b/pypy/doc/config/objspace.usemodules._file.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._hashlib.txt b/pypy/doc/config/objspace.usemodules._hashlib.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._io.txt b/pypy/doc/config/objspace.usemodules._io.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._locale.txt b/pypy/doc/config/objspace.usemodules._locale.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._lsprof.txt b/pypy/doc/config/objspace.usemodules._lsprof.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._md5.txt b/pypy/doc/config/objspace.usemodules._md5.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._minimal_curses.txt b/pypy/doc/config/objspace.usemodules._minimal_curses.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._multibytecodec.txt b/pypy/doc/config/objspace.usemodules._multibytecodec.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._multiprocessing.txt b/pypy/doc/config/objspace.usemodules._multiprocessing.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._pickle_support.txt b/pypy/doc/config/objspace.usemodules._pickle_support.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._pypyjson.txt b/pypy/doc/config/objspace.usemodules._pypyjson.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._random.txt b/pypy/doc/config/objspace.usemodules._random.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._rawffi.txt b/pypy/doc/config/objspace.usemodules._rawffi.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._sha.txt b/pypy/doc/config/objspace.usemodules._sha.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._socket.txt b/pypy/doc/config/objspace.usemodules._socket.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._sre.txt b/pypy/doc/config/objspace.usemodules._sre.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._ssl.txt b/pypy/doc/config/objspace.usemodules._ssl.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._testing.txt b/pypy/doc/config/objspace.usemodules._testing.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._vmprof.txt b/pypy/doc/config/objspace.usemodules._vmprof.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._warnings.txt b/pypy/doc/config/objspace.usemodules._warnings.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._weakref.txt b/pypy/doc/config/objspace.usemodules._weakref.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules._winreg.txt b/pypy/doc/config/objspace.usemodules._winreg.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.array.txt b/pypy/doc/config/objspace.usemodules.array.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.binascii.txt b/pypy/doc/config/objspace.usemodules.binascii.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.bz2.txt b/pypy/doc/config/objspace.usemodules.bz2.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.cStringIO.txt b/pypy/doc/config/objspace.usemodules.cStringIO.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.cmath.txt b/pypy/doc/config/objspace.usemodules.cmath.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.cppyy.txt b/pypy/doc/config/objspace.usemodules.cppyy.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.cpyext.txt b/pypy/doc/config/objspace.usemodules.cpyext.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.crypt.txt b/pypy/doc/config/objspace.usemodules.crypt.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.errno.txt b/pypy/doc/config/objspace.usemodules.errno.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.exceptions.txt b/pypy/doc/config/objspace.usemodules.exceptions.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.fcntl.txt b/pypy/doc/config/objspace.usemodules.fcntl.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.gc.txt b/pypy/doc/config/objspace.usemodules.gc.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.imp.txt b/pypy/doc/config/objspace.usemodules.imp.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.itertools.txt b/pypy/doc/config/objspace.usemodules.itertools.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.marshal.txt b/pypy/doc/config/objspace.usemodules.marshal.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.math.txt b/pypy/doc/config/objspace.usemodules.math.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.micronumpy.txt b/pypy/doc/config/objspace.usemodules.micronumpy.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.mmap.txt b/pypy/doc/config/objspace.usemodules.mmap.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.operator.txt b/pypy/doc/config/objspace.usemodules.operator.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.parser.txt b/pypy/doc/config/objspace.usemodules.parser.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.posix.txt b/pypy/doc/config/objspace.usemodules.posix.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.pwd.txt b/pypy/doc/config/objspace.usemodules.pwd.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.pyexpat.txt b/pypy/doc/config/objspace.usemodules.pyexpat.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.pypyjit.txt b/pypy/doc/config/objspace.usemodules.pypyjit.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.rbench.txt b/pypy/doc/config/objspace.usemodules.rbench.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.select.txt b/pypy/doc/config/objspace.usemodules.select.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.signal.txt b/pypy/doc/config/objspace.usemodules.signal.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.struct.txt b/pypy/doc/config/objspace.usemodules.struct.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.symbol.txt b/pypy/doc/config/objspace.usemodules.symbol.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.sys.txt b/pypy/doc/config/objspace.usemodules.sys.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.termios.txt b/pypy/doc/config/objspace.usemodules.termios.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.thread.txt b/pypy/doc/config/objspace.usemodules.thread.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.time.txt b/pypy/doc/config/objspace.usemodules.time.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.token.txt b/pypy/doc/config/objspace.usemodules.token.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.txt b/pypy/doc/config/objspace.usemodules.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.unicodedata.txt b/pypy/doc/config/objspace.usemodules.unicodedata.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.zipimport.txt b/pypy/doc/config/objspace.usemodules.zipimport.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usemodules.zlib.txt b/pypy/doc/config/objspace.usemodules.zlib.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/objspace.usepycfiles.txt b/pypy/doc/config/objspace.usepycfiles.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/opt.rst b/pypy/doc/config/opt.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backend.txt b/pypy/doc/config/translation.backend.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.clever_malloc_removal.txt b/pypy/doc/config/translation.backendopt.clever_malloc_removal.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.clever_malloc_removal_heuristic.txt b/pypy/doc/config/translation.backendopt.clever_malloc_removal_heuristic.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.clever_malloc_removal_threshold.txt b/pypy/doc/config/translation.backendopt.clever_malloc_removal_threshold.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.constfold.txt b/pypy/doc/config/translation.backendopt.constfold.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.inline.txt b/pypy/doc/config/translation.backendopt.inline.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.inline_heuristic.txt b/pypy/doc/config/translation.backendopt.inline_heuristic.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.inline_threshold.txt b/pypy/doc/config/translation.backendopt.inline_threshold.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.mallocs.txt b/pypy/doc/config/translation.backendopt.mallocs.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.merge_if_blocks.txt b/pypy/doc/config/translation.backendopt.merge_if_blocks.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.none.txt b/pypy/doc/config/translation.backendopt.none.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.print_statistics.txt b/pypy/doc/config/translation.backendopt.print_statistics.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.profile_based_inline.txt b/pypy/doc/config/translation.backendopt.profile_based_inline.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.profile_based_inline_heuristic.txt b/pypy/doc/config/translation.backendopt.profile_based_inline_heuristic.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.profile_based_inline_threshold.txt b/pypy/doc/config/translation.backendopt.profile_based_inline_threshold.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.raisingop2direct_call.txt b/pypy/doc/config/translation.backendopt.raisingop2direct_call.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.really_remove_asserts.txt b/pypy/doc/config/translation.backendopt.really_remove_asserts.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.remove_asserts.txt b/pypy/doc/config/translation.backendopt.remove_asserts.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.stack_optimization.txt b/pypy/doc/config/translation.backendopt.stack_optimization.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.storesink.txt b/pypy/doc/config/translation.backendopt.storesink.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.backendopt.txt b/pypy/doc/config/translation.backendopt.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.builtins_can_raise_exceptions.txt b/pypy/doc/config/translation.builtins_can_raise_exceptions.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.cc.txt b/pypy/doc/config/translation.cc.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.check_str_without_nul.txt b/pypy/doc/config/translation.check_str_without_nul.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.cli.exception_transformer.txt b/pypy/doc/config/translation.cli.exception_transformer.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.cli.txt b/pypy/doc/config/translation.cli.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.compilerflags.txt b/pypy/doc/config/translation.compilerflags.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.continuation.txt b/pypy/doc/config/translation.continuation.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.countmallocs.txt b/pypy/doc/config/translation.countmallocs.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.debug.txt b/pypy/doc/config/translation.debug.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.dont_write_c_files.txt b/pypy/doc/config/translation.dont_write_c_files.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.dump_static_data_info.txt b/pypy/doc/config/translation.dump_static_data_info.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.fork_before.txt b/pypy/doc/config/translation.fork_before.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.gc.txt b/pypy/doc/config/translation.gc.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.gcremovetypeptr.txt b/pypy/doc/config/translation.gcremovetypeptr.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.gcrootfinder.txt b/pypy/doc/config/translation.gcrootfinder.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.gctransformer.txt b/pypy/doc/config/translation.gctransformer.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.icon.txt b/pypy/doc/config/translation.icon.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.instrument.txt b/pypy/doc/config/translation.instrument.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.instrumentctl.txt b/pypy/doc/config/translation.instrumentctl.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.jit.txt b/pypy/doc/config/translation.jit.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.jit_backend.txt b/pypy/doc/config/translation.jit_backend.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.jit_ffi.txt b/pypy/doc/config/translation.jit_ffi.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.jit_profiler.txt b/pypy/doc/config/translation.jit_profiler.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.linkerflags.txt b/pypy/doc/config/translation.linkerflags.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.list_comprehension_operations.txt b/pypy/doc/config/translation.list_comprehension_operations.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.lldebug.txt b/pypy/doc/config/translation.lldebug.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.lldebug0.txt b/pypy/doc/config/translation.lldebug0.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.log.txt b/pypy/doc/config/translation.log.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.make_jobs.txt b/pypy/doc/config/translation.make_jobs.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.no__thread.txt b/pypy/doc/config/translation.no__thread.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.noprofopt.txt b/pypy/doc/config/translation.noprofopt.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.output.txt b/pypy/doc/config/translation.output.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.platform.txt b/pypy/doc/config/translation.platform.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.profopt.txt b/pypy/doc/config/translation.profopt.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.rweakref.txt b/pypy/doc/config/translation.rweakref.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.sandbox.txt b/pypy/doc/config/translation.sandbox.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.secondaryentrypoints.txt b/pypy/doc/config/translation.secondaryentrypoints.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.shared.txt b/pypy/doc/config/translation.shared.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.simplifying.txt b/pypy/doc/config/translation.simplifying.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.taggedpointers.txt b/pypy/doc/config/translation.taggedpointers.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.thread.txt b/pypy/doc/config/translation.thread.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.txt b/pypy/doc/config/translation.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.type_system.txt b/pypy/doc/config/translation.type_system.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.vanilla.txt b/pypy/doc/config/translation.vanilla.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.verbose.txt b/pypy/doc/config/translation.verbose.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/translation.withsmallfuncsets.txt b/pypy/doc/config/translation.withsmallfuncsets.txt
old mode 100644
new mode 100755
diff --git a/pypy/doc/config/unmergedblocks.png b/pypy/doc/config/unmergedblocks.png
old mode 100644
new mode 100755
diff --git a/pypy/doc/configuration.rst b/pypy/doc/configuration.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/contributor.rst b/pypy/doc/contributor.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/cppyy.rst b/pypy/doc/cppyy.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/cppyy_example.rst b/pypy/doc/cppyy_example.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/cpython_differences.rst b/pypy/doc/cpython_differences.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/dev_method.rst b/pypy/doc/dev_method.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/dir-reference.rst b/pypy/doc/dir-reference.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/discussion/ctypes-implementation.rst b/pypy/doc/discussion/ctypes-implementation.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/discussion/finalizer-order.rst b/pypy/doc/discussion/finalizer-order.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/discussion/howtoimplementpickling.rst b/pypy/doc/discussion/howtoimplementpickling.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/discussion/improve-rpython.rst b/pypy/doc/discussion/improve-rpython.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/discussion/jit-profiler.rst b/pypy/doc/discussion/jit-profiler.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/discussion/rawrefcount.rst b/pypy/doc/discussion/rawrefcount.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/discussions.rst b/pypy/doc/discussions.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/embedding.rst b/pypy/doc/embedding.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/eventhistory.rst b/pypy/doc/eventhistory.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/extending.rst b/pypy/doc/extending.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/extradoc.rst b/pypy/doc/extradoc.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/faq.rst b/pypy/doc/faq.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/gc_info.rst b/pypy/doc/gc_info.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/getting-started-dev.rst b/pypy/doc/getting-started-dev.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/glossary.rst b/pypy/doc/glossary.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/how-to-contribute.rst b/pypy/doc/how-to-contribute.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/JIT.dot b/pypy/doc/image/JIT.dot
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/arch-impllevels.graffle b/pypy/doc/image/arch-impllevels.graffle
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/arch-impllevels.pdf b/pypy/doc/image/arch-impllevels.pdf
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/arch-jit-gen.graffle b/pypy/doc/image/arch-jit-gen.graffle
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/arch-jit-gen.pdf b/pypy/doc/image/arch-jit-gen.pdf
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/arch-pypy-basic.graffle b/pypy/doc/image/arch-pypy-basic.graffle
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/arch-pypy-basic.pdf b/pypy/doc/image/arch-pypy-basic.pdf
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/arch-translation.graffle b/pypy/doc/image/arch-translation.graffle
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/arch-translation.pdf b/pypy/doc/image/arch-translation.pdf
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/bpnn_callgraph.png b/pypy/doc/image/bpnn_callgraph.png
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/bpnn_update_detail.png b/pypy/doc/image/bpnn_update_detail.png
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/compat-matrix.png b/pypy/doc/image/compat-matrix.png
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/compat-matrix.sxc b/pypy/doc/image/compat-matrix.sxc
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/jitdata-interpreter.dot b/pypy/doc/image/jitdata-interpreter.dot
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/jitviewer.png b/pypy/doc/image/jitviewer.png
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/lattice1.dot b/pypy/doc/image/lattice1.dot
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/lattice2.dot b/pypy/doc/image/lattice2.dot
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/lattice3.dot b/pypy/doc/image/lattice3.dot
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/merge-split.dot b/pypy/doc/image/merge-split.dot
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/stackless.dot b/pypy/doc/image/stackless.dot
old mode 100644
new mode 100755
diff --git a/pypy/doc/image/stackless_informal.dot b/pypy/doc/image/stackless_informal.dot
old mode 100644
new mode 100755
diff --git a/pypy/doc/index-of-release-notes.rst b/pypy/doc/index-of-release-notes.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/index-of-whatsnew.rst b/pypy/doc/index-of-whatsnew.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/index-report.rst b/pypy/doc/index-report.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/index.rst b/pypy/doc/index.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/install.rst b/pypy/doc/install.rst
old mode 100644
new mode 100755
--- a/pypy/doc/install.rst
+++ b/pypy/doc/install.rst
@@ -32,10 +32,10 @@
 
 .. code-block:: console
 
-    $ tar xf pypy-2.1.tar.bz2
-    $ ./pypy-2.1/bin/pypy
-    Python 2.7.3 (480845e6b1dd, Jul 31 2013, 11:05:31)
-    [PyPy 2.1.0 with GCC 4.4.3] on linux2
+    $ tar xf pypy-x.y.z.tar.bz2
+    $ ./pypy-x.y.z/bin/pypy
+    Python 2.7.x (xxxxxxxxxxxx, Date, Time)
+    [PyPy x.y.z with GCC x.y.z] on linux2
     Type "help", "copyright", "credits" or "license" for more information.
     And now for something completely different: ``PyPy is an exciting technology
     that lets you to write fast, portable, multi-platform interpreters with less
diff --git a/pypy/doc/interpreter-optimizations.rst b/pypy/doc/interpreter-optimizations.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/interpreter.rst b/pypy/doc/interpreter.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/introduction.rst b/pypy/doc/introduction.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/jit-hooks.rst b/pypy/doc/jit-hooks.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/make.bat b/pypy/doc/make.bat
old mode 100644
new mode 100755
diff --git a/pypy/doc/man/pypy.1.rst b/pypy/doc/man/pypy.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/objspace-proxies.rst b/pypy/doc/objspace-proxies.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/objspace.rst b/pypy/doc/objspace.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/parser.rst b/pypy/doc/parser.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/project-documentation.rst b/pypy/doc/project-documentation.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/project-ideas.rst b/pypy/doc/project-ideas.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/pypyconfig.py b/pypy/doc/pypyconfig.py
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-0.6.rst b/pypy/doc/release-0.6.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-0.7.0.rst b/pypy/doc/release-0.7.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-0.8.0.rst b/pypy/doc/release-0.8.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-0.9.0.rst b/pypy/doc/release-0.9.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-0.99.0.rst b/pypy/doc/release-0.99.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-1.0.0.rst b/pypy/doc/release-1.0.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-1.1.0.rst b/pypy/doc/release-1.1.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-1.2.0.rst b/pypy/doc/release-1.2.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-1.3.0.rst b/pypy/doc/release-1.3.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-1.4.0.rst b/pypy/doc/release-1.4.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-1.4.0beta.rst b/pypy/doc/release-1.4.0beta.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-1.4.1.rst b/pypy/doc/release-1.4.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-1.5.0.rst b/pypy/doc/release-1.5.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-1.6.0.rst b/pypy/doc/release-1.6.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-1.7.0.rst b/pypy/doc/release-1.7.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-1.8.0.rst b/pypy/doc/release-1.8.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-1.9.0.rst b/pypy/doc/release-1.9.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.0.0-beta1.rst b/pypy/doc/release-2.0.0-beta1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.0.0-beta2.rst b/pypy/doc/release-2.0.0-beta2.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.0.0.rst b/pypy/doc/release-2.0.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.0.1.rst b/pypy/doc/release-2.0.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.0.2.rst b/pypy/doc/release-2.0.2.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.1.0-beta1.rst b/pypy/doc/release-2.1.0-beta1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.1.0-beta2.rst b/pypy/doc/release-2.1.0-beta2.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.1.0.rst b/pypy/doc/release-2.1.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.2.0.rst b/pypy/doc/release-2.2.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.2.1.rst b/pypy/doc/release-2.2.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.3.0.rst b/pypy/doc/release-2.3.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.3.1.rst b/pypy/doc/release-2.3.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.4.0.rst b/pypy/doc/release-2.4.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.5.0.rst b/pypy/doc/release-2.5.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.5.1.rst b/pypy/doc/release-2.5.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.6.0.rst b/pypy/doc/release-2.6.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-2.6.1.rst b/pypy/doc/release-2.6.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-4.0.0.rst b/pypy/doc/release-4.0.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-4.0.1.rst b/pypy/doc/release-4.0.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-5.0.0.rst b/pypy/doc/release-5.0.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-5.0.1.rst b/pypy/doc/release-5.0.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-5.1.0.rst b/pypy/doc/release-5.1.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-5.1.1.rst b/pypy/doc/release-5.1.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-pypy2.7-v5.3.0.rst b/pypy/doc/release-pypy2.7-v5.3.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-pypy2.7-v5.3.1.rst b/pypy/doc/release-pypy2.7-v5.3.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-pypy2.7-v5.4.0.rst b/pypy/doc/release-pypy2.7-v5.4.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-pypy2.7-v5.4.1.rst b/pypy/doc/release-pypy2.7-v5.4.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-pypy2.7-v5.6.0.rst b/pypy/doc/release-pypy2.7-v5.6.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-pypy3-2.1.0-beta1.rst b/pypy/doc/release-pypy3-2.1.0-beta1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-pypy3-2.3.1.rst b/pypy/doc/release-pypy3-2.3.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-pypy3-2.4.0.rst b/pypy/doc/release-pypy3-2.4.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-pypy3.3-v5.2-alpha1.rst b/pypy/doc/release-pypy3.3-v5.2-alpha1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-pypy3.3-v5.5.0.rst b/pypy/doc/release-pypy3.3-v5.5.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-v5.7.0.rst b/pypy/doc/release-v5.7.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/release-v5.7.1.rst b/pypy/doc/release-v5.7.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/sandbox.rst b/pypy/doc/sandbox.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/sprint-reports.rst b/pypy/doc/sprint-reports.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/stackless.rst b/pypy/doc/stackless.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/stm.rst b/pypy/doc/stm.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/test/test_whatsnew.py b/pypy/doc/test/test_whatsnew.py
old mode 100644
new mode 100755
diff --git a/pypy/doc/tool/__init__.py b/pypy/doc/tool/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/doc/tool/makecontributor.py b/pypy/doc/tool/makecontributor.py
old mode 100644
new mode 100755
diff --git a/pypy/doc/tool/mydot.py b/pypy/doc/tool/mydot.py
old mode 100644
new mode 100755
diff --git a/pypy/doc/video-index.rst b/pypy/doc/video-index.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-1.9.rst b/pypy/doc/whatsnew-1.9.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-2.0.0-beta1.rst b/pypy/doc/whatsnew-2.0.0-beta1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-2.0.rst b/pypy/doc/whatsnew-2.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-2.1.rst b/pypy/doc/whatsnew-2.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-2.2.rst b/pypy/doc/whatsnew-2.2.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-2.3.0.rst b/pypy/doc/whatsnew-2.3.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-2.3.1.rst b/pypy/doc/whatsnew-2.3.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-2.4.0.rst b/pypy/doc/whatsnew-2.4.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-2.5.0.rst b/pypy/doc/whatsnew-2.5.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-2.5.1.rst b/pypy/doc/whatsnew-2.5.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-2.6.0.rst b/pypy/doc/whatsnew-2.6.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-2.6.1.rst b/pypy/doc/whatsnew-2.6.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-4.0.0.rst b/pypy/doc/whatsnew-4.0.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-4.0.1.rst b/pypy/doc/whatsnew-4.0.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-5.0.0.rst b/pypy/doc/whatsnew-5.0.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-5.1.0.rst b/pypy/doc/whatsnew-5.1.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-pypy2-5.3.0.rst b/pypy/doc/whatsnew-pypy2-5.3.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-pypy2-5.3.1.rst b/pypy/doc/whatsnew-pypy2-5.3.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-pypy2-5.4.0.rst b/pypy/doc/whatsnew-pypy2-5.4.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-pypy2-5.6.0.rst b/pypy/doc/whatsnew-pypy2-5.6.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-pypy2-5.7.0.rst b/pypy/doc/whatsnew-pypy2-5.7.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-pypy3-2.3.1.rst b/pypy/doc/whatsnew-pypy3-2.3.1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-pypy3-2.4.0.rst b/pypy/doc/whatsnew-pypy3-2.4.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-pypy3-5.1.1-alpha1.rst b/pypy/doc/whatsnew-pypy3-5.1.1-alpha1.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-pypy3-5.5.0.rst b/pypy/doc/whatsnew-pypy3-5.5.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-pypy3-5.7.0.rst b/pypy/doc/whatsnew-pypy3-5.7.0.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
old mode 100644
new mode 100755
diff --git a/pypy/doc/you-want-to-help.rst b/pypy/doc/you-want-to-help.rst
old mode 100644
new mode 100755
diff --git a/pypy/goal/__init__.py b/pypy/goal/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/goal/pypy.ico b/pypy/goal/pypy.ico
old mode 100644
new mode 100755
diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/__init__.py b/pypy/interpreter/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/argument.py b/pypy/interpreter/argument.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/__init__.py b/pypy/interpreter/astcompiler/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/assemble.py b/pypy/interpreter/astcompiler/assemble.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/ast.py b/pypy/interpreter/astcompiler/ast.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/astbuilder.py b/pypy/interpreter/astcompiler/astbuilder.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/asthelpers.py b/pypy/interpreter/astcompiler/asthelpers.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/codegen.py b/pypy/interpreter/astcompiler/codegen.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/consts.py b/pypy/interpreter/astcompiler/consts.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/misc.py b/pypy/interpreter/astcompiler/misc.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/optimize.py b/pypy/interpreter/astcompiler/optimize.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/symtable.py b/pypy/interpreter/astcompiler/symtable.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/test/__init__.py b/pypy/interpreter/astcompiler/test/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/test/stdlib_testall.py b/pypy/interpreter/astcompiler/test/stdlib_testall.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/test/test_ast.py b/pypy/interpreter/astcompiler/test/test_ast.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/test/test_astbuilder.py b/pypy/interpreter/astcompiler/test/test_astbuilder.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py b/pypy/interpreter/astcompiler/test/test_compiler.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/test/test_misc.py b/pypy/interpreter/astcompiler/test/test_misc.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/test/test_symtable.py b/pypy/interpreter/astcompiler/test/test_symtable.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/tools/Python.asdl b/pypy/interpreter/astcompiler/tools/Python.asdl
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/tools/asdl.py b/pypy/interpreter/astcompiler/tools/asdl.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/astcompiler/tools/asdl_py.py b/pypy/interpreter/astcompiler/tools/asdl_py.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/debug.py b/pypy/interpreter/debug.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/eval.py b/pypy/interpreter/eval.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/executioncontext.py b/pypy/interpreter/executioncontext.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/function.py b/pypy/interpreter/function.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/gateway.py b/pypy/interpreter/gateway.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/generator.py b/pypy/interpreter/generator.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/interactive.py b/pypy/interpreter/interactive.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/main.py b/pypy/interpreter/main.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/miscutils.py b/pypy/interpreter/miscutils.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/mixedmodule.py b/pypy/interpreter/mixedmodule.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/module.py b/pypy/interpreter/module.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/nestedscope.py b/pypy/interpreter/nestedscope.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pycode.py b/pypy/interpreter/pycode.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pycompiler.py b/pypy/interpreter/pycompiler.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyframe.py b/pypy/interpreter/pyframe.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/__init__.py b/pypy/interpreter/pyparser/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/automata.py b/pypy/interpreter/pyparser/automata.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/data/Grammar2.5 b/pypy/interpreter/pyparser/data/Grammar2.5
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/data/Grammar2.7 b/pypy/interpreter/pyparser/data/Grammar2.7
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/error.py b/pypy/interpreter/pyparser/error.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/future.py b/pypy/interpreter/pyparser/future.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/metaparser.py b/pypy/interpreter/pyparser/metaparser.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/parser.py b/pypy/interpreter/pyparser/parser.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/parsestring.py b/pypy/interpreter/pyparser/parsestring.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/pygram.py b/pypy/interpreter/pyparser/pygram.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/pylexer.py b/pypy/interpreter/pyparser/pylexer.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/pyparse.py b/pypy/interpreter/pyparser/pyparse.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/pytoken.py b/pypy/interpreter/pyparser/pytoken.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/pytokenize.py b/pypy/interpreter/pyparser/pytokenize.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/pytokenizer.py b/pypy/interpreter/pyparser/pytokenizer.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/test/__init__.py b/pypy/interpreter/pyparser/test/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/test/expressions.py b/pypy/interpreter/pyparser/test/expressions.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/test/test_automata.py b/pypy/interpreter/pyparser/test/test_automata.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/test/test_future.py b/pypy/interpreter/pyparser/test/test_future.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/test/test_gendfa.py b/pypy/interpreter/pyparser/test/test_gendfa.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/test/test_metaparser.py b/pypy/interpreter/pyparser/test/test_metaparser.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/test/test_parser.py b/pypy/interpreter/pyparser/test/test_parser.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/test/test_parsestring.py b/pypy/interpreter/pyparser/test/test_parsestring.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/test/test_pyparse.py b/pypy/interpreter/pyparser/test/test_pyparse.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pyparser/test/unittest_samples.py b/pypy/interpreter/pyparser/test/unittest_samples.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/pytraceback.py b/pypy/interpreter/pytraceback.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/signature.py b/pypy/interpreter/signature.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/special.py b/pypy/interpreter/special.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/streamutil.py b/pypy/interpreter/streamutil.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/__init__.py b/pypy/interpreter/test/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/demomixedmod/__init__.py b/pypy/interpreter/test/demomixedmod/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/demomixedmod/file1.py b/pypy/interpreter/test/demomixedmod/file1.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/demomixedmod/file2_app.py b/pypy/interpreter/test/demomixedmod/file2_app.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/foointerp.py b/pypy/interpreter/test/foointerp.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/hello_world.py b/pypy/interpreter/test/hello_world.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/mymodule.py b/pypy/interpreter/test/mymodule.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/s1.py b/pypy/interpreter/test/s1.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_app_main.py b/pypy/interpreter/test/test_app_main.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_appinterp.py b/pypy/interpreter/test/test_appinterp.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_argument.py b/pypy/interpreter/test/test_argument.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_class.py b/pypy/interpreter/test/test_class.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_code.py b/pypy/interpreter/test/test_code.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_compiler.py b/pypy/interpreter/test/test_compiler.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_descrtypecheck.py b/pypy/interpreter/test/test_descrtypecheck.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_error.py b/pypy/interpreter/test/test_error.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_exceptcomp.py b/pypy/interpreter/test/test_exceptcomp.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_exec.py b/pypy/interpreter/test/test_exec.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_executioncontext.py b/pypy/interpreter/test/test_executioncontext.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_extmodules.py b/pypy/interpreter/test/test_extmodules.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_function.py b/pypy/interpreter/test/test_function.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_gateway.py b/pypy/interpreter/test/test_gateway.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_generator.py b/pypy/interpreter/test/test_generator.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_interpreter.py b/pypy/interpreter/test/test_interpreter.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_main.py b/pypy/interpreter/test/test_main.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_mixedmodule.py b/pypy/interpreter/test/test_mixedmodule.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_module.py b/pypy/interpreter/test/test_module.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_nestedscope.py b/pypy/interpreter/test/test_nestedscope.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_objspace.py b/pypy/interpreter/test/test_objspace.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_pyframe.py b/pypy/interpreter/test/test_pyframe.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_raise.py b/pypy/interpreter/test/test_raise.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_special.py b/pypy/interpreter/test/test_special.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_syntax.py b/pypy/interpreter/test/test_syntax.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_targetpypy.py b/pypy/interpreter/test/test_targetpypy.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_typedef.py b/pypy/interpreter/test/test_typedef.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_unicodehelper.py b/pypy/interpreter/test/test_unicodehelper.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_zpy.py b/pypy/interpreter/test/test_zpy.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/test/test_zzpickle_and_slow.py b/pypy/interpreter/test/test_zzpickle_and_slow.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
old mode 100644
new mode 100755
diff --git a/pypy/interpreter/unicodehelper.py b/pypy/interpreter/unicodehelper.py
old mode 100644
new mode 100755
diff --git a/pypy/module/README.txt b/pypy/module/README.txt
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/__init__.py b/pypy/module/__builtin__/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/abstractinst.py b/pypy/module/__builtin__/abstractinst.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/app_functional.py b/pypy/module/__builtin__/app_functional.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/app_inspect.py b/pypy/module/__builtin__/app_inspect.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/app_io.py b/pypy/module/__builtin__/app_io.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/app_operation.py b/pypy/module/__builtin__/app_operation.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/compiling.py b/pypy/module/__builtin__/compiling.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/descriptor.py b/pypy/module/__builtin__/descriptor.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/functional.py b/pypy/module/__builtin__/functional.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/interp_classobj.py b/pypy/module/__builtin__/interp_classobj.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/interp_inspect.py b/pypy/module/__builtin__/interp_inspect.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/operation.py b/pypy/module/__builtin__/operation.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/state.py b/pypy/module/__builtin__/state.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/__init__.py b/pypy/module/__builtin__/test/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_abstractinst.py b/pypy/module/__builtin__/test/test_abstractinst.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_apply.py b/pypy/module/__builtin__/test/test_apply.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_builtin.py b/pypy/module/__builtin__/test/test_builtin.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_classobj.py b/pypy/module/__builtin__/test/test_classobj.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_compile.py b/pypy/module/__builtin__/test/test_compile.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_descriptor.py b/pypy/module/__builtin__/test/test_descriptor.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_filter.py b/pypy/module/__builtin__/test/test_filter.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_functional.py b/pypy/module/__builtin__/test/test_functional.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_minmax.py b/pypy/module/__builtin__/test/test_minmax.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_range.py b/pypy/module/__builtin__/test/test_range.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_rawinput.py b/pypy/module/__builtin__/test/test_rawinput.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_reduce.py b/pypy/module/__builtin__/test/test_reduce.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_vars.py b/pypy/module/__builtin__/test/test_vars.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__builtin__/test/test_zip.py b/pypy/module/__builtin__/test/test_zip.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__init__.py b/pypy/module/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/__init__.py b/pypy/module/__pypy__/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/app_signal.py b/pypy/module/__pypy__/app_signal.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/bytebuffer.py b/pypy/module/__pypy__/bytebuffer.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/interp_builders.py b/pypy/module/__pypy__/interp_builders.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/interp_debug.py b/pypy/module/__pypy__/interp_debug.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/interp_dict.py b/pypy/module/__pypy__/interp_dict.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/interp_identitydict.py b/pypy/module/__pypy__/interp_identitydict.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/interp_intop.py b/pypy/module/__pypy__/interp_intop.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/interp_magic.py b/pypy/module/__pypy__/interp_magic.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/interp_os.py b/pypy/module/__pypy__/interp_os.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/interp_signal.py b/pypy/module/__pypy__/interp_signal.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/interp_time.py b/pypy/module/__pypy__/interp_time.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/test/__init__.py b/pypy/module/__pypy__/test/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/test/test_builders.py b/pypy/module/__pypy__/test/test_builders.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/test/test_bytebuffer.py b/pypy/module/__pypy__/test/test_bytebuffer.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/test/test_debug.py b/pypy/module/__pypy__/test/test_debug.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/test/test_identitydict.py b/pypy/module/__pypy__/test/test_identitydict.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/test/test_intop.py b/pypy/module/__pypy__/test/test_intop.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/test/test_locals2fast.py b/pypy/module/__pypy__/test/test_locals2fast.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/test/test_magic.py b/pypy/module/__pypy__/test/test_magic.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/test/test_os.py b/pypy/module/__pypy__/test/test_os.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/test/test_signal.py b/pypy/module/__pypy__/test/test_signal.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/test/test_special.py b/pypy/module/__pypy__/test/test_special.py
old mode 100644
new mode 100755
diff --git a/pypy/module/__pypy__/test/test_time.py b/pypy/module/__pypy__/test/test_time.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_ast/__init__.py b/pypy/module/_ast/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_ast/test/__init__.py b/pypy/module/_ast/test/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_ast/test/test_ast.py b/pypy/module/_ast/test/test_ast.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/__init__.py b/pypy/module/_cffi_backend/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/allocator.py b/pypy/module/_cffi_backend/allocator.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/call_python.py b/pypy/module/_cffi_backend/call_python.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/cbuffer.py b/pypy/module/_cffi_backend/cbuffer.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/ccallback.py b/pypy/module/_cffi_backend/ccallback.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/cdataobj.py b/pypy/module/_cffi_backend/cdataobj.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/cdlopen.py b/pypy/module/_cffi_backend/cdlopen.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/cerrno.py b/pypy/module/_cffi_backend/cerrno.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/cffi1_module.py b/pypy/module/_cffi_backend/cffi1_module.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/cffi_opcode.py b/pypy/module/_cffi_backend/cffi_opcode.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/cglob.py b/pypy/module/_cffi_backend/cglob.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/ctypearray.py b/pypy/module/_cffi_backend/ctypearray.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/ctypeenum.py b/pypy/module/_cffi_backend/ctypeenum.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/ctypefunc.py b/pypy/module/_cffi_backend/ctypefunc.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/ctypeobj.py b/pypy/module/_cffi_backend/ctypeobj.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/ctypeprim.py b/pypy/module/_cffi_backend/ctypeprim.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/ctypeptr.py b/pypy/module/_cffi_backend/ctypeptr.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/ctypestruct.py b/pypy/module/_cffi_backend/ctypestruct.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/ctypevoid.py b/pypy/module/_cffi_backend/ctypevoid.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/embedding.py b/pypy/module/_cffi_backend/embedding.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/ffi_obj.py b/pypy/module/_cffi_backend/ffi_obj.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/func.py b/pypy/module/_cffi_backend/func.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/handle.py b/pypy/module/_cffi_backend/handle.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/lib_obj.py b/pypy/module/_cffi_backend/lib_obj.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/libraryobj.py b/pypy/module/_cffi_backend/libraryobj.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/misc.py b/pypy/module/_cffi_backend/misc.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/newtype.py b/pypy/module/_cffi_backend/newtype.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/parse_c_type.py b/pypy/module/_cffi_backend/parse_c_type.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/realize_c_type.py b/pypy/module/_cffi_backend/realize_c_type.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/src/commontypes.c b/pypy/module/_cffi_backend/src/commontypes.c
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/src/parse_c_type.c b/pypy/module/_cffi_backend/src/parse_c_type.c
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/src/parse_c_type.h b/pypy/module/_cffi_backend/src/parse_c_type.h
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/test/__init__.py b/pypy/module/_cffi_backend/test/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/test/_backend_test_c.py b/pypy/module/_cffi_backend/test/_backend_test_c.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/test/_test_lib.c b/pypy/module/_cffi_backend/test/_test_lib.c
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/test/test_c.py b/pypy/module/_cffi_backend/test/test_c.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/test/test_fastpath.py b/pypy/module/_cffi_backend/test/test_fastpath.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/test/test_ffi_obj.py b/pypy/module/_cffi_backend/test/test_ffi_obj.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/test/test_file.py b/pypy/module/_cffi_backend/test/test_file.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/test/test_parse_c_type.py b/pypy/module/_cffi_backend/test/test_parse_c_type.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/test/test_re_python.py b/pypy/module/_cffi_backend/test/test_re_python.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/test/test_recompiler.py b/pypy/module/_cffi_backend/test/test_recompiler.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/test/test_unicode_literals.py b/pypy/module/_cffi_backend/test/test_unicode_literals.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/test/test_ztranslation.py b/pypy/module/_cffi_backend/test/test_ztranslation.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_cffi_backend/wrapper.py b/pypy/module/_cffi_backend/wrapper.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_codecs/__init__.py b/pypy/module/_codecs/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_codecs/interp_codecs.py b/pypy/module/_codecs/interp_codecs.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_codecs/test/__init__.py b/pypy/module/_codecs/test/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_codecs/test/test_codecs.py b/pypy/module/_codecs/test/test_codecs.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_codecs/test/test_ztranslation.py b/pypy/module/_codecs/test/test_ztranslation.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_collections/__init__.py b/pypy/module/_collections/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_collections/app_defaultdict.py b/pypy/module/_collections/app_defaultdict.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_collections/interp_defaultdict.py b/pypy/module/_collections/interp_defaultdict.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_collections/interp_deque.py b/pypy/module/_collections/interp_deque.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_collections/test/__init__.py b/pypy/module/_collections/test/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_collections/test/test_defaultdict.py b/pypy/module/_collections/test/test_defaultdict.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_collections/test/test_deque.py b/pypy/module/_collections/test/test_deque.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_continuation/__init__.py b/pypy/module/_continuation/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_continuation/app_continuation.py b/pypy/module/_continuation/app_continuation.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_continuation/interp_continuation.py b/pypy/module/_continuation/interp_continuation.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_continuation/interp_pickle.py b/pypy/module/_continuation/interp_pickle.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_continuation/test/__init__.py b/pypy/module/_continuation/test/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_continuation/test/support.py b/pypy/module/_continuation/test/support.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_continuation/test/test_generator.py b/pypy/module/_continuation/test/test_generator.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_continuation/test/test_stacklet.py b/pypy/module/_continuation/test/test_stacklet.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_continuation/test/test_translated.py b/pypy/module/_continuation/test/test_translated.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_continuation/test/test_zpickle.py b/pypy/module/_continuation/test/test_zpickle.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_csv/__init__.py b/pypy/module/_csv/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_csv/app_csv.py b/pypy/module/_csv/app_csv.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_csv/interp_csv.py b/pypy/module/_csv/interp_csv.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_csv/interp_reader.py b/pypy/module/_csv/interp_reader.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_csv/interp_writer.py b/pypy/module/_csv/interp_writer.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_csv/test/__init__.py b/pypy/module/_csv/test/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_csv/test/test_dialect.py b/pypy/module/_csv/test/test_dialect.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_csv/test/test_reader.py b/pypy/module/_csv/test/test_reader.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_csv/test/test_writer.py b/pypy/module/_csv/test/test_writer.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_csv/test/test_ztranslation.py b/pypy/module/_csv/test/test_ztranslation.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_demo/__init__.py b/pypy/module/_demo/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_demo/app_demo.py b/pypy/module/_demo/app_demo.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_demo/demo.py b/pypy/module/_demo/demo.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_demo/test/__init__.py b/pypy/module/_demo/test/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_demo/test/test_import.py b/pypy/module/_demo/test/test_import.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_demo/test/test_sieve.py b/pypy/module/_demo/test/test_sieve.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_file/__init__.py b/pypy/module/_file/__init__.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_file/interp_file.py b/pypy/module/_file/interp_file.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_file/interp_stream.py b/pypy/module/_file/interp_stream.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_file/readinto.py b/pypy/module/_file/readinto.py
old mode 100644
new mode 100755
diff --git a/pypy/module/_file/test/__init__.py b/pypy/module/_file/test/__init__.py
old mode 100644
new mode 100755

From pypy.commits at gmail.com  Tue Apr  4 15:47:20 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Tue, 04 Apr 2017 12:47:20 -0700 (PDT)
Subject: [pypy-commit] pypy default: configure libbacktrace in setup of
 rvmprof
Message-ID: <58e3f848.b686df0a.53915.c496@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r90955:d8942fab96a7
Date: 2017-04-04 15:44 -0400
http://bitbucket.org/pypy/pypy/changeset/d8942fab96a7/

Log:	configure libbacktrace in setup of rvmprof

diff too long, truncating to 2000 out of 6940 lines

diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -23,6 +23,7 @@
 ]
 if sys.platform.startswith('linux'):
     separate_module_files += [
+       BACKTRACE.join('atomic.c'),
        BACKTRACE.join('backtrace.c'),
        BACKTRACE.join('state.c'),
        BACKTRACE.join('elf.c'),
@@ -63,8 +64,18 @@
     )
 global_eci = ExternalCompilationInfo(**eci_kwds)
 
+def configure_libbacktrace():
+    import subprocess
+    import os
+    olddir = os.getcwd()
+
+    os.chdir(str(BACKTRACE))
+    subprocess.check_call(["./configure"])
+    os.chdir(olddir)
 
 def setup():
+    configure_libbacktrace()
+
     eci_kwds['compile_extra'].append('-DRPYTHON_LL2CTYPES')
     platform.verify_eci(ExternalCompilationInfo(
                         **eci_kwds))
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile b/rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile
--- a/rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile
+++ b/rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile
@@ -80,9 +80,9 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = x86_64-pc-linux-gnu
-host_triplet = x86_64-pc-linux-gnu
-target_triplet = x86_64-pc-linux-gnu
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
+target_triplet = i686-pc-linux-gnu
 check_PROGRAMS = $(am__EXEEXT_1)
 am__append_1 = btest stest
 subdir = .
@@ -152,14 +152,14 @@
 CTAGS = ctags
 am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
-ACLOCAL = ${SHELL} /home/rich/src/gcc/missing --run aclocal-1.11
+ACLOCAL = aclocal-1.11
 ALLOC_FILE = mmap.lo
 AMTAR = $${TAR-tar}
 AR = ar
-AUTOCONF = ${SHELL} /home/rich/src/gcc/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/rich/src/gcc/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/rich/src/gcc/missing --run automake-1.11
-AWK = gawk
+AUTOCONF = autoconf
+AUTOHEADER = autoheader
+AUTOMAKE = automake-1.11
+AWK = mawk
 BACKTRACE_FILE = backtrace.lo simple.lo
 BACKTRACE_SUPPORTED = 1
 BACKTRACE_SUPPORTS_DATA = 1
@@ -176,28 +176,28 @@
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = /usr/bin/grep -E
+EGREP = /bin/grep -E
 EXEEXT = 
 EXTRA_FLAGS = -funwind-tables -frandom-seed=$@
-FGREP = /usr/bin/grep -F
+FGREP = /bin/grep -F
 FORMAT_FILE = elf.lo
-GREP = /usr/bin/grep
+GREP = /bin/grep
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
+LD = /usr/bin/ld
 LDFLAGS = 
 LIBOBJS = 
 LIBS = 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
-LN_S = ln -s
+LN_S = cp -p
 LTLIBOBJS = 
 MAINT = #
-MAKEINFO = ${SHELL} /home/rich/src/gcc/missing --run makeinfo
-MKDIR_P = /usr/bin/mkdir -p
+MAKEINFO = makeinfo
+MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
@@ -214,26 +214,26 @@
 PATH_SEPARATOR = :
 PIC_FLAG = 
 RANLIB = ranlib
-SED = /usr/bin/sed
+SED = /bin/sed
 SET_MAKE = 
-SHELL = /bin/sh
+SHELL = /bin/bash
 STRIP = strip
 VERSION = version-unused
 VIEW_FILE = mmapio.lo
 WARN_FLAGS = -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -Wmissing-format-attribute -Wcast-qual
-abs_builddir = /home/rich/src/gcc/libbacktrace
-abs_srcdir = /home/rich/src/gcc/libbacktrace
-abs_top_builddir = /home/rich/src/gcc/libbacktrace
-abs_top_srcdir = /home/rich/src/gcc/libbacktrace
+abs_builddir = /media/sf_pypy/rpython/rlib/rvmprof/src/shared/libbacktrace
+abs_srcdir = /media/sf_pypy/rpython/rlib/rvmprof/src/shared/libbacktrace
+abs_top_builddir = /media/sf_pypy/rpython/rlib/rvmprof/src/shared/libbacktrace
+abs_top_srcdir = /media/sf_pypy/rpython/rlib/rvmprof/src/shared/libbacktrace
 ac_ct_CC = gcc
 ac_ct_DUMPBIN = 
 am__leading_dot = .
 am__tar = $${TAR-tar} chof - "$$tardir"
 am__untar = $${TAR-tar} xf -
 bindir = ${exec_prefix}/bin
-build = x86_64-pc-linux-gnu
+build = i686-pc-linux-gnu
 build_alias = 
-build_cpu = x86_64
+build_cpu = i686
 build_os = linux-gnu
 build_vendor = pc
 builddir = .
@@ -242,22 +242,22 @@
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = x86_64-pc-linux-gnu
+host = i686-pc-linux-gnu
 host_alias = 
-host_cpu = x86_64
+host_cpu = i686
 host_os = linux-gnu
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/rich/src/gcc/install-sh
+install_sh = ${SHELL} /media/sf_pypy/rpython/rlib/rvmprof/src/shared/libbacktrace/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 libtool_VERSION = 1:0:0
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
 mandir = ${datarootdir}/man
-mkdir_p = /usr/bin/mkdir -p
+mkdir_p = /bin/mkdir -p
 multi_basedir = 
 oldincludedir = /usr/include
 pdfdir = ${docdir}
@@ -268,9 +268,9 @@
 sharedstatedir = ${prefix}/com
 srcdir = .
 sysconfdir = ${prefix}/etc
-target = x86_64-pc-linux-gnu
+target = i686-pc-linux-gnu
 target_alias = 
-target_cpu = x86_64
+target_cpu = i686
 target_os = linux-gnu
 target_vendor = pc
 top_build_prefix = 
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/ansidecl.h b/rpython/rlib/rvmprof/src/shared/libbacktrace/ansidecl.h
new file mode 100644
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/libbacktrace/ansidecl.h
@@ -0,0 +1,355 @@
+/* ANSI and traditional C compatability macros
+   Copyright (C) 1991-2015 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* ANSI and traditional C compatibility macros
+
+   ANSI C is assumed if __STDC__ is #defined.
+
+   Macro		ANSI C definition	Traditional C definition
+   -----		---- - ----------	----------- - ----------
+   PTR			`void *'		`char *'
+   const		not defined		`'
+   volatile		not defined		`'
+   signed		not defined		`'
+
+   For ease of writing code which uses GCC extensions but needs to be
+   portable to other compilers, we provide the GCC_VERSION macro that
+   simplifies testing __GNUC__ and __GNUC_MINOR__ together, and various
+   wrappers around __attribute__.  Also, __extension__ will be #defined
+   to nothing if it doesn't work.  See below.  */
+
+#ifndef	_ANSIDECL_H
+#define _ANSIDECL_H	1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Every source file includes this file,
+   so they will all get the switch for lint.  */
+/* LINTLIBRARY */
+
+/* Using MACRO(x,y) in cpp #if conditionals does not work with some
+   older preprocessors.  Thus we can't define something like this:
+
+#define HAVE_GCC_VERSION(MAJOR, MINOR) \
+  (__GNUC__ > (MAJOR) || (__GNUC__ == (MAJOR) && __GNUC_MINOR__ >= (MINOR)))
+
+and then test "#if HAVE_GCC_VERSION(2,7)".
+
+So instead we use the macro below and test it against specific values.  */
+
+/* This macro simplifies testing whether we are using gcc, and if it
+   is of a particular minimum version. (Both major & minor numbers are
+   significant.)  This macro will evaluate to 0 if we are not using
+   gcc at all.  */
+#ifndef GCC_VERSION
+#define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
+#endif /* GCC_VERSION */
+
+#if defined (__STDC__) || defined(__cplusplus) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(_WIN32)
+/* All known AIX compilers implement these things (but don't always
+   define __STDC__).  The RISC/OS MIPS compiler defines these things
+   in SVR4 mode, but does not define __STDC__.  */
+/* eraxxon at alumni.rice.edu: The Compaq C++ compiler, unlike many other
+   C++ compilers, does not define __STDC__, though it acts as if this
+   was so. (Verified versions: 5.7, 6.2, 6.3, 6.5) */
+
+#define PTR		void *
+
+#undef const
+#undef volatile
+#undef signed
+
+/* inline requires special treatment; it's in C99, and GCC >=2.7 supports
+   it too, but it's not in C89.  */
+#undef inline
+#if __STDC_VERSION__ >= 199901L || defined(__cplusplus) || (defined(__SUNPRO_C) && defined(__C99FEATURES__))
+/* it's a keyword */
+#else
+# if GCC_VERSION >= 2007
+#  define inline __inline__   /* __inline__ prevents -pedantic warnings */
+# else
+#  define inline  /* nothing */
+# endif
+#endif
+
+#else	/* Not ANSI C.  */
+
+#define PTR		char *
+
+/* some systems define these in header files for non-ansi mode */
+#undef const
+#undef volatile
+#undef signed
+#undef inline
+#define const
+#define volatile
+#define signed
+#define inline
+
+#endif	/* ANSI C.  */
+
+/* Define macros for some gcc attributes.  This permits us to use the
+   macros freely, and know that they will come into play for the
+   version of gcc in which they are supported.  */
+
+#if (GCC_VERSION < 2007)
+# define __attribute__(x)
+#endif
+
+/* Attribute __malloc__ on functions was valid as of gcc 2.96. */
+#ifndef ATTRIBUTE_MALLOC
+# if (GCC_VERSION >= 2096)
+#  define ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+# else
+#  define ATTRIBUTE_MALLOC
+# endif /* GNUC >= 2.96 */
+#endif /* ATTRIBUTE_MALLOC */
+
+/* Attributes on labels were valid as of gcc 2.93 and g++ 4.5.  For
+   g++ an attribute on a label must be followed by a semicolon.  */
+#ifndef ATTRIBUTE_UNUSED_LABEL
+# ifndef __cplusplus
+#  if GCC_VERSION >= 2093
+#   define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED
+#  else
+#   define ATTRIBUTE_UNUSED_LABEL
+#  endif
+# else
+#  if GCC_VERSION >= 4005
+#   define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED ;
+#  else
+#   define ATTRIBUTE_UNUSED_LABEL
+#  endif
+# endif
+#endif
+
+/* Similarly to ARG_UNUSED below.  Prior to GCC 3.4, the C++ frontend
+   couldn't parse attributes placed after the identifier name, and now
+   the entire compiler is built with C++.  */
+#ifndef ATTRIBUTE_UNUSED
+#if GCC_VERSION >= 3004
+#  define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#else
+#define ATTRIBUTE_UNUSED
+#endif
+#endif /* ATTRIBUTE_UNUSED */
+
+/* Before GCC 3.4, the C++ frontend couldn't parse attributes placed after the
+   identifier name.  */
+#if ! defined(__cplusplus) || (GCC_VERSION >= 3004)
+# define ARG_UNUSED(NAME) NAME ATTRIBUTE_UNUSED
+#else /* !__cplusplus || GNUC >= 3.4 */
+# define ARG_UNUSED(NAME) NAME
+#endif /* !__cplusplus || GNUC >= 3.4 */
+
+#ifndef ATTRIBUTE_NORETURN
+#define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#endif /* ATTRIBUTE_NORETURN */
+
+/* Attribute `nonnull' was valid as of gcc 3.3.  */
+#ifndef ATTRIBUTE_NONNULL
+# if (GCC_VERSION >= 3003)
+#  define ATTRIBUTE_NONNULL(m) __attribute__ ((__nonnull__ (m)))
+# else
+#  define ATTRIBUTE_NONNULL(m)
+# endif /* GNUC >= 3.3 */
+#endif /* ATTRIBUTE_NONNULL */
+
+/* Attribute `returns_nonnull' was valid as of gcc 4.9.  */
+#ifndef ATTRIBUTE_RETURNS_NONNULL
+# if (GCC_VERSION >= 4009)
+#  define ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__))
+# else
+#  define ATTRIBUTE_RETURNS_NONNULL
+# endif /* GNUC >= 4.9 */
+#endif /* ATTRIBUTE_RETURNS_NONNULL */
+
+/* Attribute `pure' was valid as of gcc 3.0.  */
+#ifndef ATTRIBUTE_PURE
+# if (GCC_VERSION >= 3000)
+#  define ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define ATTRIBUTE_PURE
+# endif /* GNUC >= 3.0 */
+#endif /* ATTRIBUTE_PURE */
+
+/* Use ATTRIBUTE_PRINTF when the format specifier must not be NULL.
+   This was the case for the `printf' format attribute by itself
+   before GCC 3.3, but as of 3.3 we need to add the `nonnull'
+   attribute to retain this behavior.  */
+#ifndef ATTRIBUTE_PRINTF
+#define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n))) ATTRIBUTE_NONNULL(m)
+#define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
+#define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
+#define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
+#define ATTRIBUTE_PRINTF_4 ATTRIBUTE_PRINTF(4, 5)
+#define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6)
+#endif /* ATTRIBUTE_PRINTF */
+
+/* Use ATTRIBUTE_FPTR_PRINTF when the format attribute is to be set on
+   a function pointer.  Format attributes were allowed on function
+   pointers as of gcc 3.1.  */
+#ifndef ATTRIBUTE_FPTR_PRINTF
+# if (GCC_VERSION >= 3001)
+#  define ATTRIBUTE_FPTR_PRINTF(m, n) ATTRIBUTE_PRINTF(m, n)
+# else
+#  define ATTRIBUTE_FPTR_PRINTF(m, n)
+# endif /* GNUC >= 3.1 */
+# define ATTRIBUTE_FPTR_PRINTF_1 ATTRIBUTE_FPTR_PRINTF(1, 2)
+# define ATTRIBUTE_FPTR_PRINTF_2 ATTRIBUTE_FPTR_PRINTF(2, 3)
+# define ATTRIBUTE_FPTR_PRINTF_3 ATTRIBUTE_FPTR_PRINTF(3, 4)
+# define ATTRIBUTE_FPTR_PRINTF_4 ATTRIBUTE_FPTR_PRINTF(4, 5)
+# define ATTRIBUTE_FPTR_PRINTF_5 ATTRIBUTE_FPTR_PRINTF(5, 6)
+#endif /* ATTRIBUTE_FPTR_PRINTF */
+
+/* Use ATTRIBUTE_NULL_PRINTF when the format specifier may be NULL.  A
+   NULL format specifier was allowed as of gcc 3.3.  */
+#ifndef ATTRIBUTE_NULL_PRINTF
+# if (GCC_VERSION >= 3003)
+#  define ATTRIBUTE_NULL_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
+# else
+#  define ATTRIBUTE_NULL_PRINTF(m, n)
+# endif /* GNUC >= 3.3 */
+# define ATTRIBUTE_NULL_PRINTF_1 ATTRIBUTE_NULL_PRINTF(1, 2)
+# define ATTRIBUTE_NULL_PRINTF_2 ATTRIBUTE_NULL_PRINTF(2, 3)
+# define ATTRIBUTE_NULL_PRINTF_3 ATTRIBUTE_NULL_PRINTF(3, 4)
+# define ATTRIBUTE_NULL_PRINTF_4 ATTRIBUTE_NULL_PRINTF(4, 5)
+# define ATTRIBUTE_NULL_PRINTF_5 ATTRIBUTE_NULL_PRINTF(5, 6)
+#endif /* ATTRIBUTE_NULL_PRINTF */
+
+/* Attribute `sentinel' was valid as of gcc 3.5.  */
+#ifndef ATTRIBUTE_SENTINEL
+# if (GCC_VERSION >= 3005)
+#  define ATTRIBUTE_SENTINEL __attribute__ ((__sentinel__))
+# else
+#  define ATTRIBUTE_SENTINEL
+# endif /* GNUC >= 3.5 */
+#endif /* ATTRIBUTE_SENTINEL */
+
+
+#ifndef ATTRIBUTE_ALIGNED_ALIGNOF
+# if (GCC_VERSION >= 3000)
+#  define ATTRIBUTE_ALIGNED_ALIGNOF(m) __attribute__ ((__aligned__ (__alignof__ (m))))
+# else
+#  define ATTRIBUTE_ALIGNED_ALIGNOF(m)
+# endif /* GNUC >= 3.0 */
+#endif /* ATTRIBUTE_ALIGNED_ALIGNOF */
+
+/* Useful for structures whose layout must much some binary specification
+   regardless of the alignment and padding qualities of the compiler.  */
+#ifndef ATTRIBUTE_PACKED
+# define ATTRIBUTE_PACKED __attribute__ ((packed))
+#endif
+
+/* Attribute `hot' and `cold' was valid as of gcc 4.3.  */
+#ifndef ATTRIBUTE_COLD
+# if (GCC_VERSION >= 4003)
+#  define ATTRIBUTE_COLD __attribute__ ((__cold__))
+# else
+#  define ATTRIBUTE_COLD
+# endif /* GNUC >= 4.3 */
+#endif /* ATTRIBUTE_COLD */
+#ifndef ATTRIBUTE_HOT
+# if (GCC_VERSION >= 4003)
+#  define ATTRIBUTE_HOT __attribute__ ((__hot__))
+# else
+#  define ATTRIBUTE_HOT
+# endif /* GNUC >= 4.3 */
+#endif /* ATTRIBUTE_HOT */
+
+/* Attribute 'no_sanitize_undefined' was valid as of gcc 4.9.  */
+#ifndef ATTRIBUTE_NO_SANITIZE_UNDEFINED
+# if (GCC_VERSION >= 4009)
+#  define ATTRIBUTE_NO_SANITIZE_UNDEFINED __attribute__ ((no_sanitize_undefined))
+# else
+#  define ATTRIBUTE_NO_SANITIZE_UNDEFINED
+# endif /* GNUC >= 4.9 */
+#endif /* ATTRIBUTE_NO_SANITIZE_UNDEFINED */
+
+/* We use __extension__ in some places to suppress -pedantic warnings
+   about GCC extensions.  This feature didn't work properly before
+   gcc 2.8.  */
+#if GCC_VERSION < 2008
+#define __extension__
+#endif
+
+/* This is used to declare a const variable which should be visible
+   outside of the current compilation unit.  Use it as
+     EXPORTED_CONST int i = 1;
+   This is because the semantics of const are different in C and C++.
+   "extern const" is permitted in C but it looks strange, and gcc
+   warns about it when -Wc++-compat is not used.  */
+#ifdef __cplusplus
+#define EXPORTED_CONST extern const
+#else
+#define EXPORTED_CONST const
+#endif
+
+/* Be conservative and only use enum bitfields with C++ or GCC.
+   FIXME: provide a complete autoconf test for buggy enum bitfields.  */
+
+#ifdef __cplusplus
+#define ENUM_BITFIELD(TYPE) enum TYPE
+#elif (GCC_VERSION > 2000)
+#define ENUM_BITFIELD(TYPE) __extension__ enum TYPE
+#else
+#define ENUM_BITFIELD(TYPE) unsigned int
+#endif
+
+/* C++11 adds the ability to add "override" after an implementation of a
+   virtual function in a subclass, to:
+     (A) document that this is an override of a virtual function
+     (B) allow the compiler to issue a warning if it isn't (e.g. a mismatch
+         of the type signature).
+
+   Similarly, it allows us to add a "final" to indicate that no subclass
+   may subsequently override the vfunc.
+
+   Provide OVERRIDE and FINAL as macros, allowing us to get these benefits
+   when compiling with C++11 support, but without requiring C++11.
+
+   For gcc, use "-std=c++11" to enable C++11 support; gcc 6 onwards enables
+   this by default (actually GNU++14).  */
+
+#if __cplusplus >= 201103
+/* C++11 claims to be available: use it.  final/override were only
+   implemented in 4.7, though.  */
+# if GCC_VERSION < 4007
+#  define OVERRIDE
+#  define FINAL
+# else
+#  define OVERRIDE override
+#  define FINAL final
+# endif
+#elif GCC_VERSION >= 4007
+/* G++ 4.7 supports __final in C++98.  */
+# define OVERRIDE
+# define FINAL __final
+#else
+/* No C++11 support; leave the macros empty: */
+# define OVERRIDE
+# define FINAL
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* ansidecl.h	*/
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/config.guess b/rpython/rlib/rvmprof/src/shared/libbacktrace/config.guess
new file mode 100755
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/libbacktrace/config.guess
@@ -0,0 +1,1466 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
+
+timestamp='2017-03-05'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+#
+# Please send patches to <config-patches at gnu.org>.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches at gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2017 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi at noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently (or will in the future) and ABI.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		os=netbsdelf
+		;;
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}${abi}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE=alpha ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE=alpha ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE=alpha ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE=alphaev5 ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE=alphaev56 ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE=alphapca56 ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE=alphapca57 ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE=alphaev6 ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE=alphaev67 ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE=alphaev69 ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE=alphaev7 ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE=alphaev79 ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH=i386
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH=x86_64
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = hppa2.0w ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH=hppa2.0w
+	    else
+		HP_ARCH=hppa64
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		UNAME_PROCESSOR=x86_64 ;;
+	    i386)
+		UNAME_PROCESSOR=i586 ;;
+	esac
+	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    *:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	;;
+    mips64el:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-${LIBC}
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configure will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel at ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes at openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf at swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green at stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green at stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = x86; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSX-?:NONSTOP_KERNEL:*:*)
+	echo nsx-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = 386; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
+esac
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions from:
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches at gnu.org to
+provide the necessary information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1

From pypy.commits at gmail.com  Tue Apr  4 16:45:23 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Tue, 04 Apr 2017 13:45:23 -0700 (PDT)
Subject: [pypy-commit] pypy vmprof-multiple-eval-funcs: register all
 functions passed to vmprof_execute_code and call vmprof_register_eval just
 before the module is enabled
Message-ID: <58e405e3.c5b1df0a.bb21f.b03b@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: vmprof-multiple-eval-funcs
Changeset: r90956:f7aa9fbfd4f0
Date: 2017-04-04 16:44 -0400
http://bitbucket.org/pypy/pypy/changeset/f7aa9fbfd4f0/

Log:	register all functions passed to vmprof_execute_code and call
	vmprof_register_eval just before the module is enabled

diff --git a/rpython/rlib/rvmprof/rvmprof.py b/rpython/rlib/rvmprof/rvmprof.py
--- a/rpython/rlib/rvmprof/rvmprof.py
+++ b/rpython/rlib/rvmprof/rvmprof.py
@@ -7,11 +7,16 @@
 from rpython.rtyper.lltypesystem import lltype, llmemory, rffi
 from rpython.rtyper.lltypesystem.lloperation import llop
 from rpython.rlib.rweaklist import RWeakListMixin
+from rpython.rlib.unroll import unrolling_iterable
 
 MAX_FUNC_NAME = 1023
 
 PLAT_WINDOWS = sys.platform == 'win32'
 
+EVAL_FUNCS = []
+EVAL_FUNC_TYPE = lltype.FuncType([rffi.VOIDP], rffi.INT)
+EVAL_FUNC_TYPE_P = lltype.Ptr(EVAL_FUNC_TYPE)
+
 # ____________________________________________________________
 
 # keep in sync with vmprof_stack.h
@@ -138,6 +143,15 @@
             native = 0 # force disabled on Windows
         lines = 0 # not supported on PyPy currently
 
+        if we_are_translated():
+            # clear all evaluation functions
+            self.cintf.vmprof_register_eval(rffi.NULL)
+            from rpython.rtyper.annlowlevel import llhelper
+            # pass all known function at translation down to the c implementation
+            for eval_func in unrolling_iterable(EVAL_FUNCS):
+                addr = llhelper(EVAL_FUNC_TYPE_P, eval_func)
+                self.cintf.vmprof_register_eval(rffi.cast(rffi.VOIDP, addr))
+
         p_error = self.cintf.vmprof_init(fileno, interval, lines, memory, "pypy", native)
         if p_error:
             raise VMProfError(rffi.charp2str(p_error))
@@ -178,23 +192,6 @@
     arguments given to the decorated function.
 
     'result_class' is ignored (backward compatibility).
-
-    ====================================
-    TRANSLATION NOTE CALL THIS ONLY ONCE
-    ====================================
-
-    This function can only be called once during translation.
-    It generates a C function called __vmprof_eval_vmprof which is used by
-    the vmprof C source code and is bound as an extern function.
-    This is necessary while walking the native stack.
-    If you see __vmprof_eval_vmprof defined twice during
-    translation, read on:
-
-    To remove this restriction do the following:
-
-    *) Extend the macro IS_VMPROF_EVAL in the vmprof source repo to check several
-       sybmols.
-    *) Give each function provided to this decorator a unique symbol name in C
     """
     if _hack_update_stack_untranslated:
         from rpython.rtyper.annlowlevel import llhelper
@@ -242,7 +239,7 @@
                 return decorated_jitted_function(unique_id, *args)
 
         decorated_function.__name__ = func.__name__ + '_rvmprof'
-        decorated_function.c_name = '__vmprof_eval_vmprof'
+        EVAL_FUNCS.append(decorated_function)
         return decorated_function
 
     return decorate
diff --git a/rpython/rlib/rvmprof/src/rvmprof.c b/rpython/rlib/rvmprof/src/rvmprof.c
--- a/rpython/rlib/rvmprof/src/rvmprof.c
+++ b/rpython/rlib/rvmprof/src/rvmprof.c
@@ -21,7 +21,7 @@
 #endif
 
 int _vmprof_eval_count = 0;
-void _vmprof_eval_funcs[5];
+void * _vmprof_eval_funcs[5];
 
 int vmprof_register_eval(void * function)
 {

From pypy.commits at gmail.com  Tue Apr  4 18:03:52 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Tue, 04 Apr 2017 15:03:52 -0700 (PDT)
Subject: [pypy-commit] pypy vmprof-multiple-eval-funcs: name the decurated
 function, remove print statement in test printing the timestamp
Message-ID: <58e41848.89ae1c0a.997db.64ec@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: vmprof-multiple-eval-funcs
Changeset: r90958:13a58fcb9ede
Date: 2017-04-04 18:03 -0400
http://bitbucket.org/pypy/pypy/changeset/13a58fcb9ede/

Log:	name the decurated function, remove print statement in test printing
	the timestamp

diff --git a/pypy/module/_vmprof/test/test__vmprof.py b/pypy/module/_vmprof/test/test__vmprof.py
--- a/pypy/module/_vmprof/test/test__vmprof.py
+++ b/pypy/module/_vmprof/test/test__vmprof.py
@@ -43,7 +43,6 @@
                     count += 1
                     i += 2 * WORD + size
                 elif s[i] == '\x06':
-                    print(s[i:i+24])
                     i += 1+8+8+8
                 elif s[i] == '\x07':
                     i += 1
diff --git a/rpython/rlib/rvmprof/rvmprof.py b/rpython/rlib/rvmprof/rvmprof.py
--- a/rpython/rlib/rvmprof/rvmprof.py
+++ b/rpython/rlib/rvmprof/rvmprof.py
@@ -240,6 +240,7 @@
 
         fname = func.__name__ + '_rvmprof'
         decorated_function.__name__ = fname
+        decorated_function.c_name = fname
         EVAL_FUNC_NAMES.append(fname)
         return decorated_function
 

From pypy.commits at gmail.com  Tue Apr  4 18:03:50 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Tue, 04 Apr 2017 15:03:50 -0700 (PDT)
Subject: [pypy-commit] pypy vmprof-multiple-eval-funcs: pass the function
 name and resolve the symbol by dlsym
Message-ID: <58e41846.098c1c0a.1061f.5f98@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: vmprof-multiple-eval-funcs
Changeset: r90957:a7e4613fa118
Date: 2017-04-04 17:50 -0400
http://bitbucket.org/pypy/pypy/changeset/a7e4613fa118/

Log:	pass the function name and resolve the symbol by dlsym

diff --git a/rpython/rlib/rvmprof/rvmprof.py b/rpython/rlib/rvmprof/rvmprof.py
--- a/rpython/rlib/rvmprof/rvmprof.py
+++ b/rpython/rlib/rvmprof/rvmprof.py
@@ -13,7 +13,7 @@
 
 PLAT_WINDOWS = sys.platform == 'win32'
 
-EVAL_FUNCS = []
+EVAL_FUNC_NAMES = []
 EVAL_FUNC_TYPE = lltype.FuncType([rffi.VOIDP], rffi.INT)
 EVAL_FUNC_TYPE_P = lltype.Ptr(EVAL_FUNC_TYPE)
 
@@ -148,9 +148,9 @@
             self.cintf.vmprof_register_eval(rffi.NULL)
             from rpython.rtyper.annlowlevel import llhelper
             # pass all known function at translation down to the c implementation
-            for eval_func in unrolling_iterable(EVAL_FUNCS):
-                addr = llhelper(EVAL_FUNC_TYPE_P, eval_func)
-                self.cintf.vmprof_register_eval(rffi.cast(rffi.VOIDP, addr))
+            for c_func_name in unrolling_iterable(EVAL_FUNC_NAMES):
+                with rffi.scoped_str2charp(c_func_name) as cstr:
+                    self.cintf.vmprof_register_eval(cstr)
 
         p_error = self.cintf.vmprof_init(fileno, interval, lines, memory, "pypy", native)
         if p_error:
@@ -238,8 +238,9 @@
             else:
                 return decorated_jitted_function(unique_id, *args)
 
-        decorated_function.__name__ = func.__name__ + '_rvmprof'
-        EVAL_FUNCS.append(decorated_function)
+        fname = func.__name__ + '_rvmprof'
+        decorated_function.__name__ = fname
+        EVAL_FUNC_NAMES.append(fname)
         return decorated_function
 
     return decorate
diff --git a/rpython/rlib/rvmprof/src/rvmprof.c b/rpython/rlib/rvmprof/src/rvmprof.c
--- a/rpython/rlib/rvmprof/src/rvmprof.c
+++ b/rpython/rlib/rvmprof/src/rvmprof.c
@@ -1,5 +1,9 @@
 #define _GNU_SOURCE 1
 
+#ifdef VMPROF_UNIX
+#include <dlfcn.h>
+#endif
+
 #ifdef RPYTHON_LL2CTYPES
    /* only for testing: ll2ctypes sets RPY_EXTERN from the command-line */
 
@@ -23,19 +27,27 @@
 int _vmprof_eval_count = 0;
 void * _vmprof_eval_funcs[5];
 
-int vmprof_register_eval(void * function)
+int vmprof_register_eval(const char * name)
 {
+#ifdef VMPROF_UNIX
+    void * func = NULL;
+
     if (_vmprof_eval_count >= 5) {
         fprintf(stderr, "WARNING: cannot register more than 5 rpython interpreter " \
                         "evaluation functions (you can increase the amount in rvmprof.c)\n");
         return -1;
     }
-    if (function == NULL) { 
+    if (name == NULL) { 
         _vmprof_eval_count = 0;
     } else {
-        _vmprof_eval_funcs[_vmprof_eval_count++] = function;
+        func = dlsym(RTLD_DEFAULT, name);
+        if (func == NULL) {
+            fprintf(stderr, "WARNING: could not lookup addr of '%s', dlsym returned NULL\n", name);
+            return -1;
+        }
+        _vmprof_eval_funcs[_vmprof_eval_count++] = func;
     }
-
+#endif
     return 0;
 }
 
diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -36,14 +36,15 @@
 RPY_EXTERN void vmprof_stack_free(void*);
 RPY_EXTERN intptr_t vmprof_get_traceback(void *, void *, intptr_t*, intptr_t);
 /**
- * Registers the first argument as a evaluation function. If NULL is provided,
- * it resets the registers eval functions.
+ * Registers the first argument as an evaluation function. The zero terminated
+ * name is provided as argument. If NULL is provided,
+ * it resets the eval functions.
  *
  * Note that a maximum of 5 evaluation functions is supported.
  *
  * Return 0 on success, any other value on failure.
  */
-RPY_EXTERN int vmprof_register_eval(void *);
+RPY_EXTERN int vmprof_register_eval(const char *);
 
 long vmprof_write_header_for_jit_addr(intptr_t *result, long n,
                                       intptr_t addr, int max_depth);

From pypy.commits at gmail.com  Tue Apr  4 18:51:14 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Tue, 04 Apr 2017 15:51:14 -0700 (PDT)
Subject: [pypy-commit] pypy default: hg ignore generated libbacktrace files,
 do not call libbacktrace/configure twice if it has already been
 generated
Message-ID: <58e42362.972e1c0a.4a092.6ced@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r90959:0c692c931d74
Date: 2017-04-04 18:50 -0400
http://bitbucket.org/pypy/pypy/changeset/0c692c931d74/

Log:	hg ignore generated libbacktrace files, do not call
	libbacktrace/configure twice if it has already been generated

diff too long, truncating to 2000 out of 13758 lines

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -49,6 +49,11 @@
 ^rpython/translator/goal/target.+-c$
 ^rpython/translator/goal/.+\.exe$
 ^rpython/translator/goal/.+\.dll$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.h$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.log$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.status$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/gstdint.h$
 ^pypy/goal/pypy-translation-snapshot$
 ^pypy/goal/pypy-c
 ^pypy/goal/.+\.exe$
@@ -83,3 +88,5 @@
 ^\.cache$
 
 pypy/module/cppyy/.+/*\.pcm
+
+
diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -69,9 +69,10 @@
     import os
     olddir = os.getcwd()
 
-    os.chdir(str(BACKTRACE))
-    subprocess.check_call(["./configure"])
-    os.chdir(olddir)
+    if not BACKTRACE.join('config.h').exists():
+        os.chdir(str(BACKTRACE))
+        subprocess.check_call(["./configure"])
+        os.chdir(olddir)
 
 def setup():
     configure_libbacktrace()
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile b/rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile
deleted file mode 100644
--- a/rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile
+++ /dev/null
@@ -1,770 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-# Makefile.am -- Backtrace Makefile.
-# Copyright (C) 2012-2016 Free Software Foundation, Inc.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-
-#     (1) Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-
-#     (2) Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in
-#     the documentation and/or other materials provided with the
-#     distribution.
-
-#     (3) The name of the author may not be used to
-#     endorse or promote products derived from this software without
-#     specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/libbacktrace
-pkgincludedir = $(includedir)/libbacktrace
-pkglibdir = $(libdir)/libbacktrace
-pkglibexecdir = $(libexecdir)/libbacktrace
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
-check_PROGRAMS = $(am__EXEEXT_1)
-am__append_1 = btest stest
-subdir = .
-DIST_COMMON = README ChangeLog $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(srcdir)/config.h.in \
-	$(srcdir)/../mkinstalldirs $(srcdir)/backtrace-supported.h.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \
-	$(top_srcdir)/../config/multi.m4 \
-	$(top_srcdir)/../config/override.m4 \
-	$(top_srcdir)/../config/stdint.m4 \
-	$(top_srcdir)/../config/unwind_ipinfo.m4 \
-	$(top_srcdir)/../config/warnings.m4 \
-	$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
-	$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
-	$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = backtrace-supported.h
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-am_libbacktrace_la_OBJECTS = atomic.lo dwarf.lo fileline.lo posix.lo \
-	print.lo sort.lo state.lo
-libbacktrace_la_OBJECTS = $(am_libbacktrace_la_OBJECTS)
-am__EXEEXT_1 = btest$(EXEEXT) stest$(EXEEXT)
-am_btest_OBJECTS = btest-btest.$(OBJEXT)
-btest_OBJECTS = $(am_btest_OBJECTS)
-btest_DEPENDENCIES = libbacktrace.la
-btest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(btest_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_stest_OBJECTS = stest.$(OBJEXT)
-stest_OBJECTS = $(am_stest_OBJECTS)
-stest_DEPENDENCIES = libbacktrace.la
-DEFAULT_INCLUDES = -I.
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libbacktrace_la_SOURCES) $(EXTRA_libbacktrace_la_SOURCES) \
-	$(btest_SOURCES) $(stest_SOURCES)
-MULTISRCTOP = 
-MULTIBUILDTOP = 
-MULTIDIRS = 
-MULTISUBDIR = 
-MULTIDO = true
-MULTICLEAN = true
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
-ACLOCAL = aclocal-1.11
-ALLOC_FILE = mmap.lo
-AMTAR = $${TAR-tar}
-AR = ar
-AUTOCONF = autoconf
-AUTOHEADER = autoheader
-AUTOMAKE = automake-1.11
-AWK = mawk
-BACKTRACE_FILE = backtrace.lo simple.lo
-BACKTRACE_SUPPORTED = 1
-BACKTRACE_SUPPORTS_DATA = 1
-BACKTRACE_SUPPORTS_THREADS = 1
-BACKTRACE_USES_MALLOC = 0
-CC = gcc
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DSYMUTIL = 
-DUMPBIN = 
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /bin/grep -E
-EXEEXT = 
-EXTRA_FLAGS = -funwind-tables -frandom-seed=$@
-FGREP = /bin/grep -F
-FORMAT_FILE = elf.lo
-GREP = /bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIPO = 
-LN_S = cp -p
-LTLIBOBJS = 
-MAINT = #
-MAKEINFO = makeinfo
-MKDIR_P = /bin/mkdir -p
-NM = /usr/bin/nm -B
-NMEDIT = 
-OBJDUMP = objdump
-OBJEXT = o
-OTOOL = 
-OTOOL64 = 
-PACKAGE = libbacktrace
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = package-unused
-PACKAGE_STRING = package-unused version-unused
-PACKAGE_TARNAME = libbacktrace
-PACKAGE_URL = 
-PACKAGE_VERSION = version-unused
-PATH_SEPARATOR = :
-PIC_FLAG = 
-RANLIB = ranlib
-SED = /bin/sed
-SET_MAKE = 
-SHELL = /bin/bash
-STRIP = strip
-VERSION = version-unused
-VIEW_FILE = mmapio.lo
-WARN_FLAGS = -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -Wmissing-format-attribute -Wcast-qual
-abs_builddir = /media/sf_pypy/rpython/rlib/rvmprof/src/shared/libbacktrace
-abs_srcdir = /media/sf_pypy/rpython/rlib/rvmprof/src/shared/libbacktrace
-abs_top_builddir = /media/sf_pypy/rpython/rlib/rvmprof/src/shared/libbacktrace
-abs_top_srcdir = /media/sf_pypy/rpython/rlib/rvmprof/src/shared/libbacktrace
-ac_ct_CC = gcc
-ac_ct_DUMPBIN = 
-am__leading_dot = .
-am__tar = $${TAR-tar} chof - "$$tardir"
-am__untar = $${TAR-tar} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /media/sf_pypy/rpython/rlib/rvmprof/src/shared/libbacktrace/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-libtool_VERSION = 1:0:0
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
-multi_basedir = 
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias = 
-target_cpu = i686
-target_os = linux-gnu
-target_vendor = pc
-top_build_prefix = 
-top_builddir = .
-top_srcdir = .
-ACLOCAL_AMFLAGS = -I .. -I ../config
-AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \
-	-I ../libgcc
-
-AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
-noinst_LTLIBRARIES = libbacktrace.la
-libbacktrace_la_SOURCES = \
-	backtrace.h \
-	atomic.c \
-	dwarf.c \
-	fileline.c \
-	internal.h \
-	posix.c \
-	print.c \
-	sort.c \
-	state.c
-
-BACKTRACE_FILES = \
-	backtrace.c \
-	simple.c \
-	nounwind.c
-
-FORMAT_FILES = \
-	elf.c \
-	pecoff.c \
-	unknown.c
-
-VIEW_FILES = \
-	read.c \
-	mmapio.c
-
-ALLOC_FILES = \
-	alloc.c \
-	mmap.c
-
-EXTRA_libbacktrace_la_SOURCES = \
-	$(BACKTRACE_FILES) \
-	$(FORMAT_FILES) \
-	$(VIEW_FILES) \
-	$(ALLOC_FILES)
-
-libbacktrace_la_LIBADD = \
-	$(BACKTRACE_FILE) \
-	$(FORMAT_FILE) \
-	$(VIEW_FILE) \
-	$(ALLOC_FILE)
-
-libbacktrace_la_DEPENDENCIES = $(libbacktrace_la_LIBADD)
-TESTS = $(check_PROGRAMS)
-btest_SOURCES = btest.c
-btest_CFLAGS = $(AM_CFLAGS) -g -O
-btest_LDADD = libbacktrace.la
-stest_SOURCES = stest.c
-stest_LDADD = libbacktrace.la
-
-# We can't use automake's automatic dependency tracking, because it
-# breaks when using bootstrap-lean.  Automatic dependency tracking
-# with GCC bootstrap will cause some of the objects to depend on
-# header files in prev-gcc/include, e.g., stddef.h and stdarg.h.  When
-# using bootstrap-lean, prev-gcc is removed after each stage.  When
-# running "make install", those header files will be gone, causing the
-# library to be rebuilt at install time.  That may not succeed.
-
-# These manual dependencies do not include dependencies on unwind.h,
-# even though that is part of GCC, because where to find it depends on
-# whether we are being built as a host library or a target library.
-INCDIR = $(top_srcdir)/../include
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign --ignore-deps'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign --ignore-deps \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign --ignore-deps Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: # $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-backtrace-supported.h: $(top_builddir)/config.status $(srcdir)/backtrace-supported.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES) $(EXTRA_libbacktrace_la_DEPENDENCIES) 
-	$(LINK)  $(libbacktrace_la_OBJECTS) $(libbacktrace_la_LIBADD) $(LIBS)
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-btest$(EXEEXT): $(btest_OBJECTS) $(btest_DEPENDENCIES) $(EXTRA_btest_DEPENDENCIES) 
-	@rm -f btest$(EXEEXT)
-	$(btest_LINK) $(btest_OBJECTS) $(btest_LDADD) $(LIBS)
-stest$(EXEEXT): $(stest_OBJECTS) $(stest_DEPENDENCIES) $(EXTRA_stest_DEPENDENCIES) 
-	@rm -f stest$(EXEEXT)
-	$(LINK) $(stest_OBJECTS) $(stest_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-.c.o:
-	$(COMPILE) -c $<
-
-.c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	$(LTCOMPILE) -c -o $@ $<
-
-btest-btest.o: btest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_CFLAGS) $(CFLAGS) -c -o btest-btest.o `test -f 'btest.c' || echo '$(srcdir)/'`btest.c
-
-btest-btest.obj: btest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_CFLAGS) $(CFLAGS) -c -o btest-btest.obj `if test -f 'btest.c'; then $(CYGPATH_W) 'btest.c'; else $(CYGPATH_W) '$(srcdir)/btest.c'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-
-# GNU Make needs to see an explicit $(MAKE) variable in the command it
-# runs to enable its job server during parallel builds.  Hence the
-# comments below.
-all-multi:
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
-install-multi:
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
-
-mostlyclean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
-clean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE)
-distclean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
-maintainer-clean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
-	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile $(LTLIBRARIES) all-multi config.h
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am clean-multi
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	clean-noinstLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am distclean-multi
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-multi
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am maintainer-clean-multi
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am mostlyclean-multi
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: all all-multi check-am clean-multi distclean-multi install-am \
-	install-multi install-strip maintainer-clean-multi \
-	mostlyclean-multi
-
-.PHONY: CTAGS GTAGS all all-am all-multi am--refresh check check-TESTS \
-	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
-	clean-multi clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-libtool distclean-multi distclean-tags dvi dvi-am \
-	html html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-multi install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic maintainer-clean-multi mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-multi pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am
-
-alloc.lo: config.h backtrace.h internal.h
-backtrace.lo: config.h backtrace.h internal.h
-btest.lo: (INCDIR)/filenames.h backtrace.h backtrace-supported.h
-dwarf.lo: config.h $(INCDIR)/dwarf2.h $(INCDIR)/dwarf2.def \
-	$(INCDIR)/filenames.h backtrace.h internal.h
-elf.lo: config.h backtrace.h internal.h
-fileline.lo: config.h backtrace.h internal.h
-mmap.lo: config.h backtrace.h internal.h
-mmapio.lo: config.h backtrace.h internal.h
-nounwind.lo: config.h internal.h
-pecoff.lo: config.h backtrace.h internal.h
-posix.lo: config.h backtrace.h internal.h
-print.lo: config.h backtrace.h internal.h
-read.lo: config.h backtrace.h internal.h
-simple.lo: config.h backtrace.h internal.h
-sort.lo: config.h backtrace.h internal.h
-stest.lo: config.h backtrace.h internal.h
-state.lo: config.h backtrace.h backtrace-supported.h internal.h
-unknown.lo: config.h backtrace.h internal.h
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/config.h b/rpython/rlib/rvmprof/src/shared/libbacktrace/config.h
deleted file mode 100644
--- a/rpython/rlib/rvmprof/src/shared/libbacktrace/config.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* ELF size: 32 or 64 */
-#define BACKTRACE_ELF_SIZE 32
-
-/* Define to 1 if you have the __atomic functions */
-/* #undef HAVE_ATOMIC_FUNCTIONS */
-
-/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
-   don't. */
-#define HAVE_DECL_STRNLEN 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define if dl_iterate_phdr is available. */
-#define HAVE_DL_ITERATE_PHDR 1
-
-/* Define to 1 if you have the fcntl function */
-#define HAVE_FCNTL 1
-
-/* Define if getexecname is available. */
-/* #undef HAVE_GETEXECNAME */
-
-/* Define if _Unwind_GetIPInfo is available. */
-#define HAVE_GETIPINFO 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <link.h> header file. */
-#define HAVE_LINK_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the __sync functions */
-#define HAVE_SYNC_FUNCTIONS 1
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#define HAVE_SYS_MMAN_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "package-unused"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "package-unused version-unused"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libbacktrace"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "version-unused"
-
-/* The size of `char', as computed by sizeof. */
-/* #undef SIZEOF_CHAR */
-
-/* The size of `int', as computed by sizeof. */
-/* #undef SIZEOF_INT */
-
-/* The size of `long', as computed by sizeof. */
-/* #undef SIZEOF_LONG */
-
-/* The size of `short', as computed by sizeof. */
-/* #undef SIZEOF_SHORT */
-
-/* The size of `void *', as computed by sizeof. */
-/* #undef SIZEOF_VOID_P */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/config.log b/rpython/rlib/rvmprof/src/shared/libbacktrace/config.log
deleted file mode 100644
--- a/rpython/rlib/rvmprof/src/shared/libbacktrace/config.log
+++ /dev/null
@@ -1,1208 +0,0 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by package-unused configure version-unused, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
-
-  $ ./configure 
-
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = ubuntu
-uname -m = i686
-uname -r = 3.13.0-32-generic
-uname -s = Linux
-uname -v = #57~precise1-Ubuntu SMP Tue Jul 15 03:50:54 UTC 2014
-
-/usr/bin/uname -p = unknown
-/bin/uname -X     = unknown
-
-/bin/arch              = unknown
-/usr/bin/arch -k       = unknown
-/usr/convex/getsysinfo = unknown
-/usr/bin/hostinfo      = unknown
-/bin/machine           = unknown
-/usr/bin/oslevel       = unknown
-/bin/universe          = unknown
-
-PATH: /usr/local/sbin
-PATH: /usr/local/bin
-PATH: /usr/sbin
-PATH: /usr/bin
-PATH: /sbin
-PATH: /bin
-PATH: /usr/games
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-configure:2524: checking build system type
-configure:2538: result: i686-pc-linux-gnu
-configure:2558: checking host system type
-configure:2571: result: i686-pc-linux-gnu
-configure:2591: checking target system type
-configure:2604: result: i686-pc-linux-gnu
-configure:2681: checking for gcc
-configure:2697: found /usr/bin/gcc
-configure:2708: result: gcc
-configure:2937: checking for C compiler version
-configure:2946: gcc --version >&5
-gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3
-Copyright (C) 2011 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:2957: $? = 0
-configure:2946: gcc -v >&5
-Using built-in specs.
-COLLECT_GCC=gcc
-COLLECT_LTO_WRAPPER=/usr/lib/gcc/i686-linux-gnu/4.6/lto-wrapper
-Target: i686-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu/Linaro 4.6.3-1ubuntu5' --with-bugurl=file:///usr/share/doc/gcc-4.6/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.6 --enable-shared --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.6 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --enable-plugin --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i686 --with-tune=generic --enable-checking=release --build=i686-linux-gnu --host=i686-linux-gnu --target=i686-linux-gnu
-Thread model: posix
-gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5) 
-configure:2957: $? = 0
-configure:2946: gcc -V >&5
-gcc: error: unrecognized option '-V'
-gcc: fatal error: no input files
-compilation terminated.
-configure:2957: $? = 4
-configure:2946: gcc -qversion >&5
-gcc: error: unrecognized option '-qversion'
-gcc: fatal error: no input files
-compilation terminated.
-configure:2957: $? = 4
-configure:2977: checking for C compiler default output file name
-configure:2999: gcc    conftest.c  >&5
-configure:3003: $? = 0
-configure:3040: result: a.out
-configure:3056: checking whether the C compiler works
-configure:3065: ./a.out
-configure:3069: $? = 0
-configure:3084: result: yes
-configure:3091: checking whether we are cross compiling
-configure:3093: result: no
-configure:3096: checking for suffix of executables
-configure:3103: gcc -o conftest    conftest.c  >&5
-configure:3107: $? = 0
-configure:3129: result: 
-configure:3135: checking for suffix of object files
-configure:3157: gcc -c   conftest.c >&5
-configure:3161: $? = 0
-configure:3182: result: o
-configure:3186: checking whether we are using the GNU C compiler
-configure:3205: gcc -c   conftest.c >&5
-configure:3205: $? = 0
-configure:3214: result: yes
-configure:3223: checking whether gcc accepts -g
-configure:3243: gcc -c -g  conftest.c >&5
-configure:3243: $? = 0
-configure:3284: result: yes
-configure:3301: checking for gcc option to accept ISO C89
-configure:3365: gcc  -c -g -O2  conftest.c >&5
-configure:3365: $? = 0
-configure:3378: result: none needed
-configure:3404: checking how to run the C preprocessor
-configure:3435: gcc -E  conftest.c
-configure:3435: $? = 0
-configure:3449: gcc -E  conftest.c
-conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
-compilation terminated.
-configure:3449: $? = 1
-configure: failed program was:
-| /* confdefs.h */
-| #define PACKAGE_NAME "package-unused"
-| #define PACKAGE_TARNAME "libbacktrace"
-| #define PACKAGE_VERSION "version-unused"
-| #define PACKAGE_STRING "package-unused version-unused"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE_URL ""
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:3474: result: gcc -E
-configure:3494: gcc -E  conftest.c
-configure:3494: $? = 0
-configure:3508: gcc -E  conftest.c
-conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
-compilation terminated.
-configure:3508: $? = 1
-configure: failed program was:
-| /* confdefs.h */
-| #define PACKAGE_NAME "package-unused"
-| #define PACKAGE_TARNAME "libbacktrace"
-| #define PACKAGE_VERSION "version-unused"
-| #define PACKAGE_STRING "package-unused version-unused"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE_URL ""
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:3537: checking for grep that handles long lines and -e
-configure:3595: result: /bin/grep
-configure:3600: checking for egrep
-configure:3662: result: /bin/grep -E
-configure:3667: checking for ANSI C header files
-configure:3687: gcc -c -g -O2  conftest.c >&5
-configure:3687: $? = 0
-configure:3760: gcc -o conftest -g -O2   conftest.c  >&5
-configure:3760: $? = 0
-configure:3760: ./conftest
-configure:3760: $? = 0
-configure:3771: result: yes
-configure:3784: checking for sys/types.h
-configure:3784: gcc -c -g -O2  conftest.c >&5
-configure:3784: $? = 0
-configure:3784: result: yes
-configure:3784: checking for sys/stat.h
-configure:3784: gcc -c -g -O2  conftest.c >&5
-configure:3784: $? = 0
-configure:3784: result: yes
-configure:3784: checking for stdlib.h
-configure:3784: gcc -c -g -O2  conftest.c >&5
-configure:3784: $? = 0
-configure:3784: result: yes
-configure:3784: checking for string.h
-configure:3784: gcc -c -g -O2  conftest.c >&5
-configure:3784: $? = 0
-configure:3784: result: yes
-configure:3784: checking for memory.h
-configure:3784: gcc -c -g -O2  conftest.c >&5
-configure:3784: $? = 0
-configure:3784: result: yes
-configure:3784: checking for strings.h
-configure:3784: gcc -c -g -O2  conftest.c >&5
-configure:3784: $? = 0
-configure:3784: result: yes
-configure:3784: checking for inttypes.h
-configure:3784: gcc -c -g -O2  conftest.c >&5
-configure:3784: $? = 0
-configure:3784: result: yes
-configure:3784: checking for stdint.h
-configure:3784: gcc -c -g -O2  conftest.c >&5
-configure:3784: $? = 0
-configure:3784: result: yes
-configure:3784: checking for unistd.h
-configure:3784: gcc -c -g -O2  conftest.c >&5
-configure:3784: $? = 0
-configure:3784: result: yes
-configure:3798: checking minix/config.h usability
-configure:3798: gcc -c -g -O2  conftest.c >&5
-conftest.c:52:26: fatal error: minix/config.h: No such file or directory
-compilation terminated.
-configure:3798: $? = 1
-configure: failed program was:
-| /* confdefs.h */
-| #define PACKAGE_NAME "package-unused"
-| #define PACKAGE_TARNAME "libbacktrace"
-| #define PACKAGE_VERSION "version-unused"
-| #define PACKAGE_STRING "package-unused version-unused"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE_URL ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #ifdef HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #ifdef HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #ifdef STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # ifdef HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #ifdef HAVE_STRING_H
-| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #ifdef HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #ifdef HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #endif
-| #ifdef HAVE_STDINT_H
-| # include <stdint.h>
-| #endif
-| #ifdef HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <minix/config.h>
-configure:3798: result: no
-configure:3798: checking minix/config.h presence
-configure:3798: gcc -E  conftest.c
-conftest.c:19:26: fatal error: minix/config.h: No such file or directory
-compilation terminated.
-configure:3798: $? = 1
-configure: failed program was:
-| /* confdefs.h */
-| #define PACKAGE_NAME "package-unused"
-| #define PACKAGE_TARNAME "libbacktrace"
-| #define PACKAGE_VERSION "version-unused"
-| #define PACKAGE_STRING "package-unused version-unused"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE_URL ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| /* end confdefs.h.  */
-| #include <minix/config.h>
-configure:3798: result: no
-configure:3798: checking for minix/config.h
-configure:3798: result: no
-configure:3819: checking whether it is safe to define __EXTENSIONS__
-configure:3837: gcc -c -g -O2  conftest.c >&5
-configure:3837: $? = 0
-configure:3844: result: yes
-configure:3887: checking for a BSD-compatible install
-configure:3955: result: /usr/bin/install -c
-configure:3966: checking whether build environment is sane
-configure:4016: result: yes
-configure:4044: WARNING: `missing' script is too old or missing
-configure:4157: checking for a thread-safe mkdir -p
-configure:4196: result: /bin/mkdir -p
-configure:4209: checking for gawk
-configure:4239: result: no
-configure:4209: checking for mawk
-configure:4225: found /usr/bin/mawk
-configure:4236: result: mawk
-configure:4247: checking whether make sets $(MAKE)
-configure:4269: result: yes
-configure:4342: checking whether to enable maintainer-specific portions of Makefiles
-configure:4351: result: no
-configure:4425: checking for gcc
-configure:4452: result: gcc
-configure:4681: checking for C compiler version
-configure:4690: gcc --version >&5
-gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3
-Copyright (C) 2011 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:4701: $? = 0
-configure:4690: gcc -v >&5
-Using built-in specs.
-COLLECT_GCC=gcc
-COLLECT_LTO_WRAPPER=/usr/lib/gcc/i686-linux-gnu/4.6/lto-wrapper
-Target: i686-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu/Linaro 4.6.3-1ubuntu5' --with-bugurl=file:///usr/share/doc/gcc-4.6/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.6 --enable-shared --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.6 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --enable-plugin --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i686 --with-tune=generic --enable-checking=release --build=i686-linux-gnu --host=i686-linux-gnu --target=i686-linux-gnu
-Thread model: posix
-gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5) 
-configure:4701: $? = 0
-configure:4690: gcc -V >&5
-gcc: error: unrecognized option '-V'
-gcc: fatal error: no input files
-compilation terminated.
-configure:4701: $? = 4
-configure:4690: gcc -qversion >&5
-gcc: error: unrecognized option '-qversion'
-gcc: fatal error: no input files
-compilation terminated.
-configure:4701: $? = 4
-configure:4705: checking whether we are using the GNU C compiler
-configure:4733: result: yes
-configure:4742: checking whether gcc accepts -g
-configure:4803: result: yes
-configure:4820: checking for gcc option to accept ISO C89
-configure:4897: result: none needed
-configure:4964: checking for ranlib
-configure:4980: found /usr/bin/ranlib
-configure:4991: result: ranlib
-configure:5018: checking for gawk
-configure:5045: result: mawk
-configure:5106: checking how to print strings
-configure:5133: result: printf
-configure:5154: checking for a sed that does not truncate output
-configure:5218: result: /bin/sed
-configure:5236: checking for fgrep
-configure:5298: result: /bin/grep -F
-configure:5333: checking for ld used by gcc
-configure:5400: result: /usr/bin/ld
-configure:5407: checking if the linker (/usr/bin/ld) is GNU ld
-configure:5422: result: yes
-configure:5434: checking for BSD- or MS-compatible name lister (nm)
-configure:5483: result: /usr/bin/nm -B
-configure:5613: checking the name lister (/usr/bin/nm -B) interface
-configure:5620: gcc -c -g -O2  conftest.c >&5
-configure:5623: /usr/bin/nm -B "conftest.o"
-configure:5626: output
-00000000 B some_variable
-configure:5633: result: BSD nm
-configure:5636: checking whether ln -s works
-configure:5643: result: no, using cp -p
-configure:5648: checking the maximum length of command line arguments
-configure:5773: result: 1572864
-configure:5790: checking whether the shell understands some XSI constructs
-configure:5800: result: yes
-configure:5804: checking whether the shell understands "+="
-configure:5810: result: yes
-configure:5845: checking for /usr/bin/ld option to reload object files
-configure:5852: result: -r
-configure:5921: checking for objdump
-configure:5937: found /usr/bin/objdump
-configure:5948: result: objdump
-configure:5980: checking how to recognize dependent libraries
-configure:6181: result: pass_all
-configure:6241: checking for ar
-configure:6257: found /usr/bin/ar
-configure:6268: result: ar
-configure:6346: checking for strip
-configure:6362: found /usr/bin/strip
-configure:6373: result: strip
-configure:6445: checking for ranlib
-configure:6472: result: ranlib
-configure:6574: checking command to parse /usr/bin/nm -B output from gcc object
-configure:6692: gcc -c -g -O2  conftest.c >&5
-configure:6695: $? = 0
-configure:6699: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
-configure:6702: $? = 0
-configure:6756: gcc -o conftest -g -O2   conftest.c conftstm.o >&5
-configure:6759: $? = 0
-configure:6797: result: ok
-configure:7645: checking for dlfcn.h
-configure:7645: gcc -c -g -O2  conftest.c >&5
-configure:7645: $? = 0
-configure:7645: result: yes
-configure:7832: checking for objdir
-configure:7847: result: .libs
-configure:8118: checking if gcc supports -fno-rtti -fno-exceptions
-configure:8136: gcc -c -g -O2  -fno-rtti -fno-exceptions conftest.c >&5
-cc1: warning: command line option '-fno-rtti' is valid for C++/ObjC++ but not for C [enabled by default]
-configure:8140: $? = 0
-configure:8153: result: no
-configure:8173: checking for gcc option to produce PIC
-configure:8459: result: -fPIC -DPIC
-configure:8471: checking if gcc PIC flag -fPIC -DPIC works
-configure:8489: gcc -c -g -O2  -fPIC -DPIC -DPIC conftest.c >&5
-configure:8493: $? = 0
-configure:8506: result: yes
-configure:8530: checking if gcc static flag -static works
-configure:8558: result: yes
-configure:8573: checking if gcc supports -c -o file.o
-configure:8594: gcc -c -g -O2  -o out/conftest2.o conftest.c >&5
-configure:8598: $? = 0
-configure:8620: result: yes
-configure:8628: checking if gcc supports -c -o file.o
-configure:8675: result: yes
-configure:8708: checking whether the gcc linker (/usr/bin/ld) supports shared libraries
-configure:9779: result: yes
-configure:9816: checking whether -lc should be explicitly linked in
-configure:9824: gcc -c -g -O2  conftest.c >&5
-configure:9827: $? = 0
-configure:9842: gcc -shared  -fPIC -DPIC conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /bin/grep  -lc  \>/dev/null 2\>\&1
-configure:9845: $? = 0
-configure:9859: result: no
-configure:10024: checking dynamic linker characteristics
-configure:10475: gcc -o conftest -g -O2   -Wl,-rpath -Wl,/foo conftest.c  >&5
-configure:10475: $? = 0
-configure:10697: result: GNU/Linux ld.so
-configure:10804: checking how to hardcode library paths into programs
-configure:10829: result: immediate
-configure:11369: checking whether stripping libraries is possible
-configure:11374: result: yes
-configure:11409: checking if libtool supports shared libraries
-configure:11411: result: yes
-configure:11414: checking whether to build shared libraries
-configure:11435: result: yes
-configure:11438: checking whether to build static libraries
-configure:11442: result: yes
-configure:11486: checking unwind.h usability
-configure:11486: gcc -c -g -O2  conftest.c >&5
-configure:11486: $? = 0
-configure:11486: result: yes
-configure:11486: checking unwind.h presence
-configure:11486: gcc -E  conftest.c
-configure:11486: $? = 0
-configure:11486: result: yes
-configure:11486: checking for unwind.h
-configure:11486: result: yes
-configure:11488: checking for _Unwind_Backtrace
-configure:11488: gcc -o conftest -g -O2   conftest.c  >&5
-configure:11488: $? = 0
-configure:11488: result: yes
-configure:11509: checking for -funwind-tables option
-configure:11527: gcc -c -g -O2 -funwind-tables  conftest.c >&5
-configure:11527: $? = 0
-configure:11535: result: yes
-configure:11540: checking for -frandom-seed=string option
-configure:11558: gcc -c -g -O2 -frandom-seed=conftest.lo  conftest.c >&5
-configure:11558: $? = 0
-configure:11566: result: yes
-configure:11593: checking whether gcc supports -W
-configure:11610: gcc -c -W  conftest.c >&5
-configure:11610: $? = 0
-configure:11619: result: yes
-configure:11593: checking whether gcc supports -Wall
-configure:11610: gcc -c -Wall  conftest.c >&5
-configure:11610: $? = 0
-configure:11619: result: yes
-configure:11593: checking whether gcc supports -Wwrite-strings
-configure:11610: gcc -c -Wwrite-strings  conftest.c >&5
-configure:11610: $? = 0
-configure:11619: result: yes
-configure:11593: checking whether gcc supports -Wstrict-prototypes
-configure:11610: gcc -c -Wstrict-prototypes  conftest.c >&5
-conftest.c:28:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
-configure:11610: $? = 0
-configure:11619: result: yes
-configure:11593: checking whether gcc supports -Wmissing-prototypes
-configure:11610: gcc -c -Wmissing-prototypes  conftest.c >&5
-configure:11610: $? = 0
-configure:11619: result: yes
-configure:11593: checking whether gcc supports -Wold-style-definition
-configure:11610: gcc -c -Wold-style-definition  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:28:1: warning: old-style function definition [-Wold-style-definition]
-configure:11610: $? = 0
-configure:11619: result: yes
-configure:11593: checking whether gcc supports -Wmissing-format-attribute
-configure:11610: gcc -c -Wmissing-format-attribute  conftest.c >&5
-configure:11610: $? = 0
-configure:11619: result: yes
-configure:11593: checking whether gcc supports -Wcast-qual
-configure:11610: gcc -c -Wcast-qual  conftest.c >&5
-configure:11610: $? = 0
-configure:11619: result: yes
-configure:11680: checking for _Unwind_GetIPInfo
-configure:11695: gcc -o conftest -g -O2 -Werror-implicit-function-declaration   conftest.c  >&5
-configure:11695: $? = 0
-configure:11703: result: yes
-configure:11723: checking __sync extensions
-configure:11747: gcc -o conftest -g -O2   conftest.c  >&5
-configure:11747: $? = 0
-configure:11756: result: yes
-configure:11768: checking __atomic extensions
-configure:11788: gcc -o conftest -g -O2   conftest.c  >&5
-conftest.c: In function 'main':
-conftest.c:32:22: error: '__ATOMIC_ACQUIRE' undeclared (first use in this function)
-conftest.c:32:22: note: each undeclared identifier is reported only once for each function it appears in
-conftest.c:33:35: error: '__ATOMIC_RELEASE' undeclared (first use in this function)
-configure:11788: $? = 1
-configure: failed program was:
-| /* confdefs.h */
-| #define PACKAGE_NAME "package-unused"
-| #define PACKAGE_TARNAME "libbacktrace"
-| #define PACKAGE_VERSION "version-unused"
-| #define PACKAGE_STRING "package-unused version-unused"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE_URL ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define LT_OBJDIR ".libs/"
-| #define HAVE_GETIPINFO 1
-| #define HAVE_SYNC_FUNCTIONS 1
-| /* end confdefs.h.  */
-| int i;
-| int
-| main ()
-| {
-| __atomic_load_n (&i, __ATOMIC_ACQUIRE);
-| 		       __atomic_store_n (&i, 1, __ATOMIC_RELEASE);
-|   ;
-|   return 0;
-| }
-configure:11797: result: no
-configure:11808: checking output filetype
-configure:11825: gcc -c -g -O2  conftest.c >&5
-configure:11825: $? = 0
-configure:11836: result: elf32
-configure:11893: checking for uintmax_t
-configure:11893: gcc -c -g -O2  conftest.c >&5
-configure:11893: $? = 0
-configure:11893: gcc -c -g -O2  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:35:24: error: expected expression before ')' token
-configure:11893: $? = 1
-configure: failed program was:
-| /* confdefs.h */
-| #define PACKAGE_NAME "package-unused"
-| #define PACKAGE_TARNAME "libbacktrace"
-| #define PACKAGE_VERSION "version-unused"
-| #define PACKAGE_STRING "package-unused version-unused"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE_URL ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define LT_OBJDIR ".libs/"
-| #define HAVE_GETIPINFO 1
-| #define HAVE_SYNC_FUNCTIONS 1
-| #define BACKTRACE_ELF_SIZE 32
-| /* end confdefs.h.  */
-| #include <sys/types.h>
-| #include <stdint.h>
-| 
-| int
-| main ()
-| {
-| if (sizeof ((uintmax_t)))
-| 	    return 0;
-|   ;
-|   return 0;
-| }
-configure:11893: result: yes
-configure:11902: checking for uintptr_t
-configure:11902: gcc -c -g -O2  conftest.c >&5
-configure:11902: $? = 0
-configure:11902: gcc -c -g -O2  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:35:24: error: expected expression before ')' token
-configure:11902: $? = 1
-configure: failed program was:
-| /* confdefs.h */
-| #define PACKAGE_NAME "package-unused"
-| #define PACKAGE_TARNAME "libbacktrace"
-| #define PACKAGE_VERSION "version-unused"
-| #define PACKAGE_STRING "package-unused version-unused"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE_URL ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define LT_OBJDIR ".libs/"
-| #define HAVE_GETIPINFO 1
-| #define HAVE_SYNC_FUNCTIONS 1
-| #define BACKTRACE_ELF_SIZE 32
-| /* end confdefs.h.  */
-| #include <sys/types.h>
-| #include <stdint.h>
-| 
-| int
-| main ()
-| {
-| if (sizeof ((uintptr_t)))
-| 	    return 0;
-|   ;
-|   return 0;
-| }
-configure:11902: result: yes
-configure:11911: checking for int_least32_t
-configure:11911: gcc -c -g -O2  conftest.c >&5
-configure:11911: $? = 0
-configure:11911: gcc -c -g -O2  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:35:28: error: expected expression before ')' token
-configure:11911: $? = 1
-configure: failed program was:
-| /* confdefs.h */
-| #define PACKAGE_NAME "package-unused"
-| #define PACKAGE_TARNAME "libbacktrace"
-| #define PACKAGE_VERSION "version-unused"
-| #define PACKAGE_STRING "package-unused version-unused"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE_URL ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define LT_OBJDIR ".libs/"
-| #define HAVE_GETIPINFO 1
-| #define HAVE_SYNC_FUNCTIONS 1
-| #define BACKTRACE_ELF_SIZE 32
-| /* end confdefs.h.  */
-| #include <sys/types.h>
-| #include <stdint.h>
-| 
-| int
-| main ()
-| {
-| if (sizeof ((int_least32_t)))
-| 	    return 0;
-|   ;
-|   return 0;
-| }
-configure:11911: result: yes
-configure:11920: checking for int_fast32_t
-configure:11920: gcc -c -g -O2  conftest.c >&5
-configure:11920: $? = 0
-configure:11920: gcc -c -g -O2  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:35:27: error: expected expression before ')' token
-configure:11920: $? = 1
-configure: failed program was:
-| /* confdefs.h */
-| #define PACKAGE_NAME "package-unused"
-| #define PACKAGE_TARNAME "libbacktrace"
-| #define PACKAGE_VERSION "version-unused"
-| #define PACKAGE_STRING "package-unused version-unused"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE_URL ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define LT_OBJDIR ".libs/"
-| #define HAVE_GETIPINFO 1
-| #define HAVE_SYNC_FUNCTIONS 1
-| #define BACKTRACE_ELF_SIZE 32
-| /* end confdefs.h.  */
-| #include <sys/types.h>
-| #include <stdint.h>
-| 
-| int
-| main ()
-| {
-| if (sizeof ((int_fast32_t)))
-| 	    return 0;
-|   ;
-|   return 0;
-| }
-configure:11920: result: yes
-configure:11929: checking for uint64_t
-configure:11929: gcc -c -g -O2  conftest.c >&5
-configure:11929: $? = 0
-configure:11929: gcc -c -g -O2  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:35:23: error: expected expression before ')' token
-configure:11929: $? = 1
-configure: failed program was:
-| /* confdefs.h */
-| #define PACKAGE_NAME "package-unused"
-| #define PACKAGE_TARNAME "libbacktrace"
-| #define PACKAGE_VERSION "version-unused"
-| #define PACKAGE_STRING "package-unused version-unused"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE_URL ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define LT_OBJDIR ".libs/"
-| #define HAVE_GETIPINFO 1
-| #define HAVE_SYNC_FUNCTIONS 1
-| #define BACKTRACE_ELF_SIZE 32
-| /* end confdefs.h.  */
-| #include <sys/types.h>
-| #include <stdint.h>
-| 
-| int
-| main ()
-| {
-| if (sizeof ((uint64_t)))
-| 	    return 0;
-|   ;
-|   return 0;
-| }
-configure:11929: result: yes
-configure:12010: checking what to include in gstdint.h
-configure:12038: result: stdint.h (already complete)
-configure:12289: checking sys/mman.h usability
-configure:12289: gcc -c -g -O2  conftest.c >&5
-configure:12289: $? = 0
-configure:12289: result: yes
-configure:12289: checking sys/mman.h presence
-configure:12289: gcc -E  conftest.c
-configure:12289: $? = 0
-configure:12289: result: yes
-configure:12289: checking for sys/mman.h
-configure:12289: result: yes
-configure:12314: checking for mmap
-configure:12314: gcc -o conftest -g -O2   conftest.c  >&5
-configure:12314: $? = 0
-configure:12314: result: yes
-configure:12337: gcc -E  conftest.c
-configure:12337: $? = 0
-configure:12356: checking link.h usability
-configure:12356: gcc -c -g -O2  conftest.c >&5
-configure:12356: $? = 0
-configure:12356: result: yes
-configure:12356: checking link.h presence
-configure:12356: gcc -E  conftest.c
-configure:12356: $? = 0
-configure:12356: result: yes
-configure:12356: checking for link.h
-configure:12356: result: yes
-configure:12391: checking for dl_iterate_phdr
-configure:12391: gcc -o conftest -g -O2   conftest.c  >&5
-configure:12391: $? = 0
-configure:12391: result: yes
-configure:12414: checking for fcntl
-configure:12414: gcc -o conftest -g -O2   conftest.c  >&5
-configure:12414: $? = 0
-configure:12414: result: yes
-configure:12428: checking whether strnlen is declared
-configure:12428: gcc -c -g -O2  conftest.c >&5
-configure:12428: $? = 0
-configure:12428: result: yes
-configure:12447: checking for getexecname
-configure:12447: gcc -o conftest -g -O2   conftest.c  >&5
-/tmp/ccdqaPuA.o: In function `main':
-/media/sf_pypy/rpython/rlib/rvmprof/src/shared/libbacktrace/conftest.c:68: undefined reference to `getexecname'
-collect2: ld returned 1 exit status
-configure:12447: $? = 1
-configure: failed program was:
-| /* confdefs.h */
-| #define PACKAGE_NAME "package-unused"
-| #define PACKAGE_TARNAME "libbacktrace"
-| #define PACKAGE_VERSION "version-unused"
-| #define PACKAGE_STRING "package-unused version-unused"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE_URL ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define LT_OBJDIR ".libs/"
-| #define HAVE_GETIPINFO 1
-| #define HAVE_SYNC_FUNCTIONS 1
-| #define BACKTRACE_ELF_SIZE 32
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_LINK_H 1
-| #define HAVE_DL_ITERATE_PHDR 1
-| #define HAVE_FCNTL 1
-| #define HAVE_DECL_STRNLEN 1
-| /* end confdefs.h.  */
-| /* Define getexecname to an innocuous variant, in case <limits.h> declares getexecname.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define getexecname innocuous_getexecname
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char getexecname (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef getexecname
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char getexecname ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined __stub_getexecname || defined __stub___getexecname
-| choke me
-| #endif
-| 
-| int
-| main ()
-| {
-| return getexecname ();
-|   ;
-|   return 0;
-| }
-configure:12447: result: no
-configure:12461: checking whether tests can run
-configure:12480: gcc -o conftest -g -O2   conftest.c  >&5
-configure:12480: $? = 0
-configure:12480: ./conftest
-configure:12480: $? = 0
-configure:12490: result: yes
-configure:12632: creating ./config.status
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by package-unused config.status version-unused, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status 
-
-on ubuntu
-
-config.status:1123: creating Makefile
-config.status:1123: creating backtrace-supported.h
-config.status:1123: creating config.h
-config.status:1343: executing libtool commands
-config.status:1343: executing gstdint.h commands
-config.status:1343: executing default commands
-
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-
-ac_cv_build=i686-pc-linux-gnu
-ac_cv_c_compiler_gnu=yes
-ac_cv_env_CC_set=
-ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=
-ac_cv_env_CFLAGS_value=
-ac_cv_env_CPPFLAGS_set=
-ac_cv_env_CPPFLAGS_value=
-ac_cv_env_CPP_set=
-ac_cv_env_CPP_value=
-ac_cv_env_LDFLAGS_set=
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_LIBS_set=
-ac_cv_env_LIBS_value=
-ac_cv_env_build_alias_set=
-ac_cv_env_build_alias_value=
-ac_cv_env_host_alias_set=
-ac_cv_env_host_alias_value=
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
-ac_cv_func__Unwind_Backtrace=yes
-ac_cv_func_dl_iterate_phdr=yes
-ac_cv_func_fcntl=yes
-ac_cv_func_getexecname=no
-ac_cv_func_mmap=yes
-ac_cv_have_decl_strnlen=yes
-ac_cv_header_dlfcn_h=yes
-ac_cv_header_inttypes_h=yes
-ac_cv_header_link_h=yes
-ac_cv_header_memory_h=yes
-ac_cv_header_minix_config_h=no
-ac_cv_header_stdc=yes
-ac_cv_header_stdint_h=yes
-ac_cv_header_stdlib_h=yes
-ac_cv_header_string_h=yes
-ac_cv_header_strings_h=yes
-ac_cv_header_sys_mman_h=yes
-ac_cv_header_sys_stat_h=yes
-ac_cv_header_sys_types_h=yes
-ac_cv_header_unistd_h=yes
-ac_cv_header_unwind_h=yes
-ac_cv_host=i686-pc-linux-gnu
-ac_cv_objext=o
-ac_cv_path_EGREP='/bin/grep -E'
-ac_cv_path_FGREP='/bin/grep -F'
-ac_cv_path_GREP=/bin/grep
-ac_cv_path_SED=/bin/sed
-ac_cv_path_install='/usr/bin/install -c'
-ac_cv_path_mkdir=/bin/mkdir
-ac_cv_prog_AWK=mawk
-ac_cv_prog_CPP='gcc -E'
-ac_cv_prog_ac_ct_AR=ar
-ac_cv_prog_ac_ct_CC=gcc
-ac_cv_prog_ac_ct_OBJDUMP=objdump
-ac_cv_prog_ac_ct_RANLIB=ranlib
-ac_cv_prog_ac_ct_STRIP=strip
-ac_cv_prog_cc_c89=
-ac_cv_prog_cc_g=yes
-ac_cv_prog_make_make_set=yes
-ac_cv_safe_to_define___extensions__=yes
-ac_cv_target=i686-pc-linux-gnu
-ac_cv_type_int_fast32_t=yes
-ac_cv_type_int_least32_t=yes
-ac_cv_type_u_int64_t=no
-ac_cv_type_uint64_t=yes
-ac_cv_type_uintmax_t=yes
-ac_cv_type_uintptr_t=yes
-acx_cv_header_stdint=stdint.h
-acx_cv_header_stdint_kind='(already complete)'
-acx_cv_prog_cc_warning__W=yes
-acx_cv_prog_cc_warning__Wall=yes
-acx_cv_prog_cc_warning__Wcast_qual=yes
-acx_cv_prog_cc_warning__Wmissing_format_attribute=yes
-acx_cv_prog_cc_warning__Wmissing_prototypes=yes
-acx_cv_prog_cc_warning__Wold_style_definition=yes
-acx_cv_prog_cc_warning__Wstrict_prototypes=yes
-acx_cv_prog_cc_warning__Wwrite_strings=yes
-libbacktrace_cv_c_random_seed_string=yes
-libbacktrace_cv_c_unwind_tables=yes
-libbacktrace_cv_sys_atomic=no
-libbacktrace_cv_sys_filetype=elf32
-libbacktrace_cv_sys_native=yes
-libbacktrace_cv_sys_sync=yes
-lt_cv_archive_cmds_need_lc=no
-lt_cv_deplibs_check_method=pass_all
-lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_ld_reload_flag=-r
-lt_cv_nm_interface='BSD nm'
-lt_cv_objdir=.libs
-lt_cv_path_LD=/usr/bin/ld
-lt_cv_path_NM='/usr/bin/nm -B'
-lt_cv_prog_compiler_c_o=yes
-lt_cv_prog_compiler_pic_works=yes
-lt_cv_prog_compiler_rtti_exceptions=no
-lt_cv_prog_compiler_static_works=yes
-lt_cv_prog_gnu_ld=yes
-lt_cv_shlibpath_overrides_runpath=no
-lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[	 ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[	 ][	 ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'''
-lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/  {"\2", (void *) \&\2},/p'\'''
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \(lib[^ ]*\)$/  {"\2", (void *) \&\2},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/  {"lib\2", (void *) \&\2},/p'\'''
-lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\'''

From pypy.commits at gmail.com  Wed Apr  5 03:18:04 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Wed, 05 Apr 2017 00:18:04 -0700 (PDT)
Subject: [pypy-commit] pypy default: Don't call configure if the
 libbacktrace library is not used.
Message-ID: <58e49a2c.5aa5df0a.d8d35.e9f9@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r90960:078cbc790834
Date: 2017-04-05 09:17 +0200
http://bitbucket.org/pypy/pypy/changeset/078cbc790834/

Log:	Don't call configure if the libbacktrace library is not used. This
	is an attempt to fix the win32 build

diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -75,7 +75,8 @@
         os.chdir(olddir)
 
 def setup():
-    configure_libbacktrace()
+    if sys.platform.startswith('linux'):
+        configure_libbacktrace()
 
     eci_kwds['compile_extra'].append('-DRPYTHON_LL2CTYPES')
     platform.verify_eci(ExternalCompilationInfo(

From pypy.commits at gmail.com  Wed Apr  5 06:41:45 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 05 Apr 2017 03:41:45 -0700 (PDT)
Subject: [pypy-commit] pypy release-pypy2.7-5.x: Issue #2528: test and fix
 for int_and() propagating wrong bounds
Message-ID: <58e4c9e9.55061c0a.4b93.0a68@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: release-pypy2.7-5.x
Changeset: r90961:e0ad22c8f2c8
Date: 2017-04-04 20:37 +0200
http://bitbucket.org/pypy/pypy/changeset/e0ad22c8f2c8/

Log:	Issue #2528: test and fix for int_and() propagating wrong bounds
	(grafted from 42ab42428685f84d22e980313ba1f4a1b357cafc)

diff --git a/rpython/jit/metainterp/optimizeopt/rewrite.py b/rpython/jit/metainterp/optimizeopt/rewrite.py
--- a/rpython/jit/metainterp/optimizeopt/rewrite.py
+++ b/rpython/jit/metainterp/optimizeopt/rewrite.py
@@ -104,14 +104,14 @@
             return
         elif b2.is_constant():
             val = b2.lower
-            if val == -1 or b1.lower >= 0 \
-                and b1.upper <= val & ~(val + 1):
+            if val == -1 or (b1.bounded() and b1.lower >= 0
+                                          and b1.upper <= val & ~(val + 1)):
                 self.make_equal_to(op, op.getarg(0))
                 return
         elif b1.is_constant():
             val = b1.lower
-            if val == -1 or b2.lower >= 0 \
-                and b2.upper <= val & ~(val + 1):
+            if val == -1 or (b2.bounded() and b2.lower >= 0
+                                          and b2.upper <= val & ~(val + 1)):
                 self.make_equal_to(op, op.getarg(1))
                 return
 
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -5623,6 +5623,26 @@
         """
         self.optimize_loop(ops, expected)
 
+    def test_bug_int_and_1(self):
+        ops = """
+        [p0]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i57 = int_and(i51, 1)
+        i62 = int_eq(i57, 0)
+        guard_false(i62) []
+        """
+        self.optimize_loop(ops, ops)
+
+    def test_bug_int_and_2(self):
+        ops = """
+        [p0]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i57 = int_and(4, i51)
+        i62 = int_eq(i57, 0)
+        guard_false(i62) []
+        """
+        self.optimize_loop(ops, ops)
+
 
 class TestLLtype(BaseTestOptimizeBasic, LLtypeMixin):
     pass

From pypy.commits at gmail.com  Wed Apr  5 06:41:47 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 05 Apr 2017 03:41:47 -0700 (PDT)
Subject: [pypy-commit] pypy release-pypy2.7-5.x: Another case where we read
 .upper without checking .has_upper
Message-ID: <58e4c9eb.4790df0a.d9745.8eed@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: release-pypy2.7-5.x
Changeset: r90962:9ca2794aed92
Date: 2017-04-04 20:47 +0200
http://bitbucket.org/pypy/pypy/changeset/9ca2794aed92/

Log:	Another case where we read .upper without checking .has_upper
	(grafted from e691a4f66264ec4b5a9cfa7c53c5cc079713e274)

diff --git a/rpython/jit/metainterp/optimizeopt/intbounds.py b/rpython/jit/metainterp/optimizeopt/intbounds.py
--- a/rpython/jit/metainterp/optimizeopt/intbounds.py
+++ b/rpython/jit/metainterp/optimizeopt/intbounds.py
@@ -94,8 +94,11 @@
         if b1.known_ge(IntBound(0, 0)) and \
            b2.known_ge(IntBound(0, 0)):
             r = self.getintbound(op)
-            mostsignificant = b1.upper | b2.upper
-            r.intersect(IntBound(0, next_pow2_m1(mostsignificant)))
+            if b1.has_upper and b2.has_upper:
+                mostsignificant = b1.upper | b2.upper
+                r.intersect(IntBound(0, next_pow2_m1(mostsignificant)))
+            else:
+                r.make_ge(IntBound(0, 0))
 
     optimize_INT_OR = optimize_INT_OR_or_XOR
     optimize_INT_XOR = optimize_INT_OR_or_XOR
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -5643,6 +5643,51 @@
         """
         self.optimize_loop(ops, ops)
 
+    def test_bug_int_or(self):
+        ops = """
+        [p0, p1]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i52 = arraylen_gc(p1, descr=arraydescr)
+        i57 = int_or(i51, i52)
+        i62 = int_eq(i57, 0)
+        guard_false(i62) []
+        """
+        self.optimize_loop(ops, ops)
+
+    def test_int_and_positive(self):
+        ops = """
+        [p0, p1]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i52 = arraylen_gc(p1, descr=arraydescr)
+        i57 = int_and(i51, i52)
+        i62 = int_lt(i57, 0)
+        guard_false(i62) []
+        """
+        expected = """
+        [p0, p1]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i52 = arraylen_gc(p1, descr=arraydescr)
+        i57 = int_and(i51, i52)
+        """
+        self.optimize_loop(ops, expected)
+
+    def test_int_or_positive(self):
+        ops = """
+        [p0, p1]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i52 = arraylen_gc(p1, descr=arraydescr)
+        i57 = int_or(i51, i52)
+        i62 = int_lt(i57, 0)
+        guard_false(i62) []
+        """
+        expected = """
+        [p0, p1]
+        i51 = arraylen_gc(p0, descr=arraydescr)
+        i52 = arraylen_gc(p1, descr=arraydescr)
+        i57 = int_or(i51, i52)
+        """
+        self.optimize_loop(ops, expected)
+
 
 class TestLLtype(BaseTestOptimizeBasic, LLtypeMixin):
     pass

From pypy.commits at gmail.com  Wed Apr  5 07:36:02 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Wed, 05 Apr 2017 04:36:02 -0700 (PDT)
Subject: [pypy-commit] pypy default: do not generate the sources by the
 configure script, but include the config files for each individual configs
Message-ID: <58e4d6a2.07addf0a.de6b0.a165@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r90963:8ec4d61dcb0a
Date: 2017-04-05 07:35 -0400
http://bitbucket.org/pypy/pypy/changeset/8ec4d61dcb0a/

Log:	do not generate the sources by the configure script, but include the
	config files for each individual configs

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -49,11 +49,6 @@
 ^rpython/translator/goal/target.+-c$
 ^rpython/translator/goal/.+\.exe$
 ^rpython/translator/goal/.+\.dll$
-^rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile$
-^rpython/rlib/rvmprof/src/shared/libbacktrace/config.h$
-^rpython/rlib/rvmprof/src/shared/libbacktrace/config.log$
-^rpython/rlib/rvmprof/src/shared/libbacktrace/config.status$
-^rpython/rlib/rvmprof/src/shared/libbacktrace/gstdint.h$
 ^pypy/goal/pypy-translation-snapshot$
 ^pypy/goal/pypy-c
 ^pypy/goal/.+\.exe$
diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -1,6 +1,7 @@
 import platform as host_platform
 import py
 import sys
+import shutil
 from rpython.tool.udir import udir
 from rpython.tool.version import rpythonroot
 from rpython.rtyper.lltypesystem import lltype, llmemory, rffi
@@ -64,19 +65,17 @@
     )
 global_eci = ExternalCompilationInfo(**eci_kwds)
 
-def configure_libbacktrace():
-    import subprocess
-    import os
-    olddir = os.getcwd()
-
-    if not BACKTRACE.join('config.h').exists():
-        os.chdir(str(BACKTRACE))
-        subprocess.check_call(["./configure"])
-        os.chdir(olddir)
+def configure_libbacktrace_linux():
+    bits = 32 if sys.maxsize == 2**31-1 else 64
+    # FIXME well, the config generated on x86 seems to work on s390x and ppc
+    # vmprof is currently not supported there! we just need to pass compilation
+    specific_config = 'config-x86_%d.h' % bits
+    config = BACKTRACE.join('config.h')
+    shutil.copy(str(BACKTRACE.join(specific_config)), str(config))
 
 def setup():
     if sys.platform.startswith('linux'):
-        configure_libbacktrace()
+        configure_libbacktrace_linux()
 
     eci_kwds['compile_extra'].append('-DRPYTHON_LL2CTYPES')
     platform.verify_eci(ExternalCompilationInfo(
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/config-x86_32.h b/rpython/rlib/rvmprof/src/shared/libbacktrace/config-x86_32.h
new file mode 100755
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/libbacktrace/config-x86_32.h
@@ -0,0 +1,135 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* ELF size: 32 or 64 */
+#define BACKTRACE_ELF_SIZE 32
+
+/* Define to 1 if you have the __atomic functions */
+/* #undef HAVE_ATOMIC_FUNCTIONS */
+
+/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRNLEN 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define if dl_iterate_phdr is available. */
+#define HAVE_DL_ITERATE_PHDR 1
+
+/* Define to 1 if you have the fcntl function */
+#define HAVE_FCNTL 1
+
+/* Define if getexecname is available. */
+/* #undef HAVE_GETEXECNAME */
+
+/* Define if _Unwind_GetIPInfo is available. */
+#define HAVE_GETIPINFO 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <link.h> header file. */
+#define HAVE_LINK_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the __sync functions */
+#define HAVE_SYNC_FUNCTIONS 1
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#define HAVE_SYS_MMAN_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "package-unused"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "package-unused version-unused"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libbacktrace"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "version-unused"
+
+/* The size of `char', as computed by sizeof. */
+/* #undef SIZEOF_CHAR */
+
+/* The size of `int', as computed by sizeof. */
+/* #undef SIZEOF_INT */
+
+/* The size of `long', as computed by sizeof. */
+/* #undef SIZEOF_LONG */
+
+/* The size of `short', as computed by sizeof. */
+/* #undef SIZEOF_SHORT */
+
+/* The size of `void *', as computed by sizeof. */
+/* #undef SIZEOF_VOID_P */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/config-x86_64.h b/rpython/rlib/rvmprof/src/shared/libbacktrace/config-x86_64.h
new file mode 100644
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/libbacktrace/config-x86_64.h
@@ -0,0 +1,135 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* ELF size: 32 or 64 */
+#define BACKTRACE_ELF_SIZE 64
+
+/* Define to 1 if you have the __atomic functions */
+#define HAVE_ATOMIC_FUNCTIONS 1
+
+/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRNLEN 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define if dl_iterate_phdr is available. */
+#define HAVE_DL_ITERATE_PHDR 1
+
+/* Define to 1 if you have the fcntl function */
+#define HAVE_FCNTL 1
+
+/* Define if getexecname is available. */
+/* #undef HAVE_GETEXECNAME */
+
+/* Define if _Unwind_GetIPInfo is available. */
+#define HAVE_GETIPINFO 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <link.h> header file. */
+#define HAVE_LINK_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the __sync functions */
+#define HAVE_SYNC_FUNCTIONS 1
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#define HAVE_SYS_MMAN_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "package-unused"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "package-unused version-unused"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libbacktrace"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "version-unused"
+
+/* The size of `char', as computed by sizeof. */
+/* #undef SIZEOF_CHAR */
+
+/* The size of `int', as computed by sizeof. */
+/* #undef SIZEOF_INT */
+
+/* The size of `long', as computed by sizeof. */
+/* #undef SIZEOF_LONG */
+
+/* The size of `short', as computed by sizeof. */
+/* #undef SIZEOF_SHORT */
+
+/* The size of `void *', as computed by sizeof. */
+/* #undef SIZEOF_VOID_P */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/config.guess b/rpython/rlib/rvmprof/src/shared/libbacktrace/config.guess
deleted file mode 100755
--- a/rpython/rlib/rvmprof/src/shared/libbacktrace/config.guess
+++ /dev/null
@@ -1,1466 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright 1992-2017 Free Software Foundation, Inc.
-
-timestamp='2017-03-05'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-#
-# Please send patches to <config-patches at gnu.org>.
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches at gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2017 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi at noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
-
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
-	#include <features.h>
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#else
-	LIBC=gnu
-	#endif
-	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
-	;;
-esac
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	    /sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || \
-	    echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    earmv*)
-		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
-		machine=${arch}${endian}-unknown
-		;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently (or will in the future) and ABI.
-	case "${UNAME_MACHINE_ARCH}" in
-	    earm*)
-		os=netbsdelf
-		;;
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# Determine ABI tags.
-	case "${UNAME_MACHINE_ARCH}" in
-	    earm*)
-		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}${abi}"
-	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:LibertyBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:Sortix:*:*)
-	echo ${UNAME_MACHINE}-unknown-sortix
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE=alpha ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE=alphaev5 ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE=alphaev56 ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE=alphapca56 ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE=alphapca57 ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE=alphaev6 ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE=alphaev67 ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE=alphaev69 ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE=alphaev7 ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE=alphaev79 ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH=i386
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH=x86_64
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[4567])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/lslpp ] ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
-			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH=hppa2.0n ;;
-			  64) HP_ARCH=hppa2.0w ;;
-			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = hppa2.0w ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH=hppa2.0w
-	    else
-		HP_ARCH=hppa64
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
-	    amd64)
-		UNAME_PROCESSOR=x86_64 ;;
-	    i386)
-		UNAME_PROCESSOR=i586 ;;
-	esac
-	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    *:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    e2k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    k1om:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-	;;
-    mips64el:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    openrisc*:Linux:*:*)
-	echo or1k-unknown-linux-${LIBC}
-	exit ;;
-    or32:Linux:*:* | or1k*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-${LIBC}
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
-	exit ;;
-    ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-${LIBC}
-	exit ;;
-    ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-${LIBC}
-	exit ;;
-    riscv32:Linux:*:* | riscv64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
-	exit ;;
-    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-	exit ;;
-    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configure will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel at ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes at openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf at swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green at stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green at stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
-	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-	exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-ACE:SUPER-UX:*:*)
-	echo sxace-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
-	fi
-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		    grep IS_64BIT_ARCH >/dev/null
-		then
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
-	    fi
-	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
-	fi
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = x86; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSX-?:NONSTOP_KERNEL:*:*)
-	echo nsx-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = 386; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
-    amd64:Isilon\ OneFS:*:*)
-	echo x86_64-unknown-onefs
-	exit ;;
-esac
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite
-config.guess and config.sub with the latest versions from:
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-
-If $0 has already been updated, send the following data and any
-information you think might be pertinent to config-patches at gnu.org to
-provide the necessary information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/rpython/rlib/rvmprof/src/shared/libbacktrace/gstdint.h b/rpython/rlib/rvmprof/src/shared/libbacktrace/gstdint.h
new file mode 100644
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/libbacktrace/gstdint.h
@@ -0,0 +1,47 @@
+/* generated for  gcc (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1) */
+
+#ifndef GCC_GENERATED_STDINT_H
+#define GCC_GENERATED_STDINT_H 1
+
+#include <sys/types.h>
+#include <stdint.h>
+/* glibc uses these symbols as guards to prevent redefinitions.  */
+#ifdef __int8_t_defined
+#define _INT8_T
+#define _INT16_T
+#define _INT32_T
+#endif
+#ifdef __uint32_t_defined
+#define _UINT32_T
+#endif
+
+
+/* Some systems have guard macros to prevent redefinitions, define them.  */
+#ifndef _INT8_T
+#define _INT8_T
+#endif
+#ifndef _INT16_T
+#define _INT16_T
+#endif
+#ifndef _INT32_T
+#define _INT32_T
+#endif
+#ifndef _UINT8_T
+#define _UINT8_T
+#endif
+#ifndef _UINT16_T
+#define _UINT16_T
+#endif
+#ifndef _UINT32_T
+#define _UINT32_T
+#endif
+
+/* system headers have good uint64_t and int64_t */
+#ifndef _INT64_T
+#define _INT64_T
+#endif
+#ifndef _UINT64_T
+#define _UINT64_T
+#endif
+
+#endif /* GCC_GENERATED_STDINT_H */

From pypy.commits at gmail.com  Wed Apr  5 09:30:20 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 05 Apr 2017 06:30:20 -0700 (PDT)
Subject: [pypy-commit] pypy reusing-r11: A branch to play with reusing the
 constant value loaded in r11 across
Message-ID: <58e4f16c.8aa4df0a.d8ae4.83a0@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: reusing-r11
Changeset: r90964:82a65c384629
Date: 2017-04-05 14:39 +0200
http://bitbucket.org/pypy/pypy/changeset/82a65c384629/

Log:	A branch to play with reusing the constant value loaded in r11
	across instructions


From pypy.commits at gmail.com  Wed Apr  5 09:30:23 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 05 Apr 2017 06:30:23 -0700 (PDT)
Subject: [pypy-commit] pypy reusing-r11: in-progress
Message-ID: <58e4f16f.58301c0a.310a8.461e@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: reusing-r11
Changeset: r90965:d8f5a5347abb
Date: 2017-04-05 15:29 +0200
http://bitbucket.org/pypy/pypy/changeset/d8f5a5347abb/

Log:	in-progress

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -277,7 +277,7 @@
         #
         mc.TEST_rr(eax.value, eax.value)
         mc.J_il(rx86.Conditions['Z'], 0xfffff) # patched later
-        jz_location = mc.get_relative_pos()
+        jz_location = mc.get_relative_pos(break_basic_block=False)
         mc.MOV_rr(ecx.value, eax.value)
         #
         nursery_free_adr = self.cpu.gc_ll_descr.get_nursery_free_addr()
@@ -718,6 +718,7 @@
         if rx86.fits_in_32bits(offset):
             mc.JMP_l(offset)
         else:
+            # mc.forget_scratch_register() not needed here
             mc.MOV_ri(X86_64_SCRATCH_REG.value, adr_new_target)
             mc.JMP_r(X86_64_SCRATCH_REG.value)
         mc.copy_to_raw_memory(adr_jump_offset)
@@ -830,10 +831,10 @@
         descrs = self.cpu.gc_ll_descr.getframedescrs(self.cpu)
         ofs = self.cpu.unpack_fielddescr(descrs.arraydescr.lendescr)
         mc.CMP_bi(ofs, 0xffffff)     # force writing 32 bit
-        stack_check_cmp_ofs = mc.get_relative_pos() - 4
+        stack_check_cmp_ofs = mc.get_relative_pos(break_basic_block=False) - 4
         jg_location = mc.emit_forward_jump('GE')
         mc.MOV_si(WORD, 0xffffff)     # force writing 32 bit
-        ofs2 = mc.get_relative_pos() - 4
+        ofs2 = mc.get_relative_pos(break_basic_block=False) - 4
         self.push_gcmap(mc, gcmap, store=True)
         mc.CALL(imm(self._frame_realloc_slowpath))
         # patch the JG above
@@ -850,11 +851,11 @@
         descrs = self.cpu.gc_ll_descr.getframedescrs(self.cpu)
         ofs = self.cpu.unpack_fielddescr(descrs.arraydescr.lendescr)
         mc.CMP_bi(ofs, 0xffffff)
-        stack_check_cmp_ofs = mc.get_relative_pos() - 4
+        stack_check_cmp_ofs = mc.get_relative_pos(break_basic_block=False) - 4
         jg_location = mc.emit_forward_jump('GE')
         mc.MOV_rr(edi.value, ebp.value)
         mc.MOV_ri(esi.value, 0xffffff)
-        ofs2 = mc.get_relative_pos() - 4
+        ofs2 = mc.get_relative_pos(break_basic_block=False) - 4
         mc.CALL(imm(self.cpu.realloc_frame_crash))
         # patch the JG above
         mc.patch_forward_jump(jg_location)
@@ -895,6 +896,7 @@
             # "mov r11, addr; jmp r11" is up to 13 bytes, which fits in there
             # because we always write "mov r11, imm-as-8-bytes; call *r11" in
             # the first place.
+            # mc.forget_scratch_register() not needed here
             mc.MOV_ri(X86_64_SCRATCH_REG.value, adr_new_target)
             mc.JMP_r(X86_64_SCRATCH_REG.value)
             p = rffi.cast(rffi.INTP, adr_jump_offset)
@@ -939,7 +941,7 @@
             # would be used to pass arguments #3 and #4 (even though, so
             # far, the assembler only receives two arguments).
             tloc = esi
-            old = r11
+            old = r10
         # eax = address in the stack of a 3-words struct vmprof_stack_s
         self.mc.LEA_rs(eax.value, (FRAME_FIXED_SIZE - 4) * WORD)
         # old = current value of vmprof_tl_stack
@@ -1023,27 +1025,14 @@
         fit in 32 bits, it will be loaded in r11.
         """
         rst = gcrootmap.get_root_stack_top_addr()
-        if rx86.fits_in_32bits(rst):
-            mc.MOV_rj(ebx.value, rst)            # MOV ebx, [rootstacktop]
-        else:
-            mc.MOV_ri(X86_64_SCRATCH_REG.value, rst) # MOV r11, rootstacktop
-            mc.MOV_rm(ebx.value, (X86_64_SCRATCH_REG.value, 0))
-            # MOV ebx, [r11]
-        #
+        mc.MOV(ebx, heap(rst))                  # maybe via loading r11
         return rst
 
     def _call_header_shadowstack(self, gcrootmap):
         rst = self._load_shadowstack_top_in_ebx(self.mc, gcrootmap)
         self.mc.MOV_mr((ebx.value, 0), ebp.value)      # MOV [ebx], ebp
         self.mc.ADD_ri(ebx.value, WORD)
-        if rx86.fits_in_32bits(rst):
-            self.mc.MOV_jr(rst, ebx.value)            # MOV [rootstacktop], ebx
-        else:
-            # The integer 'rst' doesn't fit in 32 bits, so we know that
-            # _load_shadowstack_top_in_ebx() above loaded it in r11.
-            # Reuse it.  Be careful not to overwrite r11 in the middle!
-            self.mc.MOV_mr((X86_64_SCRATCH_REG.value, 0),
-                           ebx.value) # MOV [r11], ebx
+        self.mc.MOV(heap(rst), ebx)                   # MOV [rootstacktop], ebx
 
     def _call_footer_shadowstack(self, gcrootmap):
         rst = gcrootmap.get_root_stack_top_addr()
@@ -1449,7 +1438,7 @@
         # has been emitted.  64-bit mode only.
         assert IS_X86_64
         address_in_buffer = index * WORD   # at the start of the buffer
-        p_location = self.mc.get_relative_pos()
+        p_location = self.mc.get_relative_pos(break_basic_block=False)
         offset = address_in_buffer - p_location
         self.mc.overwrite32(p_location-4, offset)
 
@@ -1551,7 +1540,7 @@
             self.mc.add_pending_relocation()
         elif WORD == 8:
             self.mc.J_il(rx86.Conditions['Z'], 0)
-            pos = self.mc.get_relative_pos()
+            pos = self.mc.get_relative_pos(break_basic_block=False)
             self.pending_memoryerror_trampoline_from.append(pos)
 
     # ----------
@@ -1721,7 +1710,8 @@
 
     def genop_guard_guard_not_invalidated(self, guard_op, guard_token,
                                           locs, ign):
-        pos = self.mc.get_relative_pos() + 1 # after potential jmp
+        pos = self.mc.get_relative_pos(break_basic_block=False)
+        pos += 1   # after potential jmp
         guard_token.pos_jump_offset = pos
         self.pending_guard_tokens.append(guard_token)
 
@@ -2077,7 +2067,8 @@
         assert self.guard_success_cc >= 0
         self.mc.J_il(rx86.invert_condition(self.guard_success_cc), 0)
         self.guard_success_cc = rx86.cond_none
-        guard_token.pos_jump_offset = self.mc.get_relative_pos() - 4
+        pos = self.mc.get_relative_pos(break_basic_block=False)
+        guard_token.pos_jump_offset = pos - 4
         self.pending_guard_tokens.append(guard_token)
 
     def _genop_real_call(self, op, arglocs, resloc):
@@ -2125,6 +2116,7 @@
 
         faildescrindex = self.get_gcref_from_faildescr(faildescr)
         if IS_X86_64:
+            self.mc.forget_scratch_register()
             self.mc.MOV_rp(X86_64_SCRATCH_REG.value, 0)
             self._patch_load_from_gc_table(faildescrindex)
             self.mc.MOV(raw_stack(ofs), X86_64_SCRATCH_REG)
@@ -2313,6 +2305,7 @@
                 if IS_X86_64 and isinstance(loc_base, RegLoc):
                     # copy loc_index into r11
                     tmp1 = X86_64_SCRATCH_REG
+                    mc.forget_scratch_register()
                     mc.MOV_rr(tmp1.value, loc_index.value)
                     final_pop = False
                 else:
@@ -2325,7 +2318,13 @@
                 # XOR tmp, -8
                 mc.XOR_ri(tmp1.value, -8)
                 # BTS [loc_base], tmp
-                mc.BTS(addr_add_const(loc_base, 0), tmp1)
+                if final_pop:
+                    # r11 is not specially used, fall back to regloc.py
+                    mc.BTS(addr_add_const(loc_base, 0), tmp1)
+                else:
+                    # tmp1 is r11!  but in this case, loc_base is a
+                    # register so we can invoke directly rx86.py
+                    mc.BTS_mr((loc_base.value, 0), tmp1.value)
                 # done
                 if final_pop:
                     mc.POP_r(loc_index.value)
diff --git a/rpython/jit/backend/x86/callbuilder.py b/rpython/jit/backend/x86/callbuilder.py
--- a/rpython/jit/backend/x86/callbuilder.py
+++ b/rpython/jit/backend/x86/callbuilder.py
@@ -239,7 +239,7 @@
             if IS_X86_32:
                 tmpreg = edx
             else:
-                tmpreg = r11     # edx is used for 3rd argument
+                tmpreg = r10                   # edx is used for 3rd argument
             mc.MOV_rm(tmpreg.value, (tlofsreg.value, p_errno))
             mc.MOV32_rm(eax.value, (tlofsreg.value, rpy_errno))
             mc.MOV32_mr((tmpreg.value, 0), eax.value)
diff --git a/rpython/jit/backend/x86/codebuf.py b/rpython/jit/backend/x86/codebuf.py
--- a/rpython/jit/backend/x86/codebuf.py
+++ b/rpython/jit/backend/x86/codebuf.py
@@ -42,10 +42,10 @@
         self.ops_offset = {}
 
     def add_pending_relocation(self):
-        self.relocations.append(self.get_relative_pos())
+        self.relocations.append(self.get_relative_pos(break_basic_block=False))
 
     def mark_op(self, op):
-        pos = self.get_relative_pos()
+        pos = self.get_relative_pos(break_basic_block=False)
         self.ops_offset[op] = pos
 
     def copy_to_raw_memory(self, addr):
@@ -64,11 +64,11 @@
 
     def emit_forward_jump_cond(self, cond):
         self.J_il8(cond, 0)
-        return self.get_relative_pos()
+        return self.get_relative_pos(break_basic_block=False)
 
     def emit_forward_jump_uncond(self):
         self.JMP_l8(0)
-        return self.get_relative_pos()
+        return self.get_relative_pos(break_basic_block=False)
 
     def patch_forward_jump(self, jcond_location):
         offset = self.get_relative_pos() - jcond_location
@@ -76,3 +76,8 @@
         if offset > 127:
             raise ShortJumpTooFar
         self.overwrite(jcond_location-1, chr(offset))
+
+    def get_relative_pos(self, break_basic_block=True):
+        if break_basic_block:
+            self.forget_scratch_register()
+        return BlockBuilderMixin.get_relative_pos(self)
diff --git a/rpython/jit/backend/x86/jump.py b/rpython/jit/backend/x86/jump.py
--- a/rpython/jit/backend/x86/jump.py
+++ b/rpython/jit/backend/x86/jump.py
@@ -77,6 +77,7 @@
             assembler.regalloc_pop(dst)
             return
         assembler.regalloc_mov(src, tmpreg)
+        assembler.mc.forget_scratch_register()
         src = tmpreg
     assembler.regalloc_mov(src, dst)
 
diff --git a/rpython/jit/backend/x86/regalloc.py b/rpython/jit/backend/x86/regalloc.py
--- a/rpython/jit/backend/x86/regalloc.py
+++ b/rpython/jit/backend/x86/regalloc.py
@@ -435,9 +435,9 @@
 
     def consider_guard_not_invalidated(self, op):
         mc = self.assembler.mc
-        n = mc.get_relative_pos()
+        n = mc.get_relative_pos(break_basic_block=False)
         self.perform_guard(op, [], None)
-        assert n == mc.get_relative_pos()
+        assert n == mc.get_relative_pos(break_basic_block=False)
         # ensure that the next label is at least 5 bytes farther than
         # the current position.  Otherwise, when invalidating the guard,
         # we would overwrite randomly the next label's position.
diff --git a/rpython/jit/backend/x86/regloc.py b/rpython/jit/backend/x86/regloc.py
--- a/rpython/jit/backend/x86/regloc.py
+++ b/rpython/jit/backend/x86/regloc.py
@@ -4,7 +4,7 @@
 from rpython.jit.backend.x86.arch import WORD, IS_X86_32, IS_X86_64
 from rpython.tool.sourcetools import func_with_new_name
 from rpython.rlib.objectmodel import specialize, instantiate
-from rpython.rlib.rarithmetic import intmask
+from rpython.rlib.rarithmetic import intmask, r_uint
 from rpython.jit.metainterp.history import FLOAT, INT
 from rpython.jit.codewriter import longlong
 from rpython.rtyper.lltypesystem import rffi, lltype
@@ -355,7 +355,8 @@
 # without an xmm scratch reg.
 X86_64_XMM_SCRATCH_REG = xmm15
 
-unrolling_location_codes = unrolling_iterable(list("rbsmajix"))
+# note: 'r' is after 'i' in this list, for _binaryop()
+unrolling_location_codes = unrolling_iterable(list("irbsmajx"))
 
 @specialize.arg(1)
 def _rx86_getattr(obj, methname):
@@ -372,9 +373,7 @@
 class LocationCodeBuilder(object):
     _mixin_ = True
 
-    _reuse_scratch_register = False   # for now, this is always False
-    _scratch_register_known = False   # for now, this is always False
-    _scratch_register_value = 0
+    _scratch_register_value = 0    # 0 means 'unknown'
 
     def _binaryop(name):
 
@@ -383,7 +382,7 @@
             val2 = loc2.value_i()
             if name == 'MOV' and isinstance(loc1, RegLoc):
                 self.MOV_ri(loc1.value, val2)
-                return
+                return True
             code1 = loc1.location_code()
             if code1 == 'j':
                 checkvalue = loc1.value_j()
@@ -402,10 +401,11 @@
                 self.MOV_ri(freereg.value, val2)
                 INSN(self, loc1, freereg)
                 self.POP_r(freereg.value)
+                return True
             else:
                 # For this case, we should not need the scratch register more than here.
                 self._load_scratch(val2)
-                INSN(self, loc1, X86_64_SCRATCH_REG)
+                return False
 
         def invoke(self, codes, val1, val2):
             methname = name + "_" + codes
@@ -433,15 +433,15 @@
             code1 = loc1.location_code()
             code2 = loc2.location_code()
 
-            # You can pass in the scratch register as a location, but you
-            # must be careful not to combine it with location types that
-            # might need to use the scratch register themselves.
-            if loc2 is X86_64_SCRATCH_REG:
-                if code1 == 'j':
-                    assert (name.startswith("MOV") and
-                            rx86.fits_in_32bits(loc1.value_j()))
-            if loc1 is X86_64_SCRATCH_REG and not name.startswith("MOV"):
-                assert code2 not in ('j', 'i')
+            # You cannot pass in the scratch register as a location,
+            # except with a MOV instruction.
+            if name.startswith('MOV'):
+                if loc2 is X86_64_SCRATCH_REG:
+                    assert code1 != 'j' and code1 != 'm' and code1 != 'a'
+                if loc1 is X86_64_SCRATCH_REG:
+                    self.forget_scratch_register()
+            elif loc1 is X86_64_SCRATCH_REG or loc2 is X86_64_SCRATCH_REG:
+                raise AssertionError("%s with scratch reg specified" % name)
 
             for possible_code2 in unrolling_location_codes:
                 if not has_implementation_for('?', possible_code2):
@@ -451,8 +451,14 @@
                     #
                     # Fake out certain operations for x86_64
                     if self.WORD == 8 and possible_code2 == 'i' and not rx86.fits_in_32bits(val2):
-                        insn_with_64_bit_immediate(self, loc1, loc2)
-                        return
+                        if insn_with_64_bit_immediate(self, loc1, loc2):
+                            return      # done
+                        loc2 = X86_64_SCRATCH_REG
+                        code2 = 'r'
+                        # NB. unrolling_location_codes contains 'r'
+                        # after 'i', so that it will be found after
+                        # this iteration
+                        continue
                     #
                     # Regular case
                     for possible_code1 in unrolling_location_codes:
@@ -487,6 +493,9 @@
 
     def _unaryop(name):
         def INSN(self, loc):
+            if loc is X86_64_SCRATCH_REG:
+                raise AssertionError("%s with scratch reg specified" % name)
+
             code = loc.location_code()
             for possible_code in unrolling_location_codes:
                 if code == possible_code:
@@ -532,6 +541,9 @@
                     else:
                         methname = name + "_" + possible_code
                         _rx86_getattr(self, methname)(val)
+            # This is for CALL and JMP, so it's correct to forget
+            # the value of the R11 register here.
+            self.forget_scratch_register()
 
         return func_with_new_name(INSN, "INSN_" + name)
 
@@ -540,16 +552,18 @@
         # If we are within a "reuse_scratch_register" block, we remember the
         # last value we loaded to the scratch register and encode the address
         # as an offset from that if we can
-        if self._scratch_register_known:
-            offset = addr - self._scratch_register_value
+        if self._scratch_register_value != 0:
+            offset = r_uint(addr) - r_uint(self._scratch_register_value)
+            offset = intmask(offset)
             if rx86.fits_in_32bits(offset):
+                print '_addr_as_reg_offset(%x) [REUSED r11+%d]' % (
+                    addr, offset)
                 return (X86_64_SCRATCH_REG.value, offset)
+            print '_addr_as_reg_offset(%x) [too far]' % (addr,)
             # else: fall through
-
-        if self._reuse_scratch_register:
-            self._scratch_register_known = True
-            self._scratch_register_value = addr
-
+        else:
+            print '_addr_as_reg_offset(%x) [new]' % (addr,)
+        self._scratch_register_value = addr
         self.MOV_ri(X86_64_SCRATCH_REG.value, addr)
         return (X86_64_SCRATCH_REG.value, 0)
 
@@ -557,12 +571,11 @@
         # For cases where an AddressLoc has the location_code 'm', but
         # where the static offset does not fit in 32-bits.  We have to fall
         # back to the X86_64_SCRATCH_REG.  Returns a new location encoded
-        # as mode 'm' too.  These are all possibly rare cases; don't try
-        # to reuse a past value of the scratch register at all.
-        self._scratch_register_known = False
-        self.MOV_ri(X86_64_SCRATCH_REG.value, static_offset)
+        # as mode 'm' too.  These are all possibly rare cases.
+        ofs = self._addr_as_reg_offset(static_offset)
+        self.forget_scratch_register()
         self.LEA_ra(X86_64_SCRATCH_REG.value,
-                    (basereg, X86_64_SCRATCH_REG.value, 0, 0))
+                    (basereg, X86_64_SCRATCH_REG.value, 0, ofs))
         return (X86_64_SCRATCH_REG.value, 0)
 
     def _fix_static_offset_64_a(self, (basereg, scalereg,
@@ -570,41 +583,48 @@
         # For cases where an AddressLoc has the location_code 'a', but
         # where the static offset does not fit in 32-bits.  We have to fall
         # back to the X86_64_SCRATCH_REG.  In one case it is even more
-        # annoying.  These are all possibly rare cases; don't try to reuse a
-        # past value of the scratch register at all.
-        self._scratch_register_known = False
-        self.MOV_ri(X86_64_SCRATCH_REG.value, static_offset)
+        # annoying.  These are all possibly rare cases.
+        ofs = self._addr_as_reg_offset(static_offset)
         #
         if basereg != rx86.NO_BASE_REGISTER:
+            self.forget_scratch_register()
             self.LEA_ra(X86_64_SCRATCH_REG.value,
-                        (basereg, X86_64_SCRATCH_REG.value, 0, 0))
-        return (X86_64_SCRATCH_REG.value, scalereg, scale, 0)
+                        (basereg, X86_64_SCRATCH_REG.value, 0, ofs))
+            ofs = 0
+        return (X86_64_SCRATCH_REG.value, scalereg, scale, ofs)
 
     def _load_scratch(self, value):
-        if (self._scratch_register_known
-            and value == self._scratch_register_value):
-            return
-        if self._reuse_scratch_register:
-            self._scratch_register_known = True
-            self._scratch_register_value = value
+        if self._scratch_register_value != 0:
+            if self._scratch_register_value == value:
+                print '_load_scratch(%x) [REUSED]' % (value,)
+                return
+            offset = r_uint(value) - r_uint(self._scratch_register_value)
+            offset = intmask(offset)
+            if rx86.fits_in_32bits(offset):
+                print '_load_scratch(%x) [LEA r11+%d]' % (value, offset)
+                global COUNT_
+                try:
+                    COUNT_ += 1
+                except NameError:
+                    COUNT_ = 1
+                if COUNT_ % 182 == 0:
+                    import pdb;pdb.set_trace()
+                self.LEA_rm(X86_64_SCRATCH_REG.value,
+                    (X86_64_SCRATCH_REG.value, offset))
+                self._scratch_register_value = value
+                return
+            print '_load_scratch(%x) [too far]' % (value,)
+        else:
+            print '_load_scratch(%x) [new]' % (value,)
+        self._scratch_register_value = value
         self.MOV_ri(X86_64_SCRATCH_REG.value, value)
 
+    def forget_scratch_register(self):
+        self._scratch_register_value = 0
+
     def trap(self):
         self.INT3()
 
-    def begin_reuse_scratch_register(self):
-        # --NEVER CALLED (only from a specific test)--
-        # Flag the beginning of a block where it is okay to reuse the value
-        # of the scratch register. In theory we shouldn't have to do this if
-        # we were careful to mark all possible targets of a jump or call, and
-        # "forget" the value of the scratch register at those positions, but
-        # for now this seems safer.
-        self._reuse_scratch_register = True
-
-    def end_reuse_scratch_register(self):
-        self._reuse_scratch_register = False
-        self._scratch_register_known = False
-
     def _vector_size_choose(name):
         def invoke(self, suffix, val1, val2):
             methname = name + suffix

From pypy.commits at gmail.com  Wed Apr  5 09:46:02 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Wed, 05 Apr 2017 06:46:02 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Display the reason for skipped lib-python
 tests
Message-ID: <58e4f51a.cf0d1c0a.ecfa1.5435@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r90966:846a7740a9e2
Date: 2017-04-05 15:45 +0200
http://bitbucket.org/pypy/pypy/changeset/846a7740a9e2/

Log:	Display the reason for skipped lib-python tests

diff --git a/testrunner/lib_python_tests.py b/testrunner/lib_python_tests.py
--- a/testrunner/lib_python_tests.py
+++ b/testrunner/lib_python_tests.py
@@ -15,6 +15,7 @@
     [sys.executable, "pypy/test_all.py",
      "--pypy=pypy/goal/pypy3-c",
      "--timeout=3600",
+     "-rs",
      "--resultlog=cpython.log", "lib-python",
      ] + sys.argv[1:],
     cwd=rootdir)

From pypy.commits at gmail.com  Wed Apr  5 10:05:47 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 05 Apr 2017 07:05:47 -0700 (PDT)
Subject: [pypy-commit] pypy reusing-r11: fixes
Message-ID: <58e4f9bb.9ba2df0a.fd6ef.166d@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: reusing-r11
Changeset: r90967:b5e006d2ab59
Date: 2017-04-05 16:05 +0200
http://bitbucket.org/pypy/pypy/changeset/b5e006d2ab59/

Log:	fixes

diff --git a/rpython/jit/backend/x86/regloc.py b/rpython/jit/backend/x86/regloc.py
--- a/rpython/jit/backend/x86/regloc.py
+++ b/rpython/jit/backend/x86/regloc.py
@@ -556,13 +556,13 @@
             offset = r_uint(addr) - r_uint(self._scratch_register_value)
             offset = intmask(offset)
             if rx86.fits_in_32bits(offset):
-                print '_addr_as_reg_offset(%x) [REUSED r11+%d]' % (
-                    addr, offset)
+                #print '_addr_as_reg_offset(%x) [REUSED r11+%d]' % (
+                #    addr, offset)
                 return (X86_64_SCRATCH_REG.value, offset)
-            print '_addr_as_reg_offset(%x) [too far]' % (addr,)
+            #print '_addr_as_reg_offset(%x) [too far]' % (addr,)
             # else: fall through
-        else:
-            print '_addr_as_reg_offset(%x) [new]' % (addr,)
+        #else:
+        #    print '_addr_as_reg_offset(%x) [new]' % (addr,)
         self._scratch_register_value = addr
         self.MOV_ri(X86_64_SCRATCH_REG.value, addr)
         return (X86_64_SCRATCH_REG.value, 0)
@@ -572,10 +572,9 @@
         # where the static offset does not fit in 32-bits.  We have to fall
         # back to the X86_64_SCRATCH_REG.  Returns a new location encoded
         # as mode 'm' too.  These are all possibly rare cases.
-        ofs = self._addr_as_reg_offset(static_offset)
+        reg, ofs = self._addr_as_reg_offset(static_offset)
         self.forget_scratch_register()
-        self.LEA_ra(X86_64_SCRATCH_REG.value,
-                    (basereg, X86_64_SCRATCH_REG.value, 0, ofs))
+        self.LEA_ra(X86_64_SCRATCH_REG.value, (basereg, reg, 0, ofs))
         return (X86_64_SCRATCH_REG.value, 0)
 
     def _fix_static_offset_64_a(self, (basereg, scalereg,
@@ -584,38 +583,38 @@
         # where the static offset does not fit in 32-bits.  We have to fall
         # back to the X86_64_SCRATCH_REG.  In one case it is even more
         # annoying.  These are all possibly rare cases.
-        ofs = self._addr_as_reg_offset(static_offset)
+        reg, ofs = self._addr_as_reg_offset(static_offset)
         #
         if basereg != rx86.NO_BASE_REGISTER:
             self.forget_scratch_register()
-            self.LEA_ra(X86_64_SCRATCH_REG.value,
-                        (basereg, X86_64_SCRATCH_REG.value, 0, ofs))
+            self.LEA_ra(X86_64_SCRATCH_REG.value, (basereg, reg, 0, ofs))
+            reg = X86_64_SCRATCH_REG.value
             ofs = 0
-        return (X86_64_SCRATCH_REG.value, scalereg, scale, ofs)
+        return (reg, scalereg, scale, ofs)
 
     def _load_scratch(self, value):
         if self._scratch_register_value != 0:
             if self._scratch_register_value == value:
-                print '_load_scratch(%x) [REUSED]' % (value,)
+                #print '_load_scratch(%x) [REUSED]' % (value,)
                 return
             offset = r_uint(value) - r_uint(self._scratch_register_value)
             offset = intmask(offset)
             if rx86.fits_in_32bits(offset):
-                print '_load_scratch(%x) [LEA r11+%d]' % (value, offset)
-                global COUNT_
-                try:
-                    COUNT_ += 1
-                except NameError:
-                    COUNT_ = 1
-                if COUNT_ % 182 == 0:
-                    import pdb;pdb.set_trace()
+                #print '_load_scratch(%x) [LEA r11+%d]' % (value, offset)
+                #global COUNT_
+                #try:
+                #    COUNT_ += 1
+                #except NameError:
+                #    COUNT_ = 1
+                #if COUNT_ % 182 == 0:
+                #    import pdb;pdb.set_trace()
                 self.LEA_rm(X86_64_SCRATCH_REG.value,
                     (X86_64_SCRATCH_REG.value, offset))
                 self._scratch_register_value = value
                 return
-            print '_load_scratch(%x) [too far]' % (value,)
-        else:
-            print '_load_scratch(%x) [new]' % (value,)
+            #print '_load_scratch(%x) [too far]' % (value,)
+        #else:
+        #    print '_load_scratch(%x) [new]' % (value,)
         self._scratch_register_value = value
         self.MOV_ri(X86_64_SCRATCH_REG.value, value)
 
diff --git a/rpython/jit/backend/x86/test/test_jump.py b/rpython/jit/backend/x86/test/test_jump.py
--- a/rpython/jit/backend/x86/test/test_jump.py
+++ b/rpython/jit/backend/x86/test/test_jump.py
@@ -26,6 +26,11 @@
         assert isinstance(to_loc,   FrameLoc)
         self.ops.append(('immedmem2mem', from_loc, to_loc))
 
+    class mc:
+        @staticmethod
+        def forget_scratch_register():
+            pass
+
     def got(self, expected):
         print '------------------------ comparing ---------------------------'
         for op1, op2 in zip(self.ops, expected):
@@ -405,6 +410,10 @@
             print "pop", x
         def regalloc_immedmem2mem(self, x, y):
             print "?????????????????????????"
+        class mc:
+            @staticmethod
+            def forget_scratch_register():
+                pass
     def main():
         srclocs = [FrameLoc(9999, x, 'i') for x,y in CASE]
         dstlocs = [FrameLoc(9999, y, 'i') for x,y in CASE]
diff --git a/rpython/jit/backend/x86/test/test_regloc.py b/rpython/jit/backend/x86/test/test_regloc.py
--- a/rpython/jit/backend/x86/test/test_regloc.py
+++ b/rpython/jit/backend/x86/test/test_regloc.py
@@ -149,10 +149,8 @@
     def test_reuse_scratch_register(self):
         base_addr = intmask(0xFEDCBA9876543210)
         cb = LocationCodeBuilder64()
-        cb.begin_reuse_scratch_register()
         cb.MOV(ecx, heap(base_addr))
         cb.MOV(ecx, heap(base_addr + 8))
-        cb.end_reuse_scratch_register()
 
         expected_instructions = (
                 # mov r11, 0xFEDCBA9876543210
@@ -213,12 +211,9 @@
     def test_64bit_address_4(self):
         base_addr = intmask(0xFEDCBA9876543210)
         cb = LocationCodeBuilder64()
-        cb.begin_reuse_scratch_register()
-        assert cb._reuse_scratch_register is True
-        assert cb._scratch_register_known is False
+        assert cb._scratch_register_value == 0
         cb.MOV(ecx, AddressLoc(edx, esi, 2, base_addr))
-        assert cb._reuse_scratch_register is True
-        assert cb._scratch_register_known is False
+        assert cb._scratch_register_value == 0
         # this case is a CMP_ra
         #
         expected_instructions = (

From pypy.commits at gmail.com  Wed Apr  5 10:10:06 2017
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 05 Apr 2017 07:10:06 -0700 (PDT)
Subject: [pypy-commit] pypy mtest: Document the branch
Message-ID: <58e4fabe.298fdf0a.86cca.daff@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: mtest
Changeset: r90968:edd1e0af7d7f
Date: 2017-04-05 15:09 +0100
http://bitbucket.org/pypy/pypy/changeset/edd1e0af7d7f/

Log:	Document the branch

diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -5,3 +5,6 @@
 .. this is the revision after release-pypy3.3-5.7.x was branched
 .. startrev: afbf09453369
 
+.. branch: mtest
+Use "<python> -m test" to run the CPython test suite, as documented by CPython,
+instead of our outdated regrverbose.py script.

From pypy.commits at gmail.com  Wed Apr  5 10:21:58 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 05 Apr 2017 07:21:58 -0700 (PDT)
Subject: [pypy-commit] pypy reusing-r11: fix test
Message-ID: <58e4fd86.02b3df0a.a3a8f.0339@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: reusing-r11
Changeset: r90971:d25e41f8176a
Date: 2017-04-05 16:13 +0200
http://bitbucket.org/pypy/pypy/changeset/d25e41f8176a/

Log:	fix test

diff --git a/rpython/jit/backend/x86/test/test_runner.py b/rpython/jit/backend/x86/test/test_runner.py
--- a/rpython/jit/backend/x86/test/test_runner.py
+++ b/rpython/jit/backend/x86/test/test_runner.py
@@ -39,7 +39,7 @@
                                  'nop; '    # for the label
                                  'add; test; je; jmp;')   # plus some padding
         bridge_loop_instructions = (
-            'cmp; jge; mov;( movabs;)? mov; mov(abs)?; call; mov(abs)?; jmp;')
+            'cmp; jge; mov;( movabs;| lea;)? mov; (mov|movabs|lea); call; mov(abs)?; jmp;')
 
     def get_cpu(self):
         cpu = CPU(rtyper=None, stats=FakeStats())

From pypy.commits at gmail.com  Wed Apr  5 10:35:15 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 05 Apr 2017 07:35:15 -0700 (PDT)
Subject: [pypy-commit] pypy reusing-r11: fix vector_ext too
Message-ID: <58e500a3.15911c0a.9c748.6267@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: reusing-r11
Changeset: r90972:2bf445995637
Date: 2017-04-05 16:34 +0200
http://bitbucket.org/pypy/pypy/changeset/2bf445995637/

Log:	fix vector_ext too

diff --git a/rpython/jit/backend/x86/vector_ext.py b/rpython/jit/backend/x86/vector_ext.py
--- a/rpython/jit/backend/x86/vector_ext.py
+++ b/rpython/jit/backend/x86/vector_ext.py
@@ -173,9 +173,10 @@
             return
         elif arg.type == INT:
             scratchloc = X86_64_SCRATCH_REG
+            self.mc.forget_scratch_register()
             self.mc.PEXTRQ_rxi(targetloc.value, accumloc.value, 0)
             self.mc.PEXTRQ_rxi(scratchloc.value, accumloc.value, 1)
-            self.mc.ADD(targetloc, scratchloc)
+            self.mc.ADD_rr(targetloc.value, scratchloc.value)
             return
 
         not_implemented("reduce sum for %s not impl." % arg)
@@ -387,6 +388,7 @@
             return # already the right size
         if size == 4 and tosize == 8:
             scratch = X86_64_SCRATCH_REG.value
+            self.mc.forget_scratch_register()
             self.mc.PEXTRD_rxi(scratch, srcloc.value, 1)
             self.mc.PINSRQ_xri(resloc.value, scratch, 1)
             self.mc.PEXTRD_rxi(scratch, srcloc.value, 0)
@@ -394,6 +396,7 @@
         elif size == 8 and tosize == 4:
             # is there a better sequence to move them?
             scratch = X86_64_SCRATCH_REG.value
+            self.mc.forget_scratch_register()
             self.mc.PEXTRQ_rxi(scratch, srcloc.value, 0)
             self.mc.PINSRD_xri(resloc.value, scratch, 0)
             self.mc.PEXTRQ_rxi(scratch, srcloc.value, 1)
@@ -426,6 +429,7 @@
     def genop_vec_expand_i(self, op, arglocs, resloc):
         srcloc, sizeloc = arglocs
         if not isinstance(srcloc, RegLoc):
+            # self.mc.forget_scratch_register(): done by self.mov()
             self.mov(srcloc, X86_64_SCRATCH_REG)
             srcloc = X86_64_SCRATCH_REG
         assert not srcloc.is_xmm
@@ -465,6 +469,7 @@
         while k > 0:
             if size == 8:
                 if resultloc.is_xmm and sourceloc.is_xmm: # both xmm
+                    self.mc.forget_scratch_register()
                     self.mc.PEXTRQ_rxi(X86_64_SCRATCH_REG.value, sourceloc.value, si)
                     self.mc.PINSRQ_xri(resultloc.value, X86_64_SCRATCH_REG.value, ri)
                 elif resultloc.is_xmm: # xmm <- reg
@@ -473,6 +478,7 @@
                     self.mc.PEXTRQ_rxi(resultloc.value, sourceloc.value, si)
             elif size == 4:
                 if resultloc.is_xmm and sourceloc.is_xmm:
+                    self.mc.forget_scratch_register()
                     self.mc.PEXTRD_rxi(X86_64_SCRATCH_REG.value, sourceloc.value, si)
                     self.mc.PINSRD_xri(resultloc.value, X86_64_SCRATCH_REG.value, ri)
                 elif resultloc.is_xmm:
@@ -481,6 +487,7 @@
                     self.mc.PEXTRD_rxi(resultloc.value, sourceloc.value, si)
             elif size == 2:
                 if resultloc.is_xmm and sourceloc.is_xmm:
+                    self.mc.forget_scratch_register()
                     self.mc.PEXTRW_rxi(X86_64_SCRATCH_REG.value, sourceloc.value, si)
                     self.mc.PINSRW_xri(resultloc.value, X86_64_SCRATCH_REG.value, ri)
                 elif resultloc.is_xmm:
@@ -489,6 +496,7 @@
                     self.mc.PEXTRW_rxi(resultloc.value, sourceloc.value, si)
             elif size == 1:
                 if resultloc.is_xmm and sourceloc.is_xmm:
+                    self.mc.forget_scratch_register()
                     self.mc.PEXTRB_rxi(X86_64_SCRATCH_REG.value, sourceloc.value, si)
                     self.mc.PINSRB_xri(resultloc.value, X86_64_SCRATCH_REG.value, ri)
                 elif resultloc.is_xmm:

From pypy.commits at gmail.com  Wed Apr  5 13:23:16 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 05 Apr 2017 10:23:16 -0700 (PDT)
Subject: [pypy-commit] pypy reusing-r11: Close branch, ready to merge
Message-ID: <58e52804.51abdf0a.4dc84.1399@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: reusing-r11
Changeset: r90975:2303ebebd08a
Date: 2017-04-05 19:20 +0200
http://bitbucket.org/pypy/pypy/changeset/2303ebebd08a/

Log:	Close branch, ready to merge


From pypy.commits at gmail.com  Wed Apr  5 13:23:19 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 05 Apr 2017 10:23:19 -0700 (PDT)
Subject: [pypy-commit] pypy default: hg merge reusing-r11
Message-ID: <58e52807.c2a61c0a.15ee0.a3ac@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90976:6b21a8908e9f
Date: 2017-04-05 19:22 +0200
http://bitbucket.org/pypy/pypy/changeset/6b21a8908e9f/

Log:	hg merge reusing-r11

	Improve the generated machine code by tracking the (constant) value
	of r11 across intructions. This lets us avoid reloading r11 with
	another (apparently slowish) "movabs" instruction, replacing it with
	either nothing or a cheaper variant.

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -277,7 +277,7 @@
         #
         mc.TEST_rr(eax.value, eax.value)
         mc.J_il(rx86.Conditions['Z'], 0xfffff) # patched later
-        jz_location = mc.get_relative_pos()
+        jz_location = mc.get_relative_pos(break_basic_block=False)
         mc.MOV_rr(ecx.value, eax.value)
         #
         nursery_free_adr = self.cpu.gc_ll_descr.get_nursery_free_addr()
@@ -718,6 +718,7 @@
         if rx86.fits_in_32bits(offset):
             mc.JMP_l(offset)
         else:
+            # mc.forget_scratch_register() not needed here
             mc.MOV_ri(X86_64_SCRATCH_REG.value, adr_new_target)
             mc.JMP_r(X86_64_SCRATCH_REG.value)
         mc.copy_to_raw_memory(adr_jump_offset)
@@ -830,10 +831,10 @@
         descrs = self.cpu.gc_ll_descr.getframedescrs(self.cpu)
         ofs = self.cpu.unpack_fielddescr(descrs.arraydescr.lendescr)
         mc.CMP_bi(ofs, 0xffffff)     # force writing 32 bit
-        stack_check_cmp_ofs = mc.get_relative_pos() - 4
+        stack_check_cmp_ofs = mc.get_relative_pos(break_basic_block=False) - 4
         jg_location = mc.emit_forward_jump('GE')
         mc.MOV_si(WORD, 0xffffff)     # force writing 32 bit
-        ofs2 = mc.get_relative_pos() - 4
+        ofs2 = mc.get_relative_pos(break_basic_block=False) - 4
         self.push_gcmap(mc, gcmap, store=True)
         mc.CALL(imm(self._frame_realloc_slowpath))
         # patch the JG above
@@ -850,11 +851,11 @@
         descrs = self.cpu.gc_ll_descr.getframedescrs(self.cpu)
         ofs = self.cpu.unpack_fielddescr(descrs.arraydescr.lendescr)
         mc.CMP_bi(ofs, 0xffffff)
-        stack_check_cmp_ofs = mc.get_relative_pos() - 4
+        stack_check_cmp_ofs = mc.get_relative_pos(break_basic_block=False) - 4
         jg_location = mc.emit_forward_jump('GE')
         mc.MOV_rr(edi.value, ebp.value)
         mc.MOV_ri(esi.value, 0xffffff)
-        ofs2 = mc.get_relative_pos() - 4
+        ofs2 = mc.get_relative_pos(break_basic_block=False) - 4
         mc.CALL(imm(self.cpu.realloc_frame_crash))
         # patch the JG above
         mc.patch_forward_jump(jg_location)
@@ -895,6 +896,7 @@
             # "mov r11, addr; jmp r11" is up to 13 bytes, which fits in there
             # because we always write "mov r11, imm-as-8-bytes; call *r11" in
             # the first place.
+            # mc.forget_scratch_register() not needed here
             mc.MOV_ri(X86_64_SCRATCH_REG.value, adr_new_target)
             mc.JMP_r(X86_64_SCRATCH_REG.value)
             p = rffi.cast(rffi.INTP, adr_jump_offset)
@@ -939,7 +941,7 @@
             # would be used to pass arguments #3 and #4 (even though, so
             # far, the assembler only receives two arguments).
             tloc = esi
-            old = r11
+            old = r10
         # eax = address in the stack of a 3-words struct vmprof_stack_s
         self.mc.LEA_rs(eax.value, (FRAME_FIXED_SIZE - 4) * WORD)
         # old = current value of vmprof_tl_stack
@@ -1023,27 +1025,14 @@
         fit in 32 bits, it will be loaded in r11.
         """
         rst = gcrootmap.get_root_stack_top_addr()
-        if rx86.fits_in_32bits(rst):
-            mc.MOV_rj(ebx.value, rst)            # MOV ebx, [rootstacktop]
-        else:
-            mc.MOV_ri(X86_64_SCRATCH_REG.value, rst) # MOV r11, rootstacktop
-            mc.MOV_rm(ebx.value, (X86_64_SCRATCH_REG.value, 0))
-            # MOV ebx, [r11]
-        #
+        mc.MOV(ebx, heap(rst))                  # maybe via loading r11
         return rst
 
     def _call_header_shadowstack(self, gcrootmap):
         rst = self._load_shadowstack_top_in_ebx(self.mc, gcrootmap)
         self.mc.MOV_mr((ebx.value, 0), ebp.value)      # MOV [ebx], ebp
         self.mc.ADD_ri(ebx.value, WORD)
-        if rx86.fits_in_32bits(rst):
-            self.mc.MOV_jr(rst, ebx.value)            # MOV [rootstacktop], ebx
-        else:
-            # The integer 'rst' doesn't fit in 32 bits, so we know that
-            # _load_shadowstack_top_in_ebx() above loaded it in r11.
-            # Reuse it.  Be careful not to overwrite r11 in the middle!
-            self.mc.MOV_mr((X86_64_SCRATCH_REG.value, 0),
-                           ebx.value) # MOV [r11], ebx
+        self.mc.MOV(heap(rst), ebx)                   # MOV [rootstacktop], ebx
 
     def _call_footer_shadowstack(self, gcrootmap):
         rst = gcrootmap.get_root_stack_top_addr()
@@ -1449,7 +1438,7 @@
         # has been emitted.  64-bit mode only.
         assert IS_X86_64
         address_in_buffer = index * WORD   # at the start of the buffer
-        p_location = self.mc.get_relative_pos()
+        p_location = self.mc.get_relative_pos(break_basic_block=False)
         offset = address_in_buffer - p_location
         self.mc.overwrite32(p_location-4, offset)
 
@@ -1551,7 +1540,7 @@
             self.mc.add_pending_relocation()
         elif WORD == 8:
             self.mc.J_il(rx86.Conditions['Z'], 0)
-            pos = self.mc.get_relative_pos()
+            pos = self.mc.get_relative_pos(break_basic_block=False)
             self.pending_memoryerror_trampoline_from.append(pos)
 
     # ----------
@@ -1721,7 +1710,8 @@
 
     def genop_guard_guard_not_invalidated(self, guard_op, guard_token,
                                           locs, ign):
-        pos = self.mc.get_relative_pos() + 1 # after potential jmp
+        pos = self.mc.get_relative_pos(break_basic_block=False)
+        pos += 1   # after potential jmp
         guard_token.pos_jump_offset = pos
         self.pending_guard_tokens.append(guard_token)
 
@@ -2077,7 +2067,8 @@
         assert self.guard_success_cc >= 0
         self.mc.J_il(rx86.invert_condition(self.guard_success_cc), 0)
         self.guard_success_cc = rx86.cond_none
-        guard_token.pos_jump_offset = self.mc.get_relative_pos() - 4
+        pos = self.mc.get_relative_pos(break_basic_block=False)
+        guard_token.pos_jump_offset = pos - 4
         self.pending_guard_tokens.append(guard_token)
 
     def _genop_real_call(self, op, arglocs, resloc):
@@ -2125,6 +2116,7 @@
 
         faildescrindex = self.get_gcref_from_faildescr(faildescr)
         if IS_X86_64:
+            self.mc.forget_scratch_register()
             self.mc.MOV_rp(X86_64_SCRATCH_REG.value, 0)
             self._patch_load_from_gc_table(faildescrindex)
             self.mc.MOV(raw_stack(ofs), X86_64_SCRATCH_REG)
@@ -2313,6 +2305,7 @@
                 if IS_X86_64 and isinstance(loc_base, RegLoc):
                     # copy loc_index into r11
                     tmp1 = X86_64_SCRATCH_REG
+                    mc.forget_scratch_register()
                     mc.MOV_rr(tmp1.value, loc_index.value)
                     final_pop = False
                 else:
@@ -2325,7 +2318,13 @@
                 # XOR tmp, -8
                 mc.XOR_ri(tmp1.value, -8)
                 # BTS [loc_base], tmp
-                mc.BTS(addr_add_const(loc_base, 0), tmp1)
+                if final_pop:
+                    # r11 is not specially used, fall back to regloc.py
+                    mc.BTS(addr_add_const(loc_base, 0), tmp1)
+                else:
+                    # tmp1 is r11!  but in this case, loc_base is a
+                    # register so we can invoke directly rx86.py
+                    mc.BTS_mr((loc_base.value, 0), tmp1.value)
                 # done
                 if final_pop:
                     mc.POP_r(loc_index.value)
diff --git a/rpython/jit/backend/x86/callbuilder.py b/rpython/jit/backend/x86/callbuilder.py
--- a/rpython/jit/backend/x86/callbuilder.py
+++ b/rpython/jit/backend/x86/callbuilder.py
@@ -239,7 +239,7 @@
             if IS_X86_32:
                 tmpreg = edx
             else:
-                tmpreg = r11     # edx is used for 3rd argument
+                tmpreg = r10                   # edx is used for 3rd argument
             mc.MOV_rm(tmpreg.value, (tlofsreg.value, p_errno))
             mc.MOV32_rm(eax.value, (tlofsreg.value, rpy_errno))
             mc.MOV32_mr((tmpreg.value, 0), eax.value)
diff --git a/rpython/jit/backend/x86/codebuf.py b/rpython/jit/backend/x86/codebuf.py
--- a/rpython/jit/backend/x86/codebuf.py
+++ b/rpython/jit/backend/x86/codebuf.py
@@ -42,10 +42,10 @@
         self.ops_offset = {}
 
     def add_pending_relocation(self):
-        self.relocations.append(self.get_relative_pos())
+        self.relocations.append(self.get_relative_pos(break_basic_block=False))
 
     def mark_op(self, op):
-        pos = self.get_relative_pos()
+        pos = self.get_relative_pos(break_basic_block=False)
         self.ops_offset[op] = pos
 
     def copy_to_raw_memory(self, addr):
@@ -64,11 +64,11 @@
 
     def emit_forward_jump_cond(self, cond):
         self.J_il8(cond, 0)
-        return self.get_relative_pos()
+        return self.get_relative_pos(break_basic_block=False)
 
     def emit_forward_jump_uncond(self):
         self.JMP_l8(0)
-        return self.get_relative_pos()
+        return self.get_relative_pos(break_basic_block=False)
 
     def patch_forward_jump(self, jcond_location):
         offset = self.get_relative_pos() - jcond_location
@@ -76,3 +76,8 @@
         if offset > 127:
             raise ShortJumpTooFar
         self.overwrite(jcond_location-1, chr(offset))
+
+    def get_relative_pos(self, break_basic_block=True):
+        if break_basic_block:
+            self.forget_scratch_register()
+        return BlockBuilderMixin.get_relative_pos(self)
diff --git a/rpython/jit/backend/x86/jump.py b/rpython/jit/backend/x86/jump.py
--- a/rpython/jit/backend/x86/jump.py
+++ b/rpython/jit/backend/x86/jump.py
@@ -77,6 +77,7 @@
             assembler.regalloc_pop(dst)
             return
         assembler.regalloc_mov(src, tmpreg)
+        assembler.mc.forget_scratch_register()
         src = tmpreg
     assembler.regalloc_mov(src, dst)
 
diff --git a/rpython/jit/backend/x86/regalloc.py b/rpython/jit/backend/x86/regalloc.py
--- a/rpython/jit/backend/x86/regalloc.py
+++ b/rpython/jit/backend/x86/regalloc.py
@@ -435,9 +435,9 @@
 
     def consider_guard_not_invalidated(self, op):
         mc = self.assembler.mc
-        n = mc.get_relative_pos()
+        n = mc.get_relative_pos(break_basic_block=False)
         self.perform_guard(op, [], None)
-        assert n == mc.get_relative_pos()
+        assert n == mc.get_relative_pos(break_basic_block=False)
         # ensure that the next label is at least 5 bytes farther than
         # the current position.  Otherwise, when invalidating the guard,
         # we would overwrite randomly the next label's position.
diff --git a/rpython/jit/backend/x86/regloc.py b/rpython/jit/backend/x86/regloc.py
--- a/rpython/jit/backend/x86/regloc.py
+++ b/rpython/jit/backend/x86/regloc.py
@@ -4,7 +4,7 @@
 from rpython.jit.backend.x86.arch import WORD, IS_X86_32, IS_X86_64
 from rpython.tool.sourcetools import func_with_new_name
 from rpython.rlib.objectmodel import specialize, instantiate
-from rpython.rlib.rarithmetic import intmask
+from rpython.rlib.rarithmetic import intmask, r_uint
 from rpython.jit.metainterp.history import FLOAT, INT
 from rpython.jit.codewriter import longlong
 from rpython.rtyper.lltypesystem import rffi, lltype
@@ -355,7 +355,8 @@
 # without an xmm scratch reg.
 X86_64_XMM_SCRATCH_REG = xmm15
 
-unrolling_location_codes = unrolling_iterable(list("rbsmajix"))
+# note: 'r' is after 'i' in this list, for _binaryop()
+unrolling_location_codes = unrolling_iterable(list("irbsmajx"))
 
 @specialize.arg(1)
 def _rx86_getattr(obj, methname):
@@ -372,9 +373,7 @@
 class LocationCodeBuilder(object):
     _mixin_ = True
 
-    _reuse_scratch_register = False   # for now, this is always False
-    _scratch_register_known = False   # for now, this is always False
-    _scratch_register_value = 0
+    _scratch_register_value = 0    # 0 means 'unknown'
 
     def _binaryop(name):
 
@@ -383,7 +382,7 @@
             val2 = loc2.value_i()
             if name == 'MOV' and isinstance(loc1, RegLoc):
                 self.MOV_ri(loc1.value, val2)
-                return
+                return True
             code1 = loc1.location_code()
             if code1 == 'j':
                 checkvalue = loc1.value_j()
@@ -402,10 +401,11 @@
                 self.MOV_ri(freereg.value, val2)
                 INSN(self, loc1, freereg)
                 self.POP_r(freereg.value)
+                return True
             else:
                 # For this case, we should not need the scratch register more than here.
                 self._load_scratch(val2)
-                INSN(self, loc1, X86_64_SCRATCH_REG)
+                return False
 
         def invoke(self, codes, val1, val2):
             methname = name + "_" + codes
@@ -433,15 +433,15 @@
             code1 = loc1.location_code()
             code2 = loc2.location_code()
 
-            # You can pass in the scratch register as a location, but you
-            # must be careful not to combine it with location types that
-            # might need to use the scratch register themselves.
-            if loc2 is X86_64_SCRATCH_REG:
-                if code1 == 'j':
-                    assert (name.startswith("MOV") and
-                            rx86.fits_in_32bits(loc1.value_j()))
-            if loc1 is X86_64_SCRATCH_REG and not name.startswith("MOV"):
-                assert code2 not in ('j', 'i')
+            # You cannot pass in the scratch register as a location,
+            # except with a MOV instruction.
+            if name.startswith('MOV'):
+                if loc2 is X86_64_SCRATCH_REG:
+                    assert code1 != 'j' and code1 != 'm' and code1 != 'a'
+                if loc1 is X86_64_SCRATCH_REG:
+                    self.forget_scratch_register()
+            elif loc1 is X86_64_SCRATCH_REG or loc2 is X86_64_SCRATCH_REG:
+                raise AssertionError("%s with scratch reg specified" % name)
 
             for possible_code2 in unrolling_location_codes:
                 if not has_implementation_for('?', possible_code2):
@@ -451,8 +451,14 @@
                     #
                     # Fake out certain operations for x86_64
                     if self.WORD == 8 and possible_code2 == 'i' and not rx86.fits_in_32bits(val2):
-                        insn_with_64_bit_immediate(self, loc1, loc2)
-                        return
+                        if insn_with_64_bit_immediate(self, loc1, loc2):
+                            return      # done
+                        loc2 = X86_64_SCRATCH_REG
+                        code2 = 'r'
+                        # NB. unrolling_location_codes contains 'r'
+                        # after 'i', so that it will be found after
+                        # this iteration
+                        continue
                     #
                     # Regular case
                     for possible_code1 in unrolling_location_codes:
@@ -487,6 +493,9 @@
 
     def _unaryop(name):
         def INSN(self, loc):
+            if loc is X86_64_SCRATCH_REG:
+                raise AssertionError("%s with scratch reg specified" % name)
+
             code = loc.location_code()
             for possible_code in unrolling_location_codes:
                 if code == possible_code:
@@ -532,6 +541,9 @@
                     else:
                         methname = name + "_" + possible_code
                         _rx86_getattr(self, methname)(val)
+            # This is for CALL and JMP, so it's correct to forget
+            # the value of the R11 register here.
+            self.forget_scratch_register()
 
         return func_with_new_name(INSN, "INSN_" + name)
 
@@ -540,16 +552,18 @@
         # If we are within a "reuse_scratch_register" block, we remember the
         # last value we loaded to the scratch register and encode the address
         # as an offset from that if we can
-        if self._scratch_register_known:
-            offset = addr - self._scratch_register_value
+        if self._scratch_register_value != 0:
+            offset = r_uint(addr) - r_uint(self._scratch_register_value)
+            offset = intmask(offset)
             if rx86.fits_in_32bits(offset):
+                #print '_addr_as_reg_offset(%x) [REUSED r11+%d]' % (
+                #    addr, offset)
                 return (X86_64_SCRATCH_REG.value, offset)
+            #print '_addr_as_reg_offset(%x) [too far]' % (addr,)
             # else: fall through
-
-        if self._reuse_scratch_register:
-            self._scratch_register_known = True
-            self._scratch_register_value = addr
-
+        #else:
+        #    print '_addr_as_reg_offset(%x) [new]' % (addr,)
+        self._scratch_register_value = addr
         self.MOV_ri(X86_64_SCRATCH_REG.value, addr)
         return (X86_64_SCRATCH_REG.value, 0)
 
@@ -557,12 +571,10 @@
         # For cases where an AddressLoc has the location_code 'm', but
         # where the static offset does not fit in 32-bits.  We have to fall
         # back to the X86_64_SCRATCH_REG.  Returns a new location encoded
-        # as mode 'm' too.  These are all possibly rare cases; don't try
-        # to reuse a past value of the scratch register at all.
-        self._scratch_register_known = False
-        self.MOV_ri(X86_64_SCRATCH_REG.value, static_offset)
-        self.LEA_ra(X86_64_SCRATCH_REG.value,
-                    (basereg, X86_64_SCRATCH_REG.value, 0, 0))
+        # as mode 'm' too.  These are all possibly rare cases.
+        reg, ofs = self._addr_as_reg_offset(static_offset)
+        self.forget_scratch_register()
+        self.LEA_ra(X86_64_SCRATCH_REG.value, (basereg, reg, 0, ofs))
         return (X86_64_SCRATCH_REG.value, 0)
 
     def _fix_static_offset_64_a(self, (basereg, scalereg,
@@ -570,41 +582,48 @@
         # For cases where an AddressLoc has the location_code 'a', but
         # where the static offset does not fit in 32-bits.  We have to fall
         # back to the X86_64_SCRATCH_REG.  In one case it is even more
-        # annoying.  These are all possibly rare cases; don't try to reuse a
-        # past value of the scratch register at all.
-        self._scratch_register_known = False
-        self.MOV_ri(X86_64_SCRATCH_REG.value, static_offset)
+        # annoying.  These are all possibly rare cases.
+        reg, ofs = self._addr_as_reg_offset(static_offset)
         #
         if basereg != rx86.NO_BASE_REGISTER:
-            self.LEA_ra(X86_64_SCRATCH_REG.value,
-                        (basereg, X86_64_SCRATCH_REG.value, 0, 0))
-        return (X86_64_SCRATCH_REG.value, scalereg, scale, 0)
+            self.forget_scratch_register()
+            self.LEA_ra(X86_64_SCRATCH_REG.value, (basereg, reg, 0, ofs))
+            reg = X86_64_SCRATCH_REG.value
+            ofs = 0
+        return (reg, scalereg, scale, ofs)
 
     def _load_scratch(self, value):
-        if (self._scratch_register_known
-            and value == self._scratch_register_value):
-            return
-        if self._reuse_scratch_register:
-            self._scratch_register_known = True
-            self._scratch_register_value = value
+        if self._scratch_register_value != 0:
+            if self._scratch_register_value == value:
+                #print '_load_scratch(%x) [REUSED]' % (value,)
+                return
+            offset = r_uint(value) - r_uint(self._scratch_register_value)
+            offset = intmask(offset)
+            if rx86.fits_in_32bits(offset):
+                #print '_load_scratch(%x) [LEA r11+%d]' % (value, offset)
+                #global COUNT_
+                #try:
+                #    COUNT_ += 1
+                #except NameError:
+                #    COUNT_ = 1
+                #if COUNT_ % 182 == 0:
+                #    import pdb;pdb.set_trace()
+                self.LEA_rm(X86_64_SCRATCH_REG.value,
+                    (X86_64_SCRATCH_REG.value, offset))
+                self._scratch_register_value = value
+                return
+            #print '_load_scratch(%x) [too far]' % (value,)
+        #else:
+        #    print '_load_scratch(%x) [new]' % (value,)
+        self._scratch_register_value = value
         self.MOV_ri(X86_64_SCRATCH_REG.value, value)
 
+    def forget_scratch_register(self):
+        self._scratch_register_value = 0
+
     def trap(self):
         self.INT3()
 
-    def begin_reuse_scratch_register(self):
-        # --NEVER CALLED (only from a specific test)--
-        # Flag the beginning of a block where it is okay to reuse the value
-        # of the scratch register. In theory we shouldn't have to do this if
-        # we were careful to mark all possible targets of a jump or call, and
-        # "forget" the value of the scratch register at those positions, but
-        # for now this seems safer.
-        self._reuse_scratch_register = True
-
-    def end_reuse_scratch_register(self):
-        self._reuse_scratch_register = False
-        self._scratch_register_known = False
-
     def _vector_size_choose(name):
         def invoke(self, suffix, val1, val2):
             methname = name + suffix
diff --git a/rpython/jit/backend/x86/test/test_jump.py b/rpython/jit/backend/x86/test/test_jump.py
--- a/rpython/jit/backend/x86/test/test_jump.py
+++ b/rpython/jit/backend/x86/test/test_jump.py
@@ -26,6 +26,11 @@
         assert isinstance(to_loc,   FrameLoc)
         self.ops.append(('immedmem2mem', from_loc, to_loc))
 
+    class mc:
+        @staticmethod
+        def forget_scratch_register():
+            pass
+
     def got(self, expected):
         print '------------------------ comparing ---------------------------'
         for op1, op2 in zip(self.ops, expected):
@@ -405,6 +410,10 @@
             print "pop", x
         def regalloc_immedmem2mem(self, x, y):
             print "?????????????????????????"
+        class mc:
+            @staticmethod
+            def forget_scratch_register():
+                pass
     def main():
         srclocs = [FrameLoc(9999, x, 'i') for x,y in CASE]
         dstlocs = [FrameLoc(9999, y, 'i') for x,y in CASE]
diff --git a/rpython/jit/backend/x86/test/test_regloc.py b/rpython/jit/backend/x86/test/test_regloc.py
--- a/rpython/jit/backend/x86/test/test_regloc.py
+++ b/rpython/jit/backend/x86/test/test_regloc.py
@@ -149,10 +149,8 @@
     def test_reuse_scratch_register(self):
         base_addr = intmask(0xFEDCBA9876543210)
         cb = LocationCodeBuilder64()
-        cb.begin_reuse_scratch_register()
         cb.MOV(ecx, heap(base_addr))
         cb.MOV(ecx, heap(base_addr + 8))
-        cb.end_reuse_scratch_register()
 
         expected_instructions = (
                 # mov r11, 0xFEDCBA9876543210
@@ -213,12 +211,9 @@
     def test_64bit_address_4(self):
         base_addr = intmask(0xFEDCBA9876543210)
         cb = LocationCodeBuilder64()
-        cb.begin_reuse_scratch_register()
-        assert cb._reuse_scratch_register is True
-        assert cb._scratch_register_known is False
+        assert cb._scratch_register_value == 0
         cb.MOV(ecx, AddressLoc(edx, esi, 2, base_addr))
-        assert cb._reuse_scratch_register is True
-        assert cb._scratch_register_known is False
+        assert cb._scratch_register_value == 0
         # this case is a CMP_ra
         #
         expected_instructions = (
diff --git a/rpython/jit/backend/x86/test/test_runner.py b/rpython/jit/backend/x86/test/test_runner.py
--- a/rpython/jit/backend/x86/test/test_runner.py
+++ b/rpython/jit/backend/x86/test/test_runner.py
@@ -39,7 +39,7 @@
                                  'nop; '    # for the label
                                  'add; test; je; jmp;')   # plus some padding
         bridge_loop_instructions = (
-            'cmp; jge; mov;( movabs;)? mov; mov(abs)?; call; mov(abs)?; jmp;')
+            'cmp; jge; mov;( movabs;| lea;)? mov; (mov|movabs|lea); call; mov(abs)?; jmp;')
 
     def get_cpu(self):
         cpu = CPU(rtyper=None, stats=FakeStats())
diff --git a/rpython/jit/backend/x86/vector_ext.py b/rpython/jit/backend/x86/vector_ext.py
--- a/rpython/jit/backend/x86/vector_ext.py
+++ b/rpython/jit/backend/x86/vector_ext.py
@@ -173,9 +173,10 @@
             return
         elif arg.type == INT:
             scratchloc = X86_64_SCRATCH_REG
+            self.mc.forget_scratch_register()
             self.mc.PEXTRQ_rxi(targetloc.value, accumloc.value, 0)
             self.mc.PEXTRQ_rxi(scratchloc.value, accumloc.value, 1)
-            self.mc.ADD(targetloc, scratchloc)
+            self.mc.ADD_rr(targetloc.value, scratchloc.value)
             return
 
         not_implemented("reduce sum for %s not impl." % arg)
@@ -387,6 +388,7 @@
             return # already the right size
         if size == 4 and tosize == 8:
             scratch = X86_64_SCRATCH_REG.value
+            self.mc.forget_scratch_register()
             self.mc.PEXTRD_rxi(scratch, srcloc.value, 1)
             self.mc.PINSRQ_xri(resloc.value, scratch, 1)
             self.mc.PEXTRD_rxi(scratch, srcloc.value, 0)
@@ -394,6 +396,7 @@
         elif size == 8 and tosize == 4:
             # is there a better sequence to move them?
             scratch = X86_64_SCRATCH_REG.value
+            self.mc.forget_scratch_register()
             self.mc.PEXTRQ_rxi(scratch, srcloc.value, 0)
             self.mc.PINSRD_xri(resloc.value, scratch, 0)
             self.mc.PEXTRQ_rxi(scratch, srcloc.value, 1)
@@ -426,6 +429,7 @@
     def genop_vec_expand_i(self, op, arglocs, resloc):
         srcloc, sizeloc = arglocs
         if not isinstance(srcloc, RegLoc):
+            # self.mc.forget_scratch_register(): done by self.mov()
             self.mov(srcloc, X86_64_SCRATCH_REG)
             srcloc = X86_64_SCRATCH_REG
         assert not srcloc.is_xmm
@@ -465,6 +469,7 @@
         while k > 0:
             if size == 8:
                 if resultloc.is_xmm and sourceloc.is_xmm: # both xmm
+                    self.mc.forget_scratch_register()
                     self.mc.PEXTRQ_rxi(X86_64_SCRATCH_REG.value, sourceloc.value, si)
                     self.mc.PINSRQ_xri(resultloc.value, X86_64_SCRATCH_REG.value, ri)
                 elif resultloc.is_xmm: # xmm <- reg
@@ -473,6 +478,7 @@
                     self.mc.PEXTRQ_rxi(resultloc.value, sourceloc.value, si)
             elif size == 4:
                 if resultloc.is_xmm and sourceloc.is_xmm:
+                    self.mc.forget_scratch_register()
                     self.mc.PEXTRD_rxi(X86_64_SCRATCH_REG.value, sourceloc.value, si)
                     self.mc.PINSRD_xri(resultloc.value, X86_64_SCRATCH_REG.value, ri)
                 elif resultloc.is_xmm:
@@ -481,6 +487,7 @@
                     self.mc.PEXTRD_rxi(resultloc.value, sourceloc.value, si)
             elif size == 2:
                 if resultloc.is_xmm and sourceloc.is_xmm:
+                    self.mc.forget_scratch_register()
                     self.mc.PEXTRW_rxi(X86_64_SCRATCH_REG.value, sourceloc.value, si)
                     self.mc.PINSRW_xri(resultloc.value, X86_64_SCRATCH_REG.value, ri)
                 elif resultloc.is_xmm:
@@ -489,6 +496,7 @@
                     self.mc.PEXTRW_rxi(resultloc.value, sourceloc.value, si)
             elif size == 1:
                 if resultloc.is_xmm and sourceloc.is_xmm:
+                    self.mc.forget_scratch_register()
                     self.mc.PEXTRB_rxi(X86_64_SCRATCH_REG.value, sourceloc.value, si)
                     self.mc.PINSRB_xri(resultloc.value, X86_64_SCRATCH_REG.value, ri)
                 elif resultloc.is_xmm:

From pypy.commits at gmail.com  Wed Apr  5 13:23:21 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 05 Apr 2017 10:23:21 -0700 (PDT)
Subject: [pypy-commit] pypy default: add branch
Message-ID: <58e52809.d01b1c0a.c33e0.a0a0@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90977:d98d9ed5f208
Date: 2017-04-05 19:22 +0200
http://bitbucket.org/pypy/pypy/changeset/d98d9ed5f208/

Log:	add branch

diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -21,3 +21,5 @@
 .. branch: vmprof-native
 
 PyPy support to profile native frames in vmprof.
+
+.. branch: reusing-r11

From pypy.commits at gmail.com  Wed Apr  5 14:18:00 2017
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 05 Apr 2017 11:18:00 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Remove meaningless assert causing
 spurious test failure
Message-ID: <58e534d8.87471c0a.27000.b441@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r90978:237ec3526387
Date: 2017-04-05 19:17 +0100
http://bitbucket.org/pypy/pypy/changeset/237ec3526387/

Log:	Remove meaningless assert causing spurious test failure

diff --git a/lib-python/3/test/_test_multiprocessing.py b/lib-python/3/test/_test_multiprocessing.py
--- a/lib-python/3/test/_test_multiprocessing.py
+++ b/lib-python/3/test/_test_multiprocessing.py
@@ -2147,7 +2147,8 @@
 
         # Because we are using xmlrpclib for serialization instead of
         # pickle this will cause a serialization error.
-        self.assertRaises(Exception, queue.put, time.sleep)
+        # Changed on PyPy: passing functions to xmlrpc is broken
+        #self.assertRaises(Exception, queue.put, time.sleep)
 
         # Make queue finalizer run before the server is stopped
         del queue

From pypy.commits at gmail.com  Wed Apr  5 17:20:36 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Wed, 05 Apr 2017 14:20:36 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: Try to enable the
 faulthandler module on Windows
Message-ID: <58e55fa4.d28a1c0a.d944.ef34@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r90979:7abeafdfbe0f
Date: 2017-04-05 23:19 +0200
http://bitbucket.org/pypy/pypy/changeset/7abeafdfbe0f/

Log:	Try to enable the faulthandler module on Windows


From pypy.commits at gmail.com  Wed Apr  5 17:23:42 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Wed, 05 Apr 2017 14:23:42 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: Enable faulthandler on
 Windows
Message-ID: <58e5605e.c32f1c0a.3475d.e71b@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r90980:8b35bf4b2160
Date: 2017-04-05 23:22 +0200
http://bitbucket.org/pypy/pypy/changeset/8b35bf4b2160/

Log:	Enable faulthandler on Windows

diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -72,8 +72,6 @@
 
     if "cppyy" in working_modules:
         working_modules.remove("cppyy")  # not tested on win32
-    if "faulthandler" in working_modules:
-        working_modules.remove("faulthandler")  # missing details
 
     # The _locale module is needed by site.py on Windows
     default_modules.add("_locale")

From pypy.commits at gmail.com  Thu Apr  6 05:23:53 2017
From: pypy.commits at gmail.com (tobweber)
Date: Thu, 06 Apr 2017 02:23:53 -0700 (PDT)
Subject: [pypy-commit] stmgc c8-overheads-instrumentation: Instrument commit
 log entry creation
Message-ID: <58e60929.b7addf0a.3efd6.76dc@mx.google.com>

Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-overheads-instrumentation
Changeset: r2036:dccc8c8d7f65
Date: 2017-04-05 11:28 +0200
http://bitbucket.org/pypy/stmgc/changeset/dccc8c8d7f65/

Log:	Instrument commit log entry creation

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -359,6 +359,8 @@
 {
     /* puts all modified_old_objects in a new commit log entry */
 
+    start_timer();
+
     // we don't need the privatization lock, as we are only
     // reading from modified_old_objs and nobody but us can change it
     struct list_s *list = STM_PSEGMENT->modified_old_objects;
@@ -371,6 +373,9 @@
     result->rev_num = -1;       /* invalid */
     result->written_count = count;
     memcpy(result->written, list->items, count * sizeof(struct stm_undo_s));
+
+    stop_timer_and_publish(STM_DURATION_CREATE_CLE);
+
     return result;
 }
 
diff --git a/c8/stmgc.h b/c8/stmgc.h
--- a/c8/stmgc.h
+++ b/c8/stmgc.h
@@ -578,6 +578,7 @@
     STM_DURATION_WRITE_GC_ONLY,
     STM_DURATION_WRITE_SLOWPATH,
     STM_DURATION_VALIDATION,
+    STM_DURATION_CREATE_CLE,
     STM_DURATION_COMMIT_EXCEPT_GC,
     STM_DURATION_MINOR_GC,
     STM_DURATION_MAJOR_GC_LOG_ONLY,
@@ -602,6 +603,7 @@
     "duration of gc due to write",                  \
     "duration of write slowpath",                   \
     "duration of validation",                       \
+    "duration of commit log entry creation",        \
     "duration of commit except gc",                 \
     "duration of minor gc",                         \
     "duration of major gc doing log clean up only", \

From pypy.commits at gmail.com  Thu Apr  6 05:23:55 2017
From: pypy.commits at gmail.com (tobweber)
Date: Thu, 06 Apr 2017 02:23:55 -0700 (PDT)
Subject: [pypy-commit] stmgc c8-overheads-instrumentation: Amend
 instrumentation of validation,
 and add instrumentation for start transaction and write slowpath card
Message-ID: <58e6092b.9285df0a.637a2.74eb@mx.google.com>

Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-overheads-instrumentation
Changeset: r2037:8f7c34968ab8
Date: 2017-04-06 11:23 +0200
http://bitbucket.org/pypy/stmgc/changeset/8f7c34968ab8/

Log:	Amend instrumentation of validation, and add instrumentation for
	start transaction and write slowpath card

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -418,6 +418,8 @@
 */
 static void _validate_and_attach(struct stm_commit_log_entry_s *new)
 {
+    start_timer();
+
     uintptr_t cle_length = 0;
     struct stm_commit_log_entry_s *old;
 
@@ -430,10 +432,17 @@
     soon_finished_or_inevitable_thread_segment();
 
  retry_from_start:
+    pause_timer();
     if (!_stm_validate()) {
+        continue_timer();
+
         free_cle(new);
-        stm_abort_transaction();
+
+        stop_timer_and_publish(STM_DURATION_VALIDATION);
+
+        stm_abort_transaction(); // leaves method by longjump
     }
+    continue_timer();
 
     if (cle_length != list_count(STM_PSEGMENT->modified_old_objects)) {
         /* something changed the list of modified objs during _stm_validate; or
@@ -493,6 +502,8 @@
         dprintf(("_validate_and_attach(%p) failed, retrying\n", new));
         goto retry_from_start;
     }
+
+    stop_timer_and_publish(STM_DURATION_VALIDATION);
 }
 
 /* This is called to do stm_validate() and then attach INEV_RUNNING to
@@ -513,6 +524,8 @@
 
 static void _validate_and_add_to_commit_log(void)
 {
+    start_timer();
+
     struct stm_commit_log_entry_s *old, *new;
 
     new = _create_commit_log_entry();
@@ -541,8 +554,12 @@
         release_modification_lock_wr(STM_SEGMENT->segment_num);
     }
     else {
+        pause_timer();
         _validate_and_attach(new);
+        continue_timer();
     }
+
+    stop_timer_and_publish(STM_DURATION_VALIDATION);
 }
 
 /* ############# STM ############# */
@@ -922,6 +939,8 @@
 
 void _stm_write_slowpath_card(object_t *obj, uintptr_t index)
 {
+    start_timer();
+
     dprintf_test(("write_slowpath_card(%p, %lu)\n",
                   obj, index));
 
@@ -930,9 +949,15 @@
        card marking instead. */
     if (!(obj->stm_flags & GCFLAG_CARDS_SET)) {
         bool mark_card = obj_should_use_cards(STM_SEGMENT->segment_base, obj);
+
+        pause_timer();
         write_slowpath_common(obj, mark_card);
-        if (!mark_card)
+        continue_timer();
+
+        if (!mark_card) {
+            stop_timer_and_publish(STM_DURATION_WRITE_SLOWPATH);
             return;
+        }
     }
 
     assert(obj_should_use_cards(STM_SEGMENT->segment_base, obj));
@@ -979,6 +1004,8 @@
 
     dprintf(("mark %p index %lu, card:%lu with %d\n",
              obj, index, get_index_to_card_index(index), CARD_MARKED));
+
+    stop_timer_and_publish(STM_DURATION_WRITE_SLOWPATH);
 }
 
 __attribute__((flatten))
@@ -1043,6 +1070,8 @@
 
 static void _do_start_transaction(stm_thread_local_t *tl)
 {
+    start_timer();
+
     assert(!_stm_in_transaction(tl));
     tl->wait_event_emitted = 0;
 
@@ -1106,6 +1135,8 @@
         reset_transaction_read_version();
     }
 
+    stop_timer_and_publish(STM_DURATION_START_TRX);
+
     stm_validate();
 }
 
diff --git a/c8/stmgc.h b/c8/stmgc.h
--- a/c8/stmgc.h
+++ b/c8/stmgc.h
@@ -575,6 +575,7 @@
     STM_GC_MAJOR_DONE,
 
     /* execution duration profiling events */
+    STM_DURATION_START_TRX,
     STM_DURATION_WRITE_GC_ONLY,
     STM_DURATION_WRITE_SLOWPATH,
     STM_DURATION_VALIDATION,
@@ -600,6 +601,7 @@
     "gc major start",                               \
     "gc major done",                                \
     /* names of duration events */                  \
+    "duration of transaction start",                \
     "duration of gc due to write",                  \
     "duration of write slowpath",                   \
     "duration of validation",                       \

From pypy.commits at gmail.com  Thu Apr  6 05:54:55 2017
From: pypy.commits at gmail.com (antocuni)
Date: Thu, 06 Apr 2017 02:54:55 -0700 (PDT)
Subject: [pypy-commit] extradoc extradoc: add the skeleton of my talk
Message-ID: <58e6106f.068edf0a.c098a.80d7@mx.google.com>

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: extradoc
Changeset: r5795:19735ff51b47
Date: 2017-04-05 18:53 +0200
http://bitbucket.org/pypy/extradoc/changeset/19735ff51b47/

Log:	add the skeleton of my talk

diff --git a/talk/pycon-italy-2017/Makefile b/talk/pycon-italy-2017/Makefile
new file mode 100644
--- /dev/null
+++ b/talk/pycon-italy-2017/Makefile
@@ -0,0 +1,18 @@
+# you can find rst2beamer.py here:
+# http://codespeak.net/svn/user/antocuni/bin/rst2beamer.py
+
+# WARNING: to work, it needs this patch for docutils
+# https://sourceforge.net/tracker/?func=detail&atid=422032&aid=1459707&group_id=38414
+
+talk.pdf: talk.rst author.latex title.latex stylesheet.latex
+	python `which rst2beamer.py` --stylesheet=stylesheet.latex --documentoptions=14pt talk.rst talk.latex || exit
+	#/home/antocuni/.virtualenvs/rst2beamer/bin/python `which rst2beamer.py` --stylesheet=stylesheet.latex --documentoptions=14pt talk.rst talk.latex || exit
+	sed 's/\\date{}/\\input{author.latex}/' -i talk.latex || exit
+	#sed 's/\\maketitle/\\input{title.latex}/' -i talk.latex || exit
+	pdflatex talk.latex  || exit
+
+view: talk.pdf
+	evince talk.pdf &
+
+xpdf: talk.pdf
+	xpdf talk.pdf &
diff --git a/talk/pycon-italy-2017/author.latex b/talk/pycon-italy-2017/author.latex
new file mode 100644
--- /dev/null
+++ b/talk/pycon-italy-2017/author.latex
@@ -0,0 +1,8 @@
+\definecolor{rrblitbackground}{rgb}{0.0, 0.0, 0.0}
+
+\title[PyPy Status Update]{PyPy Status Update}
+\author[antocuni]
+{Antonio Cuni}
+
+\institute{PyCon Otto}
+\date{April 07 2017}
diff --git a/talk/pycon-italy-2017/beamerdefs.txt b/talk/pycon-italy-2017/beamerdefs.txt
new file mode 100644
--- /dev/null
+++ b/talk/pycon-italy-2017/beamerdefs.txt
@@ -0,0 +1,108 @@
+.. colors
+.. ===========================
+
+.. role:: green
+.. role:: red
+
+
+.. general useful commands
+.. ===========================
+
+.. |pause| raw:: latex
+
+   \pause
+
+.. |small| raw:: latex
+
+   {\small
+
+.. |end_small| raw:: latex
+
+   }
+
+.. |scriptsize| raw:: latex
+
+   {\scriptsize
+
+.. |end_scriptsize| raw:: latex
+
+   }
+
+.. |strike<| raw:: latex
+
+   \sout{
+
+.. closed bracket
+.. ===========================
+
+.. |>| raw:: latex
+
+   }
+
+
+.. example block
+.. ===========================
+
+.. |example<| raw:: latex
+
+   \begin{exampleblock}{
+
+
+.. |end_example| raw:: latex
+
+   \end{exampleblock}
+
+
+
+.. alert block
+.. ===========================
+
+.. |alert<| raw:: latex
+
+   \begin{alertblock}{
+
+
+.. |end_alert| raw:: latex
+
+   \end{alertblock}
+
+
+
+.. columns
+.. ===========================
+
+.. |column1| raw:: latex
+
+   \begin{columns}
+      \begin{column}{0.45\textwidth}
+
+.. |column2| raw:: latex
+
+      \end{column}
+      \begin{column}{0.45\textwidth}
+
+
+.. |end_columns| raw:: latex
+
+      \end{column}
+   \end{columns}
+
+
+
+.. |snake| image:: ../../img/py-web-new.png
+           :scale: 15%
+           
+
+
+.. nested blocks
+.. ===========================
+
+.. |nested| raw:: latex
+
+   \begin{columns}
+      \begin{column}{0.85\textwidth}
+
+.. |end_nested| raw:: latex
+
+      \end{column}
+   \end{columns}
diff --git a/talk/pycon-italy-2017/stylesheet.latex b/talk/pycon-italy-2017/stylesheet.latex
new file mode 100644
--- /dev/null
+++ b/talk/pycon-italy-2017/stylesheet.latex
@@ -0,0 +1,10 @@
+\usetheme{Boadilla}
+\setbeamercovered{transparent}
+\setbeamertemplate{navigation symbols}{}
+
+\definecolor{darkgreen}{rgb}{0, 0.5, 0.0}
+\newcommand{\docutilsrolegreen}[1]{\color{darkgreen}#1\normalcolor}
+\newcommand{\docutilsrolered}[1]{\color{red}#1\normalcolor}
+
+\newcommand{\green}[1]{\color{darkgreen}#1\normalcolor}
+\newcommand{\red}[1]{\color{red}#1\normalcolor}
diff --git a/talk/pycon-italy-2017/talk.pdf.info b/talk/pycon-italy-2017/talk.pdf.info
new file mode 100644
--- /dev/null
+++ b/talk/pycon-italy-2017/talk.pdf.info
@@ -0,0 +1,11 @@
+AvailableTransitions=[Crossfade]
+TransitionDuration = 100
+EstimatedDuration = 45*60       # in seconds
+MinutesOnly = True
+
+PageProps = {
+    1: {
+    'reset': FirstTimeOnly,
+    'progress': False,
+    },
+}
diff --git a/talk/pycon-italy-2017/talk.rst b/talk/pycon-italy-2017/talk.rst
new file mode 100644
--- /dev/null
+++ b/talk/pycon-italy-2017/talk.rst
@@ -0,0 +1,16 @@
+.. include:: beamerdefs.txt
+
+================================
+PyPy Status Update
+================================
+
+Hello
+-----
+
+bla bla
+
+World
+-----
+
+bla bla
+
diff --git a/talk/pycon-italy-2017/title.latex b/talk/pycon-italy-2017/title.latex
new file mode 100644
--- /dev/null
+++ b/talk/pycon-italy-2017/title.latex
@@ -0,0 +1,5 @@
+\begin{titlepage}
+\begin{figure}[h]
+\includegraphics[width=80px]{../img/py-web.png}
+\end{figure}
+\end{titlepage}

From pypy.commits at gmail.com  Thu Apr  6 05:54:57 2017
From: pypy.commits at gmail.com (antocuni)
Date: Thu, 06 Apr 2017 02:54:57 -0700 (PDT)
Subject: [pypy-commit] extradoc extradoc: write most of my talk
Message-ID: <58e61071.8aa4df0a.c08e7.7eea@mx.google.com>

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: extradoc
Changeset: r5796:75d41d3731d6
Date: 2017-04-06 11:54 +0200
http://bitbucket.org/pypy/extradoc/changeset/75d41d3731d6/

Log:	write most of my talk

diff --git a/talk/ep2011/talk/beamerdefs.txt b/talk/ep2011/talk/beamerdefs.txt
--- a/talk/ep2011/talk/beamerdefs.txt
+++ b/talk/ep2011/talk/beamerdefs.txt
@@ -93,7 +93,6 @@
            :scale: 15%
            
 
-
 .. nested blocks
 .. ===========================
 
diff --git a/talk/pycon-italy-2017/asyncio.png b/talk/pycon-italy-2017/asyncio.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2f8496364fe82b6a6f662f5e0d4b6d415f436ccd
GIT binary patch

[cut]

diff --git a/talk/pycon-italy-2017/beamerdefs.txt b/talk/pycon-italy-2017/beamerdefs.txt
--- a/talk/pycon-italy-2017/beamerdefs.txt
+++ b/talk/pycon-italy-2017/beamerdefs.txt
@@ -93,6 +93,9 @@
            :scale: 15%
            
 
+.. |ok| image:: ok.png
+           :scale: 25%
+
 
 .. nested blocks
 .. ===========================
diff --git a/talk/pycon-italy-2017/crossbar-io.png b/talk/pycon-italy-2017/crossbar-io.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a6c7b970ea478c956920b1f4c34a8c198a7434f3
GIT binary patch

[cut]

diff --git a/talk/pycon-italy-2017/gambit.png b/talk/pycon-italy-2017/gambit.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f361b3e3c647f4ac1b511be0b1bb313968788ee9
GIT binary patch

[cut]

diff --git a/talk/pycon-italy-2017/magnetic.png b/talk/pycon-italy-2017/magnetic.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d35a0e3a0bce5944727ed7529b486a57ed753699
GIT binary patch

[cut]

diff --git a/talk/pycon-italy-2017/speed.png b/talk/pycon-italy-2017/speed.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b9fda24cf9599bfc1f69725766c10bab0c421e9f
GIT binary patch

[cut]

diff --git a/talk/pycon-italy-2017/talk.rst b/talk/pycon-italy-2017/talk.rst
--- a/talk/pycon-italy-2017/talk.rst
+++ b/talk/pycon-italy-2017/talk.rst
@@ -4,13 +4,239 @@
 PyPy Status Update
 ================================
 
-Hello
+About me
+---------
+
+- PyPy core dev
+
+- ``pdb++``, ``fancycompleter``, ``capnpy``, ...
+
+- Consultant, trainer
+
+- http://antocuni.eu
+
+
+What is PyPy
+---------------
+
+- Alternative, fast Python implementation
+
+- Performance: JIT compiler, advanced GC
+
+- PyPy 5.7.1
+
+  - x86, ARM, s390x, PPC
+
+- http://pypy.org
+
+
+Speed
 -----
 
-bla bla
+.. image:: speed.png
+   :scale: 23%
+   :align: center
 
-World
+- 7.4 times *faster* than CPython
+
+- http://speed.pypy.org
+
+
+
+Usual questions
+----------------
+
+- **Is it stable/mature? Can I use it in production?**
+
+- Does package X work?
+
+- What about Python 3?
+
+
+PyPy in the real world (1)
+---------------------------
+
+.. image:: gambit.png
+   :scale: 20%
+   :align: left
+
+
+- High frequency trading of sport bets
+
+  * low latency is a must
+
+- PyPy used in production since 2012
+
+- ~100 PyPy processes running 24/7
+
+- up to 10x speedups
+
+  * after careful tuning and optimizing for PyPy
+
+
+PyPy in the real world (2)
+---------------------------
+
+.. image:: magnetic.png
+   :scale: 23%
+   :align: left
+
+- Real-time online advertising auctions
+
+  * tight latency requirement (<100ms)
+
+  * high throughput (hundreds of thousands of requests per second)
+
+- 30% speedup
+
+|small|
+|end_small|
+
+    We run PyPy basically everywhere
+
+    **Julian Berman**
+
+
+  
+PyPy in the real world (3)
+--------------------------
+
+.. image:: crossbar-io.png
+   :scale: 23%
+   :align: left
+
+- IoT on the cloud
+
+- 5-10x faster
+
+|small|
+|end_small|
+
+    We do not even run benchmarks on CPython because we just know that PyPy
+    is way faster
+
+    **Tobias Oberstein**
+
+
+Usual questions
+----------------
+
+- Is it stable/mature? Can I use it in production? |ok|
+
+- **Does package X work?**
+
+- What about Python 3?
+
+
+cpyext
+------
+
+- Pure Python pacakges just work (TM)
+
+- C extensions goes through **cpyext**
+
+- Lots of progresses in the compatibility area
+
+- Still slow
+
+  * Crossing the Python/C border takes ages
+
+  * lots of low hanging fruits to be taken :)
+
+- Use CFFI if possible
+
+numpy
 -----
 
-bla bla
+- It just works
 
+  * ~5 failing tests
+
+- Better GC integration needed
+
+- The GC does not know how much raw memory numpy objects are keeping alive
+    
+  * It **looks like** a memory leak
+
+
+Other libs
+-----------
+
+- cython
+
+  * it works
+
+- pandas
+
+  * ~95% of passing tests
+
+  * most failures are because it cannot find Tkinter libs
+
+  * We saw some segfaults
+
+- scipy
+
+  * ~99% of passing tests
+
+  * Numpy memory leaks?
+
+- matplotlib
+
+  * Saving to disk works
+
+  * Jupyter inline works
+
+  * no GUI backends
+    
+
+Usual questions
+----------------
+
+- Is it stable/mature? Can I use it in production? |ok|
+
+- Does package X work? |ok|
+
+- **What about Python 3?**
+
+
+PyPy 3.5
+---------
+
+- PyPy 5.7.1 supports Python 3.5 (beta)
+
+- Funded by a big grant by Mozilla (thanks!)
+
+  * |scriptsize| https://morepypy.blogspot.com/2016/08/pypy-gets-funding-from-mozilla-for.html |end_scriptsize|
+
+- Still some failing tests
+
+- Very good results on asyncio
+
+  
+PyPy 3.5 asyncio
+----------------
+
+.. image:: asyncio.png
+   :scale: 50%
+   :align: center
+
+- Between 2.87 and 8.08 times faster
+
+
+..
+   Topics
+   -----
+
+   - STM / nogil branch :(
+
+   - vmprof
+
+   STM
+   ---
+
+   <arigato> we never really tried to fix all performance issues, and more importantly:
+   <arigato> if you start with some multithreaded program, it is really slow
+   <arigato> it's a bit depressing because you need to dig and fix conflicts, and not getting any speed-up at all, until with enough efforts suddenly it's fast
+   <arigato> in other words, to make it usable we'd need something more flexible, probably based on much shorter transactions, but that needs rethoughts
+
+

From pypy.commits at gmail.com  Thu Apr  6 05:56:20 2017
From: pypy.commits at gmail.com (antocuni)
Date: Thu, 06 Apr 2017 02:56:20 -0700 (PDT)
Subject: [pypy-commit] extradoc extradoc: forgot this file
Message-ID: <58e610c4.5886df0a.7c03d.8129@mx.google.com>

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: extradoc
Changeset: r5797:6059846ffc00
Date: 2017-04-06 11:55 +0200
http://bitbucket.org/pypy/extradoc/changeset/6059846ffc00/

Log:	forgot this file

diff --git a/talk/pycon-italy-2017/ok.png b/talk/pycon-italy-2017/ok.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a165a6dfa26ea18f1bf1021715be582fd02b8497
GIT binary patch

[cut]


From pypy.commits at gmail.com  Thu Apr  6 05:56:24 2017
From: pypy.commits at gmail.com (antocuni)
Date: Thu, 06 Apr 2017 02:56:24 -0700 (PDT)
Subject: [pypy-commit] extradoc extradoc: one more slide
Message-ID: <58e610c8.c3a4df0a.fa877.7fee@mx.google.com>

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: extradoc
Changeset: r5798:69219e938a5d
Date: 2017-04-06 11:56 +0200
http://bitbucket.org/pypy/extradoc/changeset/69219e938a5d/

Log:	one more slide

diff --git a/talk/pycon-italy-2017/talk.rst b/talk/pycon-italy-2017/talk.rst
--- a/talk/pycon-italy-2017/talk.rst
+++ b/talk/pycon-italy-2017/talk.rst
@@ -223,6 +223,17 @@
 - Between 2.87 and 8.08 times faster
 
 
+Usual questions
+----------------
+
+- Is it stable/mature? Can I use it in production? |ok|
+
+- Does package X work? |ok|
+
+- What about Python 3? |ok|
+
+- **Bonus topic: vmprof**
+  
 ..
    Topics
    -----

From pypy.commits at gmail.com  Thu Apr  6 08:06:25 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 05:06:25 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: In this branch,
 hack the buildbot config to only run one test.
Message-ID: <58e62f41.4790df0a.b171d.ae40@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r90981:832db07f1970
Date: 2017-04-06 13:48 +0200
http://bitbucket.org/pypy/pypy/changeset/832db07f1970/

Log:	In this branch, hack the buildbot config to only run one test.

diff --git a/pypy/testrunner_cfg.py b/pypy/testrunner_cfg.py
--- a/pypy/testrunner_cfg.py
+++ b/pypy/testrunner_cfg.py
@@ -9,11 +9,7 @@
 ]
 
 def collect_one_testdir(testdirs, reldir, tests):
-    for dir in DIRS_SPLIT:
-        if reldir.startswith(dir):
-            testdirs.extend(tests)
-            break
-    else:
+    if reldir.startswith('module/faulthandler'):
         testdirs.append(reldir)
 
 

From pypy.commits at gmail.com  Thu Apr  6 08:47:39 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 05:47:39 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: Add comments at the places
 where a forward-conditional-jump is usually taken
Message-ID: <58e638eb.2394df0a.e4b2e.bdf2@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r90983:009d3cc7f580
Date: 2017-04-06 14:46 +0200
http://bitbucket.org/pypy/pypy/changeset/009d3cc7f580/

Log:	Add comments at the places where a forward-conditional-jump is
	usually taken

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -276,6 +276,7 @@
         self.set_extra_stack_depth(mc, 0)
         #
         mc.TEST_rr(eax.value, eax.value)
+        # common case: not taken
         mc.J_il(rx86.Conditions['Z'], 0xfffff) # patched later
         jz_location = mc.get_relative_pos(break_basic_block=False)
         mc.MOV_rr(ecx.value, eax.value)
@@ -832,6 +833,7 @@
         ofs = self.cpu.unpack_fielddescr(descrs.arraydescr.lendescr)
         mc.CMP_bi(ofs, 0xffffff)     # force writing 32 bit
         stack_check_cmp_ofs = mc.get_relative_pos(break_basic_block=False) - 4
+        # PPP FIX ME
         jg_location = mc.emit_forward_jump('GE')
         mc.MOV_si(WORD, 0xffffff)     # force writing 32 bit
         ofs2 = mc.get_relative_pos(break_basic_block=False) - 4
@@ -995,6 +997,7 @@
             self.mc.MOV(eax, heap(endaddr))             # MOV eax, [start]
             self.mc.SUB(eax, esp)                       # SUB eax, current
             self.mc.CMP(eax, heap(lengthaddr))          # CMP eax, [length]
+            # PPP FIX ME
             jb_location = self.mc.emit_forward_jump('BE')#JBE .skip
             self.mc.CALL(imm(self.stack_check_slowpath))# CALL slowpath
             # patch the JB above                        # .skip:
@@ -1536,9 +1539,11 @@
         reg = arglocs[0]
         self.mc.TEST(reg, reg)
         if WORD == 4:
+            # common case: not taken
             self.mc.J_il(rx86.Conditions['Z'], self.propagate_exception_path)
             self.mc.add_pending_relocation()
         elif WORD == 8:
+            # common case: not taken
             self.mc.J_il(rx86.Conditions['Z'], 0)
             pos = self.mc.get_relative_pos(break_basic_block=False)
             self.pending_memoryerror_trampoline_from.append(pos)
@@ -2065,6 +2070,7 @@
     def implement_guard(self, guard_token):
         # These jumps are patched later.
         assert self.guard_success_cc >= 0
+        # common case: not taken
         self.mc.J_il(rx86.invert_condition(self.guard_success_cc), 0)
         self.guard_success_cc = rx86.cond_none
         pos = self.mc.get_relative_pos(break_basic_block=False)
@@ -2257,6 +2263,7 @@
         else:
             loc = addr_add_const(loc_base, descr.jit_wb_if_flag_byteofs)
         mc.TEST8(loc, imm(mask))
+        # PPP FIX ME
         jz_location = mc.emit_forward_jump('Z')   # patched later
 
         # for cond_call_gc_wb_array, also add another fast path:
@@ -2374,6 +2381,7 @@
 
     def cond_call(self, gcmap, imm_func, arglocs, resloc=None):
         assert self.guard_success_cc >= 0
+        # PPP FIX ME
         j_location = self.mc.emit_forward_jump_cond(
             rx86.invert_condition(self.guard_success_cc))
         self.guard_success_cc = rx86.cond_none
@@ -2435,6 +2443,7 @@
         self.mc.MOV(ecx, heap(nursery_free_adr))
         self.mc.LEA_rm(edx.value, (ecx.value, size))
         self.mc.CMP(edx, heap(nursery_top_adr))
+        # PPP FIX ME
         jna_location = self.mc.emit_forward_jump('NA')   # patched later
         # save the gcmap
         self.push_gcmap(self.mc, gcmap, store=True)
@@ -2453,6 +2462,7 @@
         else:
             self.mc.LEA_ra(edx.value, (ecx.value, sizeloc.value, 0, 0))
         self.mc.CMP(edx, heap(nursery_top_adr))
+        # PPP FIX ME
         jna_location = self.mc.emit_forward_jump('NA')   # patched later
         # save the gcmap
         self.push_gcmap(self.mc, gcmap, store=True)
@@ -2499,6 +2509,7 @@
         # now edx contains the total size in bytes, rounded up to a multiple
         # of WORD, plus nursery_free_adr
         self.mc.CMP(edx, heap(nursery_top_adr))
+        # PPP FIX ME
         jna_location = self.mc.emit_forward_jump('NA')   # patched later
         #
         self.mc.patch_forward_jump(ja_location)
diff --git a/rpython/jit/backend/x86/callbuilder.py b/rpython/jit/backend/x86/callbuilder.py
--- a/rpython/jit/backend/x86/callbuilder.py
+++ b/rpython/jit/backend/x86/callbuilder.py
@@ -347,6 +347,7 @@
             rst = gcrootmap.get_root_stack_top_addr()
             mc = self.mc
             mc.CMP(ebx, heap(rst))
+            # PPP FIX ME
             je_location = mc.emit_forward_jump('E')
             # revert the rpy_fastgil acquired above, so that the
             # general 'reacqgil_addr' below can acquire it again...

From pypy.commits at gmail.com  Thu Apr  6 08:47:37 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 05:47:37 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: A branch to try to simplify
 the job of the CPU's branch predictor
Message-ID: <58e638e9.c38a1c0a.2c58.c686@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r90982:779e5b3f520d
Date: 2017-04-06 14:32 +0200
http://bitbucket.org/pypy/pypy/changeset/779e5b3f520d/

Log:	A branch to try to simplify the job of the CPU's branch predictor


From pypy.commits at gmail.com  Thu Apr  6 09:40:34 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 06:40:34 -0700 (PDT)
Subject: [pypy-commit] pypy default: Allow propagating the known value of
 r11 a bit more often
Message-ID: <58e64552.56711c0a.38886.d514@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90984:aeca854b1b83
Date: 2017-04-06 15:39 +0200
http://bitbucket.org/pypy/pypy/changeset/aeca854b1b83/

Log:	Allow propagating the known value of r11 a bit more often

diff --git a/rpython/jit/backend/llsupport/asmmemmgr.py b/rpython/jit/backend/llsupport/asmmemmgr.py
--- a/rpython/jit/backend/llsupport/asmmemmgr.py
+++ b/rpython/jit/backend/llsupport/asmmemmgr.py
@@ -250,7 +250,7 @@
         return self.rawstart
 
     def overwrite(self, index, char):
-        assert 0 <= index < self.get_relative_pos()
+        assert 0 <= index < self.get_relative_pos(break_basic_block=False)
         block = self._cursubblock
         index -= self._baserelpos
         while index < 0:
@@ -264,7 +264,8 @@
         self.overwrite(index + 2, chr((val >> 16) & 0xff))
         self.overwrite(index + 3, chr((val >> 24) & 0xff))
 
-    def get_relative_pos(self):
+    def get_relative_pos(self, break_basic_block=True):
+        # 'break_basic_block' is only used in x86
         return self._baserelpos + self._cursubindex
 
     def copy_to_raw_memory(self, addr):
@@ -288,7 +289,7 @@
         HEX = '0123456789ABCDEF'
         dump = []
         src = rffi.cast(rffi.CCHARP, addr)
-        end = self.get_relative_pos()
+        end = self.get_relative_pos(break_basic_block=False)
         if count != -1:
             end = offset + count
         for p in range(offset, end):
@@ -336,17 +337,20 @@
 
     def _become_a_plain_block_builder(self):
         # hack purely for speed of tests
-        self._data = []
-        self.writechar = self._data.append
-        self.overwrite = self._data.__setitem__
-        self.get_relative_pos = self._data.__len__
+        self._data = _data = []
+        self.writechar = _data.append
+        self.overwrite = _data.__setitem__
+        def get_relative_pos(break_basic_block=True):
+            return len(_data)
+        self.get_relative_pos = get_relative_pos
         def plain_copy_to_raw_memory(addr):
             dst = rffi.cast(rffi.CCHARP, addr)
-            for i, c in enumerate(self._data):
+            for i, c in enumerate(_data):
                 dst[i] = c
         self._copy_to_raw_memory = plain_copy_to_raw_memory
 
     def insert_gcroot_marker(self, mark):
         if self.gcroot_markers is None:
             self.gcroot_markers = []
-        self.gcroot_markers.append((self.get_relative_pos(), mark))
+        self.gcroot_markers.append(
+            (self.get_relative_pos(break_basic_block=False), mark))
diff --git a/rpython/jit/backend/llsupport/assembler.py b/rpython/jit/backend/llsupport/assembler.py
--- a/rpython/jit/backend/llsupport/assembler.py
+++ b/rpython/jit/backend/llsupport/assembler.py
@@ -265,14 +265,16 @@
 
     def enter_portal_frame(self, op):
         if self.cpu.HAS_CODEMAP:
+            pos = self.mc.get_relative_pos(break_basic_block=False)
             self.codemap_builder.enter_portal_frame(op.getarg(0).getint(),
                                                     op.getarg(1).getint(),
-                                                    self.mc.get_relative_pos())
+                                                    pos)
 
     def leave_portal_frame(self, op):
         if self.cpu.HAS_CODEMAP:
+            pos = self.mc.get_relative_pos(break_basic_block=False)
             self.codemap_builder.leave_portal_frame(op.getarg(0).getint(),
-                                                    self.mc.get_relative_pos())
+                                                    pos)
 
     def call_assembler(self, op, argloc, vloc, result_loc, tmploc):
         """
diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -1713,6 +1713,8 @@
         pos = self.mc.get_relative_pos(break_basic_block=False)
         pos += 1   # after potential jmp
         guard_token.pos_jump_offset = pos
+        saved = self.mc.get_scratch_register_known_value()
+        guard_token.known_scratch_value = saved
         self.pending_guard_tokens.append(guard_token)
 
     def genop_guard_guard_exception(self, guard_op, guard_token, locs, resloc):
@@ -1908,6 +1910,8 @@
         """
         self.mc.force_frame_size(DEFAULT_FRAME_BYTES)
         startpos = self.mc.get_relative_pos()
+        self.mc.restore_scratch_register_known_value(
+                                         guardtok.known_scratch_value)
         #
         self._update_at_exit(guardtok.fail_locs, guardtok.failargs,
                              guardtok.faildescr, regalloc)
@@ -2069,6 +2073,8 @@
         self.guard_success_cc = rx86.cond_none
         pos = self.mc.get_relative_pos(break_basic_block=False)
         guard_token.pos_jump_offset = pos - 4
+        saved = self.mc.get_scratch_register_known_value()
+        guard_token.known_scratch_value = saved
         self.pending_guard_tokens.append(guard_token)
 
     def _genop_real_call(self, op, arglocs, resloc):
diff --git a/rpython/jit/backend/x86/regloc.py b/rpython/jit/backend/x86/regloc.py
--- a/rpython/jit/backend/x86/regloc.py
+++ b/rpython/jit/backend/x86/regloc.py
@@ -621,6 +621,12 @@
     def forget_scratch_register(self):
         self._scratch_register_value = 0
 
+    def get_scratch_register_known_value(self):
+        return self._scratch_register_value
+
+    def restore_scratch_register_known_value(self, saved_value):
+        self._scratch_register_value = saved_value
+
     def trap(self):
         self.INT3()
 

From pypy.commits at gmail.com  Thu Apr  6 09:55:10 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 06:55:10 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: hg merge default
Message-ID: <58e648be.d2111c0a.8ca91.e2c4@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r90985:cec1f9a265c5
Date: 2017-04-06 15:41 +0200
http://bitbucket.org/pypy/pypy/changeset/cec1f9a265c5/

Log:	hg merge default

diff --git a/rpython/jit/backend/llsupport/asmmemmgr.py b/rpython/jit/backend/llsupport/asmmemmgr.py
--- a/rpython/jit/backend/llsupport/asmmemmgr.py
+++ b/rpython/jit/backend/llsupport/asmmemmgr.py
@@ -250,7 +250,7 @@
         return self.rawstart
 
     def overwrite(self, index, char):
-        assert 0 <= index < self.get_relative_pos()
+        assert 0 <= index < self.get_relative_pos(break_basic_block=False)
         block = self._cursubblock
         index -= self._baserelpos
         while index < 0:
@@ -264,7 +264,8 @@
         self.overwrite(index + 2, chr((val >> 16) & 0xff))
         self.overwrite(index + 3, chr((val >> 24) & 0xff))
 
-    def get_relative_pos(self):
+    def get_relative_pos(self, break_basic_block=True):
+        # 'break_basic_block' is only used in x86
         return self._baserelpos + self._cursubindex
 
     def copy_to_raw_memory(self, addr):
@@ -288,7 +289,7 @@
         HEX = '0123456789ABCDEF'
         dump = []
         src = rffi.cast(rffi.CCHARP, addr)
-        end = self.get_relative_pos()
+        end = self.get_relative_pos(break_basic_block=False)
         if count != -1:
             end = offset + count
         for p in range(offset, end):
@@ -336,17 +337,20 @@
 
     def _become_a_plain_block_builder(self):
         # hack purely for speed of tests
-        self._data = []
-        self.writechar = self._data.append
-        self.overwrite = self._data.__setitem__
-        self.get_relative_pos = self._data.__len__
+        self._data = _data = []
+        self.writechar = _data.append
+        self.overwrite = _data.__setitem__
+        def get_relative_pos(break_basic_block=True):
+            return len(_data)
+        self.get_relative_pos = get_relative_pos
         def plain_copy_to_raw_memory(addr):
             dst = rffi.cast(rffi.CCHARP, addr)
-            for i, c in enumerate(self._data):
+            for i, c in enumerate(_data):
                 dst[i] = c
         self._copy_to_raw_memory = plain_copy_to_raw_memory
 
     def insert_gcroot_marker(self, mark):
         if self.gcroot_markers is None:
             self.gcroot_markers = []
-        self.gcroot_markers.append((self.get_relative_pos(), mark))
+        self.gcroot_markers.append(
+            (self.get_relative_pos(break_basic_block=False), mark))
diff --git a/rpython/jit/backend/llsupport/assembler.py b/rpython/jit/backend/llsupport/assembler.py
--- a/rpython/jit/backend/llsupport/assembler.py
+++ b/rpython/jit/backend/llsupport/assembler.py
@@ -265,14 +265,16 @@
 
     def enter_portal_frame(self, op):
         if self.cpu.HAS_CODEMAP:
+            pos = self.mc.get_relative_pos(break_basic_block=False)
             self.codemap_builder.enter_portal_frame(op.getarg(0).getint(),
                                                     op.getarg(1).getint(),
-                                                    self.mc.get_relative_pos())
+                                                    pos)
 
     def leave_portal_frame(self, op):
         if self.cpu.HAS_CODEMAP:
+            pos = self.mc.get_relative_pos(break_basic_block=False)
             self.codemap_builder.leave_portal_frame(op.getarg(0).getint(),
-                                                    self.mc.get_relative_pos())
+                                                    pos)
 
     def call_assembler(self, op, argloc, vloc, result_loc, tmploc):
         """
diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -1718,6 +1718,8 @@
         pos = self.mc.get_relative_pos(break_basic_block=False)
         pos += 1   # after potential jmp
         guard_token.pos_jump_offset = pos
+        saved = self.mc.get_scratch_register_known_value()
+        guard_token.known_scratch_value = saved
         self.pending_guard_tokens.append(guard_token)
 
     def genop_guard_guard_exception(self, guard_op, guard_token, locs, resloc):
@@ -1913,6 +1915,8 @@
         """
         self.mc.force_frame_size(DEFAULT_FRAME_BYTES)
         startpos = self.mc.get_relative_pos()
+        self.mc.restore_scratch_register_known_value(
+                                         guardtok.known_scratch_value)
         #
         self._update_at_exit(guardtok.fail_locs, guardtok.failargs,
                              guardtok.faildescr, regalloc)
@@ -2075,6 +2079,8 @@
         self.guard_success_cc = rx86.cond_none
         pos = self.mc.get_relative_pos(break_basic_block=False)
         guard_token.pos_jump_offset = pos - 4
+        saved = self.mc.get_scratch_register_known_value()
+        guard_token.known_scratch_value = saved
         self.pending_guard_tokens.append(guard_token)
 
     def _genop_real_call(self, op, arglocs, resloc):
diff --git a/rpython/jit/backend/x86/regloc.py b/rpython/jit/backend/x86/regloc.py
--- a/rpython/jit/backend/x86/regloc.py
+++ b/rpython/jit/backend/x86/regloc.py
@@ -621,6 +621,12 @@
     def forget_scratch_register(self):
         self._scratch_register_value = 0
 
+    def get_scratch_register_known_value(self):
+        return self._scratch_register_value
+
+    def restore_scratch_register_known_value(self, saved_value):
+        self._scratch_register_value = saved_value
+
     def trap(self):
         self.INT3()
 

From pypy.commits at gmail.com  Thu Apr  6 09:55:13 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 06:55:13 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: Start moving the first
 slowpath offline
Message-ID: <58e648c1.f8a0df0a.ed227.d50a@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r90986:9702232cd5b9
Date: 2017-04-06 15:54 +0200
http://bitbucket.org/pypy/pypy/changeset/9702232cd5b9/

Log:	Start moving the first slowpath offline

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -41,6 +41,34 @@
 from rpython.rlib.objectmodel import compute_unique_id
 
 
+class SlowPath(object):
+    def __init__(self, mc, condition):
+        mc.J_il(condition, 0xfffff)     # patched later
+        self.cond_jump_addr = mc.get_relative_pos(break_basic_block=False)
+        self.saved_scratch_value_1 = mc.get_scratch_register_known_value()
+
+    def set_continue_addr(self, mc):
+        self.continue_addr = mc.get_relative_pos(break_basic_block=False)
+        self.saved_scratch_value_2 = mc.get_scratch_register_known_value()
+
+    def generate(self, assembler):
+        # no alignment here, prefer compactness for these slow-paths
+        mc = assembler.mc
+        # patch the original jump to go here
+        offset = mc.get_relative_pos() - self.cond_jump_addr
+        mc.overwrite32(self.cond_jump_addr-4, offset)
+        # restore the knowledge of the scratch register value
+        # (this does not emit any code)
+        mc.restore_scratch_register_known_value(self.saved_scratch_value_1)
+        # generate the body of the slow-path
+        self.generate_body(assembler, mc)
+        # reload (if needed) the (possibly different) scratch register value
+        mc.load_scratch_if_known(self.saved_scratch_value_2)
+        # jump back
+        curpos = mc.get_relative_pos() + 5
+        mc.JMP_l(self.continue_addr - curpos)
+
+
 class Assembler386(BaseAssembler, VectorAssemblerMixin):
     _regalloc = None
     _output_loop_log = None
@@ -76,6 +104,7 @@
         BaseAssembler.setup(self, looptoken)
         assert self.memcpy_addr != 0, "setup_once() not called?"
         self.current_clt = looptoken.compiled_loop_token
+        self.pending_slowpaths = []
         self.pending_guard_tokens = []
         if WORD == 8:
             self.pending_memoryerror_trampoline_from = []
@@ -90,6 +119,7 @@
         self.frame_depth_to_patch = []
 
     def teardown(self):
+        self.pending_slowpaths = None
         self.pending_guard_tokens = None
         if WORD == 8:
             self.pending_memoryerror_trampoline_from = None
@@ -758,6 +788,9 @@
         self.teardown_gcrefs_list()
 
     def write_pending_failure_recoveries(self, regalloc):
+        # for each pending slowpath, generate it now
+        for sp in self.pending_slowpaths:
+            sp.generate(self)
         # for each pending guard, generate the code of the recovery stub
         # at the end of self.mc.
         for tok in self.pending_guard_tokens:
@@ -2444,18 +2477,21 @@
         # guard_no_exception too
         self.previous_cond_call_jcond = j_location
 
+    class MallocCondSlowPath(SlowPath):
+        def generate_body(self, assembler, mc):
+            assembler.push_gcmap(mc, self.gcmap, store=True)
+            mc.CALL(imm(follow_jump(assembler.malloc_slowpath)))
+
     def malloc_cond(self, nursery_free_adr, nursery_top_adr, size, gcmap):
         assert size & (WORD-1) == 0     # must be correctly aligned
         self.mc.MOV(ecx, heap(nursery_free_adr))
         self.mc.LEA_rm(edx.value, (ecx.value, size))
         self.mc.CMP(edx, heap(nursery_top_adr))
-        # PPP FIX ME
-        jna_location = self.mc.emit_forward_jump('NA')   # patched later
-        # save the gcmap
-        self.push_gcmap(self.mc, gcmap, store=True)
-        self.mc.CALL(imm(follow_jump(self.malloc_slowpath)))
-        self.mc.patch_forward_jump(jna_location)
+        sp = self.MallocCondSlowPath(self.mc, rx86.Conditions['A'])
+        sp.gcmap = gcmap
         self.mc.MOV(heap(nursery_free_adr), edx)
+        sp.set_continue_addr(self.mc)
+        self.pending_slowpaths.append(sp)
 
     def malloc_cond_varsize_frame(self, nursery_free_adr, nursery_top_adr,
                                   sizeloc, gcmap):
diff --git a/rpython/jit/backend/x86/regloc.py b/rpython/jit/backend/x86/regloc.py
--- a/rpython/jit/backend/x86/regloc.py
+++ b/rpython/jit/backend/x86/regloc.py
@@ -373,7 +373,7 @@
 class LocationCodeBuilder(object):
     _mixin_ = True
 
-    _scratch_register_value = 0    # 0 means 'unknown'
+    _scratch_register_value = -1    # -1 means 'unknown'
 
     def _binaryop(name):
 
@@ -552,7 +552,7 @@
         # If we are within a "reuse_scratch_register" block, we remember the
         # last value we loaded to the scratch register and encode the address
         # as an offset from that if we can
-        if self._scratch_register_value != 0:
+        if self._scratch_register_value != -1:
             offset = r_uint(addr) - r_uint(self._scratch_register_value)
             offset = intmask(offset)
             if rx86.fits_in_32bits(offset):
@@ -593,7 +593,7 @@
         return (reg, scalereg, scale, ofs)
 
     def _load_scratch(self, value):
-        if self._scratch_register_value != 0:
+        if self._scratch_register_value != -1:
             if self._scratch_register_value == value:
                 #print '_load_scratch(%x) [REUSED]' % (value,)
                 return
@@ -619,7 +619,7 @@
         self.MOV_ri(X86_64_SCRATCH_REG.value, value)
 
     def forget_scratch_register(self):
-        self._scratch_register_value = 0
+        self._scratch_register_value = -1
 
     def get_scratch_register_known_value(self):
         return self._scratch_register_value
@@ -627,6 +627,11 @@
     def restore_scratch_register_known_value(self, saved_value):
         self._scratch_register_value = saved_value
 
+    def load_scratch_if_known(self, saved_value):
+        if saved_value != -1:
+            assert IS_X86_64
+            self._load_scratch(saved_value)
+
     def trap(self):
         self.INT3()
 

From pypy.commits at gmail.com  Thu Apr  6 10:10:02 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 07:10:02 -0700 (PDT)
Subject: [pypy-commit] pypy default: Hard to test, but I think this is needed
Message-ID: <58e64c3a.cbafdf0a.f960b.d7e3@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90987:9db85c8cc752
Date: 2017-04-06 16:08 +0200
http://bitbucket.org/pypy/pypy/changeset/9db85c8cc752/

Log:	Hard to test, but I think this is needed

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -1707,6 +1707,10 @@
                 self.mc.patch_forward_jump(j_location)
             except codebuf.ShortJumpTooFar:
                 pass    # ignore this case
+            else:
+                # succeeded: forget the saved value of the scratch
+                # register here
+                self.mc.forget_scratch_register()
 
     def genop_guard_guard_not_invalidated(self, guard_op, guard_token,
                                           locs, ign):

From pypy.commits at gmail.com  Thu Apr  6 10:37:08 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 07:37:08 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: Fix one failure on windows
Message-ID: <58e65294.47b4df0a.94312.e3af@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r90988:0fe0e4f377e5
Date: 2017-04-06 16:36 +0200
http://bitbucket.org/pypy/pypy/changeset/0fe0e4f377e5/

Log:	Fix one failure on windows

diff --git a/pypy/module/faulthandler/faulthandler.h b/pypy/module/faulthandler/faulthandler.h
--- a/pypy/module/faulthandler/faulthandler.h
+++ b/pypy/module/faulthandler/faulthandler.h
@@ -2,7 +2,11 @@
 #define PYPY_FAULTHANDLER_H
 
 #include "src/precommondefs.h"
+#ifdef _MSC_VER
+typedef Signed intptr_t;
+#else
 #include <stdint.h>
+#endif
 
 
 typedef void (*pypy_faulthandler_cb_t)(int fd, intptr_t *array_p,

From pypy.commits at gmail.com  Thu Apr  6 10:45:55 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 07:45:55 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: hg merge default
Message-ID: <58e654a3.c9abdf0a.dec2b.e887@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r90989:83b603bf64b3
Date: 2017-04-06 16:11 +0200
http://bitbucket.org/pypy/pypy/changeset/83b603bf64b3/

Log:	hg merge default

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -1745,6 +1745,10 @@
                 self.mc.patch_forward_jump(j_location)
             except codebuf.ShortJumpTooFar:
                 pass    # ignore this case
+            else:
+                # succeeded: forget the saved value of the scratch
+                # register here
+                self.mc.forget_scratch_register()
 
     def genop_guard_guard_not_invalidated(self, guard_op, guard_token,
                                           locs, ign):

From pypy.commits at gmail.com  Thu Apr  6 10:45:57 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 07:45:57 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: malloc_cond_varsize_frame
Message-ID: <58e654a5.c32f1c0a.894d0.fe0f@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r90990:e3f48fca698e
Date: 2017-04-06 16:30 +0200
http://bitbucket.org/pypy/pypy/changeset/e3f48fca698e/

Log:	malloc_cond_varsize_frame

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -2508,13 +2508,11 @@
         else:
             self.mc.LEA_ra(edx.value, (ecx.value, sizeloc.value, 0, 0))
         self.mc.CMP(edx, heap(nursery_top_adr))
-        # PPP FIX ME
-        jna_location = self.mc.emit_forward_jump('NA')   # patched later
-        # save the gcmap
-        self.push_gcmap(self.mc, gcmap, store=True)
-        self.mc.CALL(imm(follow_jump(self.malloc_slowpath)))
-        self.mc.patch_forward_jump(jna_location)
+        sp = self.MallocCondSlowPath(self.mc, rx86.Conditions['A'])
+        sp.gcmap = gcmap
         self.mc.MOV(heap(nursery_free_adr), edx)
+        sp.set_continue_addr(self.mc)
+        self.pending_slowpaths.append(sp)
 
     def malloc_cond_varsize(self, kind, nursery_free_adr, nursery_top_adr,
                             lengthloc, itemsize, maxlength, gcmap,

From pypy.commits at gmail.com  Thu Apr  6 10:45:59 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 07:45:59 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: Move off-line the code to do
 COND_CALL. Move the following
Message-ID: <58e654a7.8a891c0a.106e7.fa22@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r90991:74361356084a
Date: 2017-04-06 16:45 +0200
http://bitbucket.org/pypy/pypy/changeset/74361356084a/

Log:	Move off-line the code to do COND_CALL. Move the following
	GUARD_NO_EXCEPTION, if any, together with that off-line code too

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -788,7 +788,9 @@
         self.teardown_gcrefs_list()
 
     def write_pending_failure_recoveries(self, regalloc):
-        # for each pending slowpath, generate it now
+        # for each pending slowpath, generate it now.  Note that this
+        # may occasionally add an extra guard_token in
+        # pending_guard_tokens, so it must be done before the next loop.
         for sp in self.pending_slowpaths:
             sp.generate(self)
         # for each pending guard, generate the code of the recovery stub
@@ -1191,9 +1193,9 @@
                                                     faillocs, frame_depth)
         genop_guard_list[guard_opnum](self, guard_op, guard_token,
                                       arglocs, resloc)
-        if not we_are_translated():
-            # must be added by the genop_guard_list[]()
-            assert guard_token is self.pending_guard_tokens[-1]
+        # this must usually have added guard_token as last element
+        # of self.pending_guard_tokens, but not always (see
+        # genop_guard_guard_no_exception)
 
     def load_effective_addr(self, sizereg, baseofs, scale, result, frm=imm0):
         self.mc.LEA(result, addr_add(frm, sizereg, baseofs, scale))
@@ -1733,22 +1735,21 @@
     genop_guard_guard_isnull = genop_guard_guard_false
 
     def genop_guard_guard_no_exception(self, guard_op, guard_token, locs, ign):
+        # If the previous operation was a COND_CALL, don't emit
+        # anything now.  Instead, we'll emit the GUARD_NO_EXCEPTION at
+        # the end of the slowpath in CondCallSlowPath.
+        if self._find_nearby_operation(-1).getopnum() in (
+                rop.COND_CALL, rop.COND_CALL_VALUE_I, rop.COND_CALL_VALUE_R):
+            sp = self.pending_slowpaths[-1]
+            assert isinstance(sp, self.CondCallSlowPath)
+            sp.guard_token_no_exception = guard_token
+        else:
+            self.generate_guard_no_exception(guard_token)
+
+    def generate_guard_no_exception(self, guard_token):
         self.mc.CMP(heap(self.cpu.pos_exception()), imm0)
         self.guard_success_cc = rx86.Conditions['Z']
         self.implement_guard(guard_token)
-        # If the previous operation was a COND_CALL, overwrite its conditional
-        # jump to jump over this GUARD_NO_EXCEPTION as well, if we can
-        if self._find_nearby_operation(-1).getopnum() in (
-                rop.COND_CALL, rop.COND_CALL_VALUE_I, rop.COND_CALL_VALUE_R):
-            j_location = self.previous_cond_call_jcond
-            try:
-                self.mc.patch_forward_jump(j_location)
-            except codebuf.ShortJumpTooFar:
-                pass    # ignore this case
-            else:
-                # succeeded: forget the saved value of the scratch
-                # register here
-                self.mc.forget_scratch_register()
 
     def genop_guard_guard_not_invalidated(self, guard_op, guard_token,
                                           locs, ign):
@@ -2422,64 +2423,75 @@
     def label(self):
         self._check_frame_depth_debug(self.mc)
 
+    class CondCallSlowPath(SlowPath):
+        guard_token_no_exception = None
+
+        def generate_body(self, assembler, mc):
+            assembler.push_gcmap(mc, self.gcmap, store=True)
+            #
+            # first save away the 4 registers from
+            # 'cond_call_register_arguments' plus the register 'eax'
+            base_ofs = assembler.cpu.get_baseofs_of_frame_field()
+            should_be_saved = assembler._regalloc.rm.reg_bindings.values()
+            restore_eax = False
+            for gpr in cond_call_register_arguments + [eax]:
+                if gpr not in should_be_saved or gpr is self.resloc:
+                    continue
+                v = gpr_reg_mgr_cls.all_reg_indexes[gpr.value]
+                mc.MOV_br(v * WORD + base_ofs, gpr.value)
+                if gpr is eax:
+                    restore_eax = True
+            #
+            # load the 0-to-4 arguments into these registers
+            from rpython.jit.backend.x86.jump import remap_frame_layout
+            arglocs = self.arglocs
+            remap_frame_layout(assembler, arglocs,
+                               cond_call_register_arguments[:len(arglocs)],
+                               X86_64_SCRATCH_REG if IS_X86_64 else None)
+            #
+            # load the constant address of the function to call into eax
+            mc.MOV(eax, self.imm_func)
+            #
+            # figure out which variant of cond_call_slowpath to call,
+            # and call it
+            callee_only = False
+            floats = False
+            if assembler._regalloc is not None:
+                for reg in assembler._regalloc.rm.reg_bindings.values():
+                    if reg not in assembler._regalloc.rm.save_around_call_regs:
+                        break
+                else:
+                    callee_only = True
+                if assembler._regalloc.xrm.reg_bindings:
+                    floats = True
+            cond_call_adr = assembler.cond_call_slowpath[floats*2 + callee_only]
+            mc.CALL(imm(follow_jump(cond_call_adr)))
+            # if this is a COND_CALL_VALUE, we need to move the result in place
+            resloc = self.resloc
+            if resloc is not None and resloc is not eax:
+                mc.MOV(resloc, eax)
+            # restoring the registers saved above, and doing pop_gcmap(), is
+            # left to the cond_call_slowpath helper.  We must only restore eax,
+            # if needed.
+            if restore_eax:
+                v = gpr_reg_mgr_cls.all_reg_indexes[eax.value]
+                mc.MOV_rb(eax.value, v * WORD + base_ofs)
+            #
+            # if needed, emit now the guard_no_exception
+            if self.guard_token_no_exception is not None:
+                assembler.generate_guard_no_exception(
+                             self.guard_token_no_exception)
+
     def cond_call(self, gcmap, imm_func, arglocs, resloc=None):
         assert self.guard_success_cc >= 0
-        # PPP FIX ME
-        j_location = self.mc.emit_forward_jump_cond(
-            rx86.invert_condition(self.guard_success_cc))
+        sp = self.CondCallSlowPath(self.mc, self.guard_success_cc)
+        sp.set_continue_addr(self.mc)
         self.guard_success_cc = rx86.cond_none
-        #
-        self.push_gcmap(self.mc, gcmap, store=True)
-        #
-        # first save away the 4 registers from 'cond_call_register_arguments'
-        # plus the register 'eax'
-        base_ofs = self.cpu.get_baseofs_of_frame_field()
-        should_be_saved = self._regalloc.rm.reg_bindings.values()
-        restore_eax = False
-        for gpr in cond_call_register_arguments + [eax]:
-            if gpr not in should_be_saved or gpr is resloc:
-                continue
-            v = gpr_reg_mgr_cls.all_reg_indexes[gpr.value]
-            self.mc.MOV_br(v * WORD + base_ofs, gpr.value)
-            if gpr is eax:
-                restore_eax = True
-        #
-        # load the 0-to-4 arguments into these registers
-        from rpython.jit.backend.x86.jump import remap_frame_layout
-        remap_frame_layout(self, arglocs,
-                           cond_call_register_arguments[:len(arglocs)],
-                           X86_64_SCRATCH_REG if IS_X86_64 else None)
-        #
-        # load the constant address of the function to call into eax
-        self.mc.MOV(eax, imm_func)
-        #
-        # figure out which variant of cond_call_slowpath to call, and call it
-        callee_only = False
-        floats = False
-        if self._regalloc is not None:
-            for reg in self._regalloc.rm.reg_bindings.values():
-                if reg not in self._regalloc.rm.save_around_call_regs:
-                    break
-            else:
-                callee_only = True
-            if self._regalloc.xrm.reg_bindings:
-                floats = True
-        cond_call_adr = self.cond_call_slowpath[floats * 2 + callee_only]
-        self.mc.CALL(imm(follow_jump(cond_call_adr)))
-        # if this is a COND_CALL_VALUE, we need to move the result in place
-        if resloc is not None and resloc is not eax:
-            self.mc.MOV(resloc, eax)
-        # restoring the registers saved above, and doing pop_gcmap(), is left
-        # to the cond_call_slowpath helper.  We must only restore eax, if
-        # needed.
-        if restore_eax:
-            v = gpr_reg_mgr_cls.all_reg_indexes[eax.value]
-            self.mc.MOV_rb(eax.value, v * WORD + base_ofs)
-        #
-        self.mc.patch_forward_jump(j_location)
-        # might be overridden again to skip over the following
-        # guard_no_exception too
-        self.previous_cond_call_jcond = j_location
+        sp.gcmap = gcmap
+        sp.imm_func = imm_func
+        sp.arglocs = arglocs
+        sp.resloc = resloc
+        self.pending_slowpaths.append(sp)
 
     class MallocCondSlowPath(SlowPath):
         def generate_body(self, assembler, mc):

From pypy.commits at gmail.com  Thu Apr  6 10:55:18 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 07:55:18 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: More win32 fixes
Message-ID: <58e656d6.41e81c0a.c19fd.97bc@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r90992:9f2239748e39
Date: 2017-04-06 16:54 +0200
http://bitbucket.org/pypy/pypy/changeset/9f2239748e39/

Log:	More win32 fixes

diff --git a/pypy/module/faulthandler/faulthandler.c b/pypy/module/faulthandler/faulthandler.c
--- a/pypy/module/faulthandler/faulthandler.c
+++ b/pypy/module/faulthandler/faulthandler.c
@@ -5,8 +5,10 @@
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
+#ifndef _WIN32
 #include <unistd.h>
 #include <sys/resource.h>
+#endif
 #include <math.h>
 
 #ifdef RPYTHON_LL2CTYPES
@@ -478,7 +480,7 @@
     faulthandler_dump_traceback(fd, fatal_error.all_threads, ucontext);
 
     errno = save_errno;
-#ifdef MS_WINDOWS
+#ifdef _WIN32
     if (signum == SIGSEGV) {
         /* don't explicitly call the previous handler for SIGSEGV in this signal
            handler, because the Windows signal handler would not be called */
@@ -625,7 +627,7 @@
 static void
 faulthandler_suppress_crash_report(void)
 {
-#ifdef MS_WINDOWS
+#ifdef _WIN32
     UINT mode;
 
     /* Configure Windows to not display the Windows Error Reporting dialog */
@@ -633,7 +635,7 @@
     SetErrorMode(mode | SEM_NOGPFAULTERRORBOX);
 #endif
 
-#ifndef MS_WINDOWS
+#ifndef _WIN32
     struct rlimit rl;
 
     /* Disable creation of core dump */
@@ -664,7 +666,7 @@
 void pypy_faulthandler_sigsegv(void)
 {
     faulthandler_suppress_crash_report();
-#if defined(MS_WINDOWS)
+#ifdef _WIN32
     /* For SIGSEGV, faulthandler_fatal_error() restores the previous signal
        handler and then gives back the execution flow to the program (without
        explicitly calling the previous error handler). In a normal case, the
diff --git a/pypy/module/faulthandler/faulthandler.h b/pypy/module/faulthandler/faulthandler.h
--- a/pypy/module/faulthandler/faulthandler.h
+++ b/pypy/module/faulthandler/faulthandler.h
@@ -3,7 +3,7 @@
 
 #include "src/precommondefs.h"
 #ifdef _MSC_VER
-typedef Signed intptr_t;
+#include <crtdef.h>
 #else
 #include <stdint.h>
 #endif

From pypy.commits at gmail.com  Thu Apr  6 11:01:45 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 08:01:45 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: Typo
Message-ID: <58e65859.c38a1c0a.2c58.f57a@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r90993:d904a57907f7
Date: 2017-04-06 17:01 +0200
http://bitbucket.org/pypy/pypy/changeset/d904a57907f7/

Log:	Typo

diff --git a/pypy/module/faulthandler/faulthandler.h b/pypy/module/faulthandler/faulthandler.h
--- a/pypy/module/faulthandler/faulthandler.h
+++ b/pypy/module/faulthandler/faulthandler.h
@@ -3,7 +3,7 @@
 
 #include "src/precommondefs.h"
 #ifdef _MSC_VER
-#include <crtdef.h>
+#include <crtdefs.h>
 #else
 #include <stdint.h>
 #endif

From pypy.commits at gmail.com  Thu Apr  6 11:04:22 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 08:04:22 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: Next slowpath
Message-ID: <58e658f6.f4aedf0a.78563.e9e6@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r90994:a32d15769b44
Date: 2017-04-06 17:03 +0200
http://bitbucket.org/pypy/pypy/changeset/a32d15769b44/

Log:	Next slowpath

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -125,6 +125,7 @@
             self.pending_memoryerror_trampoline_from = None
         self.mc = None
         self.current_clt = None
+        self.frame_depth_to_patch = None
 
     def _build_float_constants(self):
         # 0x80000000000000008000000000000000
@@ -858,6 +859,14 @@
         for ofs in self.frame_depth_to_patch:
             self._patch_frame_depth(ofs + rawstart, framedepth)
 
+    class IncreaseStackSlowPath(SlowPath):
+        def generate_body(self, assembler, mc):
+            mc.MOV_si(WORD, 0xffffff)     # force writing 32 bit
+            ofs2 = mc.get_relative_pos(break_basic_block=False) - 4
+            assembler.frame_depth_to_patch.append(ofs2)
+            assembler.push_gcmap(mc, self.gcmap, store=True)
+            mc.CALL(imm(assembler._frame_realloc_slowpath))
+
     def _check_frame_depth(self, mc, gcmap):
         """ check if the frame is of enough depth to follow this bridge.
         Otherwise reallocate the frame in a helper.
@@ -868,16 +877,11 @@
         ofs = self.cpu.unpack_fielddescr(descrs.arraydescr.lendescr)
         mc.CMP_bi(ofs, 0xffffff)     # force writing 32 bit
         stack_check_cmp_ofs = mc.get_relative_pos(break_basic_block=False) - 4
-        # PPP FIX ME
-        jg_location = mc.emit_forward_jump('GE')
-        mc.MOV_si(WORD, 0xffffff)     # force writing 32 bit
-        ofs2 = mc.get_relative_pos(break_basic_block=False) - 4
-        self.push_gcmap(mc, gcmap, store=True)
-        mc.CALL(imm(self._frame_realloc_slowpath))
-        # patch the JG above
-        mc.patch_forward_jump(jg_location)
         self.frame_depth_to_patch.append(stack_check_cmp_ofs)
-        self.frame_depth_to_patch.append(ofs2)
+        sp = self.IncreaseStackSlowPath(mc, rx86.Conditions['L'])
+        sp.gcmap = gcmap
+        sp.set_continue_addr(mc)
+        self.pending_slowpaths.append(sp)
 
     def _check_frame_depth_debug(self, mc):
         """ double check the depth size. It prints the error (and potentially

From pypy.commits at gmail.com  Thu Apr  6 11:10:18 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 08:10:18 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: Fix test
Message-ID: <58e65a5a.c7321c0a.6f752.ef45@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r90995:42b8fa2f6f37
Date: 2017-04-06 17:06 +0200
http://bitbucket.org/pypy/pypy/changeset/42b8fa2f6f37/

Log:	Fix test

diff --git a/rpython/jit/backend/x86/test/test_regloc.py b/rpython/jit/backend/x86/test/test_regloc.py
--- a/rpython/jit/backend/x86/test/test_regloc.py
+++ b/rpython/jit/backend/x86/test/test_regloc.py
@@ -211,9 +211,9 @@
     def test_64bit_address_4(self):
         base_addr = intmask(0xFEDCBA9876543210)
         cb = LocationCodeBuilder64()
-        assert cb._scratch_register_value == 0
+        assert cb._scratch_register_value == -1
         cb.MOV(ecx, AddressLoc(edx, esi, 2, base_addr))
-        assert cb._scratch_register_value == 0
+        assert cb._scratch_register_value == -1
         # this case is a CMP_ra
         #
         expected_instructions = (

From pypy.commits at gmail.com  Thu Apr  6 11:10:20 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 08:10:20 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: StackCheckSlowPath (untested
 so far)
Message-ID: <58e65a5c.87471c0a.27000.ff3a@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r90996:47bac8cac913
Date: 2017-04-06 17:09 +0200
http://bitbucket.org/pypy/pypy/changeset/47bac8cac913/

Log:	StackCheckSlowPath (untested so far)

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -1027,6 +1027,10 @@
         if gcrootmap and gcrootmap.is_shadow_stack:
             self._call_header_shadowstack(gcrootmap)
 
+    class StackCheckSlowPath(SlowPath):
+        def generate_body(self, assembler, mc):
+            mc.CALL(imm(assembler.stack_check_slowpath))
+
     def _call_header_with_stack_check(self):
         self._call_header()
         if self.stack_check_slowpath == 0:
@@ -1036,12 +1040,9 @@
             self.mc.MOV(eax, heap(endaddr))             # MOV eax, [start]
             self.mc.SUB(eax, esp)                       # SUB eax, current
             self.mc.CMP(eax, heap(lengthaddr))          # CMP eax, [length]
-            # PPP FIX ME
-            jb_location = self.mc.emit_forward_jump('BE')#JBE .skip
-            self.mc.CALL(imm(self.stack_check_slowpath))# CALL slowpath
-            # patch the JB above                        # .skip:
-            self.mc.patch_forward_jump(jb_location)
-            #
+            sp = self.StackCheckSlowPath(self.mc, rx86.Conditions['A'])
+            sp.set_continue_addr(self.mc)
+            self.pending_slowpaths.append(sp)
 
     def _call_footer(self):
         # the return value is the jitframe

From pypy.commits at gmail.com  Thu Apr  6 11:18:54 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 08:18:54 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: Faulthandler uses vmprof,
 pass the correct compilation flags.
Message-ID: <58e65c5e.c8361c0a.f221f.0025@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r90997:a59405c6a950
Date: 2017-04-06 17:18 +0200
http://bitbucket.org/pypy/pypy/changeset/a59405c6a950/

Log:	Faulthandler uses vmprof, pass the correct compilation flags.

diff --git a/pypy/module/faulthandler/cintf.py b/pypy/module/faulthandler/cintf.py
--- a/pypy/module/faulthandler/cintf.py
+++ b/pypy/module/faulthandler/cintf.py
@@ -1,4 +1,5 @@
 import py
+import sys
 from rpython.rtyper.lltypesystem import lltype, llmemory, rffi, rstr
 from rpython.translator import cdir
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
@@ -8,11 +9,15 @@
 rvmp = cwd.join('../../..')
 rvmp = rvmp.join('rpython/rlib/rvmprof/src')
 
+compile_extra = ['-DRPYTHON_VMPROF']
+if sys.platform == 'win32':
+    compile_extra.append('-DVMPROF_WINDOWS')
+
 eci = ExternalCompilationInfo(
     includes=[cwd.join('faulthandler.h')],
     include_dirs=[str(cwd), cdir, rvmp],
     separate_module_files=[cwd.join('faulthandler.c')],
-    compile_extra=['-DRPYTHON_VMPROF=1'])
+    compile_extra=compile_extra)
 
 eci_later = eci.merge(ExternalCompilationInfo(
     pre_include_bits=['#define PYPY_FAULTHANDLER_LATER\n']))

From pypy.commits at gmail.com  Thu Apr  6 11:23:08 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 08:23:08 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: WriteBarrierSlowPath
Message-ID: <58e65d5c.972e1c0a.4a092.f65b@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r90998:f34b447a2a19
Date: 2017-04-06 17:22 +0200
http://bitbucket.org/pypy/pypy/changeset/f34b447a2a19/

Log:	WriteBarrierSlowPath

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -51,9 +51,8 @@
         self.continue_addr = mc.get_relative_pos(break_basic_block=False)
         self.saved_scratch_value_2 = mc.get_scratch_register_known_value()
 
-    def generate(self, assembler):
-        # no alignment here, prefer compactness for these slow-paths
-        mc = assembler.mc
+    def generate(self, assembler, mc):
+        # no alignment here, prefer compactness for these slow-paths.
         # patch the original jump to go here
         offset = mc.get_relative_pos() - self.cond_jump_addr
         mc.overwrite32(self.cond_jump_addr-4, offset)
@@ -119,7 +118,6 @@
         self.frame_depth_to_patch = []
 
     def teardown(self):
-        self.pending_slowpaths = None
         self.pending_guard_tokens = None
         if WORD == 8:
             self.pending_memoryerror_trampoline_from = None
@@ -212,6 +210,7 @@
         """ This builds a general call slowpath, for whatever call happens to
         come.
         """
+        self.pending_slowpaths = []
         mc = codebuf.MachineCodeBlockWrapper()
         # copy registers to the frame, with the exception of the
         # 'cond_call_register_arguments' and eax, because these have already
@@ -242,6 +241,7 @@
         self.pop_gcmap(mc)   # cancel the push_gcmap(store=True) in the caller
         self._pop_all_regs_from_frame(mc, [eax], supports_floats, callee_only)
         mc.RET()
+        self.flush_pending_slowpaths(mc)
         return mc.materialize(self.cpu, [])
 
     def _build_malloc_slowpath(self, kind):
@@ -258,6 +258,7 @@
         This function must preserve all registers apart from ecx and edx.
         """
         assert kind in ['fixed', 'str', 'unicode', 'var']
+        self.pending_slowpaths = []
         mc = codebuf.MachineCodeBlockWrapper()
         self._push_all_regs_to_frame(mc, [ecx, edx], self.cpu.supports_floats)
         # the caller already did push_gcmap(store=True)
@@ -330,6 +331,7 @@
         mc.force_frame_size(DEFAULT_FRAME_BYTES + WORD)
         mc.ADD_ri(esp.value, WORD)
         mc.JMP(imm(self.propagate_exception_path))
+        self.flush_pending_slowpaths(mc)
         #
         rawstart = mc.materialize(self.cpu, [])
         return rawstart
@@ -788,12 +790,17 @@
         gcreftracers.append(tracer)    # keepalive
         self.teardown_gcrefs_list()
 
-    def write_pending_failure_recoveries(self, regalloc):
+    def flush_pending_slowpaths(self, mc):
         # for each pending slowpath, generate it now.  Note that this
         # may occasionally add an extra guard_token in
-        # pending_guard_tokens, so it must be done before the next loop.
+        # pending_guard_tokens, so it must be done before the
+        # following loop in write_pending_failure_recoveries().
         for sp in self.pending_slowpaths:
-            sp.generate(self)
+            sp.generate(self, mc)
+        self.pending_slowpaths = None
+
+    def write_pending_failure_recoveries(self, regalloc):
+        self.flush_pending_slowpaths(self.mc)
         # for each pending guard, generate the code of the recovery stub
         # at the end of self.mc.
         for tok in self.pending_guard_tokens:
@@ -2285,6 +2292,91 @@
 
     # ------------------- END CALL ASSEMBLER -----------------------
 
+    class WriteBarrierSlowPath(SlowPath):
+        def generate_body(self, assembler, mc):
+            # for cond_call_gc_wb_array, also add another fast path:
+            # if GCFLAG_CARDS_SET, then we can just set one bit and be done
+            card_marking = (self.loc_index is not None)
+            if card_marking:
+                # GCFLAG_CARDS_SET is in this byte at 0x80, so this fact can
+                # been checked by the sign flags of the previous TEST8
+                js_location = mc.emit_forward_jump('S')   # patched later
+            else:
+                js_location = 0
+
+            # Write only a CALL to the helper prepared in advance, passing it as
+            # argument the address of the structure we are writing into
+            # (the first argument to COND_CALL_GC_WB).
+            helper_num = card_marking
+            if self.is_frame:
+                helper_num = 4
+            elif (assembler._regalloc is not None and
+                  assembler._regalloc.xrm.reg_bindings):
+                helper_num += 2
+            if assembler.wb_slowpath[helper_num] == 0:    # tests only
+                assert not we_are_translated()
+                assembler.cpu.gc_ll_descr.write_barrier_descr = descr
+                assembler._build_wb_slowpath(card_marking,
+                                    bool(assembler._regalloc.xrm.reg_bindings))
+                assert assembler.wb_slowpath[helper_num] != 0
+            #
+            if not self.is_frame:
+                mc.PUSH(loc_base)
+            mc.CALL(imm(assembler.wb_slowpath[helper_num]))
+            if not self.is_frame:
+                mc.stack_frame_size_delta(-WORD)
+
+            if card_marking:
+                # The helper ends again with a check of the flag in the object.
+                # So here, we can simply write again a 'JNS', which will be
+                # taken if GCFLAG_CARDS_SET is still not set.
+                jns_location = mc.emit_forward_jump('NS')   # patched later
+                #
+                # patch the JS above
+                mc.patch_forward_jump(js_location)
+                #
+                # case GCFLAG_CARDS_SET: emit a few instructions to do
+                # directly the card flag setting
+                loc_index = self.loc_index
+                if isinstance(loc_index, RegLoc):
+                    if IS_X86_64 and isinstance(loc_base, RegLoc):
+                        # copy loc_index into r11
+                        tmp1 = X86_64_SCRATCH_REG
+                        mc.forget_scratch_register()
+                        mc.MOV_rr(tmp1.value, loc_index.value)
+                        final_pop = False
+                    else:
+                        # must save the register loc_index before it is mutated
+                        mc.PUSH_r(loc_index.value)
+                        tmp1 = loc_index
+                        final_pop = True
+                    # SHR tmp, card_page_shift
+                    mc.SHR_ri(tmp1.value, descr.jit_wb_card_page_shift)
+                    # XOR tmp, -8
+                    mc.XOR_ri(tmp1.value, -8)
+                    # BTS [loc_base], tmp
+                    if final_pop:
+                        # r11 is not specially used, fall back to regloc.py
+                        mc.BTS(addr_add_const(loc_base, 0), tmp1)
+                    else:
+                        # tmp1 is r11!  but in this case, loc_base is a
+                        # register so we can invoke directly rx86.py
+                        mc.BTS_mr((loc_base.value, 0), tmp1.value)
+                    # done
+                    if final_pop:
+                        mc.POP_r(loc_index.value)
+                    #
+                elif isinstance(loc_index, ImmedLoc):
+                    byte_index = loc_index.value >> descr.jit_wb_card_page_shift
+                    byte_ofs = ~(byte_index >> 3)
+                    byte_val = 1 << (byte_index & 7)
+                    mc.OR8(addr_add_const(loc_base, byte_ofs), imm(byte_val))
+                else:
+                    raise AssertionError("index is neither RegLoc nor ImmedLoc")
+                #
+                # patch the JNS above
+                mc.patch_forward_jump(jns_location)
+
     def _write_barrier_fastpath(self, mc, descr, arglocs, array=False,
                                 is_frame=False):
         # Write code equivalent to write_barrier() in the GC: it checks
@@ -2295,14 +2387,14 @@
             cls = self.cpu.gc_ll_descr.has_write_barrier_class()
             assert cls is not None and isinstance(descr, cls)
         #
-        card_marking = False
+        loc_index = None
         mask = descr.jit_wb_if_flag_singlebyte
         if array and descr.jit_wb_cards_set != 0:
             # assumptions the rest of the function depends on:
             assert (descr.jit_wb_cards_set_byteofs ==
                     descr.jit_wb_if_flag_byteofs)
             assert descr.jit_wb_cards_set_singlebyte == -0x80
-            card_marking = True
+            loc_index = arglocs[1]
             mask = descr.jit_wb_if_flag_singlebyte | -0x80
         #
         loc_base = arglocs[0]
@@ -2312,92 +2404,11 @@
         else:
             loc = addr_add_const(loc_base, descr.jit_wb_if_flag_byteofs)
         mc.TEST8(loc, imm(mask))
-        # PPP FIX ME
-        jz_location = mc.emit_forward_jump('Z')   # patched later
-
-        # for cond_call_gc_wb_array, also add another fast path:
-        # if GCFLAG_CARDS_SET, then we can just set one bit and be done
-        if card_marking:
-            # GCFLAG_CARDS_SET is in this byte at 0x80, so this fact can
-            # been checked by the sign flags of the previous TEST8
-            js_location = mc.emit_forward_jump('S')   # patched later
-        else:
-            js_location = 0
-
-        # Write only a CALL to the helper prepared in advance, passing it as
-        # argument the address of the structure we are writing into
-        # (the first argument to COND_CALL_GC_WB).
-        helper_num = card_marking
-        if is_frame:
-            helper_num = 4
-        elif self._regalloc is not None and self._regalloc.xrm.reg_bindings:
-            helper_num += 2
-        if self.wb_slowpath[helper_num] == 0:    # tests only
-            assert not we_are_translated()
-            self.cpu.gc_ll_descr.write_barrier_descr = descr
-            self._build_wb_slowpath(card_marking,
-                                    bool(self._regalloc.xrm.reg_bindings))
-            assert self.wb_slowpath[helper_num] != 0
-        #
-        if not is_frame:
-            mc.PUSH(loc_base)
-        mc.CALL(imm(self.wb_slowpath[helper_num]))
-        if not is_frame:
-            mc.stack_frame_size_delta(-WORD)
-
-        if card_marking:
-            # The helper ends again with a check of the flag in the object.
-            # So here, we can simply write again a 'JNS', which will be
-            # taken if GCFLAG_CARDS_SET is still not set.
-            jns_location = mc.emit_forward_jump('NS')   # patched later
-            #
-            # patch the JS above
-            mc.patch_forward_jump(js_location)
-            #
-            # case GCFLAG_CARDS_SET: emit a few instructions to do
-            # directly the card flag setting
-            loc_index = arglocs[1]
-            if isinstance(loc_index, RegLoc):
-                if IS_X86_64 and isinstance(loc_base, RegLoc):
-                    # copy loc_index into r11
-                    tmp1 = X86_64_SCRATCH_REG
-                    mc.forget_scratch_register()
-                    mc.MOV_rr(tmp1.value, loc_index.value)
-                    final_pop = False
-                else:
-                    # must save the register loc_index before it is mutated
-                    mc.PUSH_r(loc_index.value)
-                    tmp1 = loc_index
-                    final_pop = True
-                # SHR tmp, card_page_shift
-                mc.SHR_ri(tmp1.value, descr.jit_wb_card_page_shift)
-                # XOR tmp, -8
-                mc.XOR_ri(tmp1.value, -8)
-                # BTS [loc_base], tmp
-                if final_pop:
-                    # r11 is not specially used, fall back to regloc.py
-                    mc.BTS(addr_add_const(loc_base, 0), tmp1)
-                else:
-                    # tmp1 is r11!  but in this case, loc_base is a
-                    # register so we can invoke directly rx86.py
-                    mc.BTS_mr((loc_base.value, 0), tmp1.value)
-                # done
-                if final_pop:
-                    mc.POP_r(loc_index.value)
-                #
-            elif isinstance(loc_index, ImmedLoc):
-                byte_index = loc_index.value >> descr.jit_wb_card_page_shift
-                byte_ofs = ~(byte_index >> 3)
-                byte_val = 1 << (byte_index & 7)
-                mc.OR8(addr_add_const(loc_base, byte_ofs), imm(byte_val))
-            else:
-                raise AssertionError("index is neither RegLoc nor ImmedLoc")
-            #
-            # patch the JNS above
-            mc.patch_forward_jump(jns_location)
-
-        # patch the JZ above
-        mc.patch_forward_jump(jz_location)
+        sp = self.WriteBarrierSlowPath(mc, rx86.Conditions['NZ'])
+        sp.loc_index = loc_index
+        sp.is_frame = is_frame
+        sp.set_continue_addr(mc)
+        self.pending_slowpaths.append(sp)
 
     def genop_discard_cond_call_gc_wb(self, op, arglocs):
         self._write_barrier_fastpath(self.mc, op.getdescr(), arglocs)

From pypy.commits at gmail.com  Thu Apr  6 11:31:54 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 08:31:54 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: Try to avoid msiinttypes in
 rvmprof
Message-ID: <58e65f6a.cea3df0a.d44e6.f8c4@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r90999:750f3a3fe0c4
Date: 2017-04-06 17:31 +0200
http://bitbucket.org/pypy/pypy/changeset/750f3a3fe0c4/

Log:	Try to avoid msiinttypes in rvmprof

diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -5,8 +5,9 @@
 #define SINGLE_BUF_SIZE (8192 - 2 * sizeof(unsigned int))
 
 #ifdef VMPROF_WINDOWS
-#include "msiinttypes/inttypes.h"
-#include "msiinttypes/stdint.h"
+// #include "msiinttypes/inttypes.h"
+// #include "msiinttypes/stdint.h"
+#include <crtdefs.h>
 #else
 #include <inttypes.h>
 #include <stdint.h>

From pypy.commits at gmail.com  Thu Apr  6 11:34:01 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 06 Apr 2017 08:34:01 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: MallocCondVarsizeSlowPath
Message-ID: <58e65fe9.c60c1c0a.6bcfa.0d21@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r91000:8599c717f45c
Date: 2017-04-06 17:33 +0200
http://bitbucket.org/pypy/pypy/changeset/8599c717f45c/

Log:	MallocCondVarsizeSlowPath

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -315,7 +315,6 @@
         #
         nursery_free_adr = self.cpu.gc_ll_descr.get_nursery_free_addr()
         self._pop_all_regs_from_frame(mc, [ecx, edx], self.cpu.supports_floats)
-        mc.MOV(edx, heap(nursery_free_adr))   # load this in EDX
         self.pop_gcmap(mc)   # push_gcmap(store=True) done by the caller
         mc.RET()
         #
@@ -2542,6 +2541,26 @@
         sp.set_continue_addr(self.mc)
         self.pending_slowpaths.append(sp)
 
+    class MallocCondVarsizeSlowPath(SlowPath):
+        def generate_body(self, assembler, mc):
+            # save the gcmap
+            assembler.push_gcmap(mc, self.gcmap, store=True)
+            kind = self.kind
+            if kind == rewrite.FLAG_ARRAY:
+                mc.MOV_si(WORD, self.itemsize)
+                mc.MOV_ri(ecx.value, self.arraydescr.tid)
+                addr = assembler.malloc_slowpath_varsize
+            else:
+                if kind == rewrite.FLAG_STR:
+                    addr = assembler.malloc_slowpath_str
+                else:
+                    assert kind == rewrite.FLAG_UNICODE
+                    addr = assembler.malloc_slowpath_unicode
+            lengthloc = self.lengthloc
+            assert lengthloc is not ecx and lengthloc is not edx
+            mc.MOV(edx, lengthloc)
+            mc.CALL(imm(follow_jump(addr)))
+
     def malloc_cond_varsize(self, kind, nursery_free_adr, nursery_top_adr,
                             lengthloc, itemsize, maxlength, gcmap,
                             arraydescr):
@@ -2581,35 +2600,24 @@
         # now edx contains the total size in bytes, rounded up to a multiple
         # of WORD, plus nursery_free_adr
         self.mc.CMP(edx, heap(nursery_top_adr))
-        # PPP FIX ME
-        jna_location = self.mc.emit_forward_jump('NA')   # patched later
-        #
         self.mc.patch_forward_jump(ja_location)
-        # save the gcmap
-        self.push_gcmap(self.mc, gcmap, store=True)
-        if kind == rewrite.FLAG_ARRAY:
-            self.mc.MOV_si(WORD, itemsize)
-            self.mc.MOV(edx, lengthloc)
-            self.mc.MOV_ri(ecx.value, arraydescr.tid)
-            addr = self.malloc_slowpath_varsize
-        else:
-            if kind == rewrite.FLAG_STR:
-                addr = self.malloc_slowpath_str
-            else:
-                assert kind == rewrite.FLAG_UNICODE
-                addr = self.malloc_slowpath_unicode
-            self.mc.MOV(edx, lengthloc)
-        self.mc.CALL(imm(follow_jump(addr)))
-        jmp_location = self.mc.emit_forward_jump_uncond()  # jump to later
-        #
-        self.mc.patch_forward_jump(jna_location)
-        self.mc.force_frame_size(DEFAULT_FRAME_BYTES)
-        # write down the tid, but not if it's the result of the CALL
+        # Note: we call the slow path in condition 'A', which may be
+        # true either because the CMP just above really got that
+        # condition, or because we jumped here from ja_location before.
+        # In both cases, the jumps are forward-going and the expected
+        # common case is "not taken".
+        sp = self.MallocCondVarsizeSlowPath(self.mc, rx86.Conditions['A'])
+        sp.gcmap = gcmap
+        sp.kind = kind
+        sp.itemsize = itemsize
+        sp.lengthloc = lengthloc
+        sp.arraydescr = arraydescr
+        # some more code that is only if we *don't* call the slow
+        # path: write down the tid, and save edx into nursery_free_adr
         self.mc.MOV(mem(ecx, 0), imm(arraydescr.tid))
-        # while we're at it, this line is not needed if we've done the CALL
         self.mc.MOV(heap(nursery_free_adr), edx)
-        #
-        self.mc.patch_forward_jump(jmp_location)
+        sp.set_continue_addr(self.mc)
+        self.pending_slowpaths.append(sp)
 
     def store_force_descr(self, op, fail_locs, frame_depth):
         guard_token = self.implement_guard_recovery(op.opnum,

From pypy.commits at gmail.com  Thu Apr  6 11:46:25 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 08:46:25 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: Small progress
Message-ID: <58e662d1.47851c0a.61311.1f77@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r91001:ecba8ea23c8c
Date: 2017-04-06 17:45 +0200
http://bitbucket.org/pypy/pypy/changeset/ecba8ea23c8c/

Log:	Small progress

diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -5,8 +5,6 @@
 #define SINGLE_BUF_SIZE (8192 - 2 * sizeof(unsigned int))
 
 #ifdef VMPROF_WINDOWS
-// #include "msiinttypes/inttypes.h"
-// #include "msiinttypes/stdint.h"
 #include <crtdefs.h>
 #else
 #include <inttypes.h>
diff --git a/rpython/rlib/rvmprof/src/shared/_vmprof.h b/rpython/rlib/rvmprof/src/shared/_vmprof.h
--- a/rpython/rlib/rvmprof/src/shared/_vmprof.h
+++ b/rpython/rlib/rvmprof/src/shared/_vmprof.h
@@ -8,8 +8,9 @@
 // CPython 3.6 defines all the inttypes for us, we do not need the msiinttypes
 // library for that version or any newer!
 #if (PY_VERSION_HEX < 0x3060000)
-#include "msiinttypes/inttypes.h"
-#include "msiinttypes/stdint.h"
+#include <crtdefs.h>
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
 #endif
 
 #else

From pypy.commits at gmail.com  Thu Apr  6 12:02:27 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 09:02:27 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: Do it differently. _vmprof.h
 is not included in RPython mode.
Message-ID: <58e66693.c60c1c0a.6bcfa.16c2@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r91002:e0912f110132
Date: 2017-04-06 18:01 +0200
http://bitbucket.org/pypy/pypy/changeset/e0912f110132/

Log:	Do it differently. _vmprof.h is not included in RPython mode.

diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -6,6 +6,8 @@
 
 #ifdef VMPROF_WINDOWS
 #include <crtdefs.h>
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
 #else
 #include <inttypes.h>
 #include <stdint.h>
diff --git a/rpython/rlib/rvmprof/src/shared/_vmprof.h b/rpython/rlib/rvmprof/src/shared/_vmprof.h
--- a/rpython/rlib/rvmprof/src/shared/_vmprof.h
+++ b/rpython/rlib/rvmprof/src/shared/_vmprof.h
@@ -8,9 +8,8 @@
 // CPython 3.6 defines all the inttypes for us, we do not need the msiinttypes
 // library for that version or any newer!
 #if (PY_VERSION_HEX < 0x3060000)
-#include <crtdefs.h>
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
+#include "msiinttypes/inttypes.h"
+#include "msiinttypes/stdint.h"
 #endif
 
 #else

From pypy.commits at gmail.com  Thu Apr  6 12:43:51 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 09:43:51 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: Define and use
 HAVE_SIGACTION, HAVE_SIGALTSTACK, and fall back to signal(), 
Message-ID: <58e67047.8d4a1c0a.97890.6379@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r91003:25d257611fbf
Date: 2017-04-06 18:43 +0200
http://bitbucket.org/pypy/pypy/changeset/25d257611fbf/

Log:	Define and use HAVE_SIGACTION, HAVE_SIGALTSTACK, and fall back to
	signal(), similar to CPython's implementation.

diff --git a/pypy/module/faulthandler/faulthandler.c b/pypy/module/faulthandler/faulthandler.c
--- a/pypy/module/faulthandler/faulthandler.c
+++ b/pypy/module/faulthandler/faulthandler.c
@@ -23,8 +23,16 @@
 #define MAX_FRAME_DEPTH   100
 #define FRAME_DEPTH_N     RVMPROF_TRACEBACK_ESTIMATE_N(MAX_FRAME_DEPTH)
 
+#ifndef _WIN32
+#define HAVE_SIGACTION 1
+#define HAVE_SIGALTSTACK 1
+#endif
 
+#ifdef HAVE_SIGACTION
 typedef struct sigaction _Py_sighandler_t;
+#else
+typedef void (*_Py_sighandler_t)(int);
+#endif
 
 typedef struct {
     const int signum;
@@ -40,7 +48,9 @@
     volatile pypy_faulthandler_cb_t dump_traceback;
 } fatal_error;
 
+#ifdef HAVE_SIGALTSTACK
 static stack_t stack;
+#endif
 
 
 static fault_handler_t faulthandler_handlers[] = {
@@ -319,11 +329,16 @@
 # endif
 #endif
 
+#ifdef HAVE_SIGACTION
 static void faulthandler_user(int signum, siginfo_t *info, void *ucontext);
+#else
+static void faulthandler_user(int signum);
+#endif
 
 static int
 faulthandler_register(int signum, int chain, _Py_sighandler_t *p_previous)
 {
+#ifdef HAVE_SIGACTION
     struct sigaction action;
     action.sa_sigaction = faulthandler_user;
     sigemptyset(&action.sa_mask);
@@ -342,9 +357,20 @@
         action.sa_flags |= SA_ONSTACK;
     }
     return sigaction(signum, &action, p_previous);
+#else
+    _Py_sighandler_t previous;
+    previous = signal(signum, faulthandler_user);
+    if (p_previous != NULL)
+        *p_previous = previous;
+    return (previous == SIG_ERR);
+#endif
 }
 
+#ifdef HAVE_SIGACTION
 static void faulthandler_user(int signum, siginfo_t *info, void *ucontext)
+#else
+static void faulthandler_user(int signum)
+#endif
 {
     int save_errno;
     user_signal_t *user = &user_signals[signum];
@@ -355,6 +381,7 @@
     save_errno = errno;
     faulthandler_dump_traceback(user->fd, user->all_threads, ucontext);
 
+#ifdef HAVE_SIGACTION
     if (user->chain) {
         (void)sigaction(signum, &user->previous, NULL);
         errno = save_errno;
@@ -367,6 +394,13 @@
     }
 
     errno = save_errno;
+#else
+    if (user->chain) {
+        errno = save_errno;
+        /* call the previous signal handler */
+        user->previous(signum);
+    }
+#endif
 }
 
 RPY_EXTERN
@@ -453,7 +487,11 @@
    This function is signal-safe and should only call signal-safe functions. */
 
 static void
+#ifdef HAVE_SIGACTION
 faulthandler_fatal_error(int signum, siginfo_t *info, void *ucontext)
+#else
+faulthandler_fatal_error(int signum)
+#endif
 {
     int fd = fatal_error.fd;
     int i;
@@ -501,6 +539,7 @@
     assert(!fatal_error.enabled);
     fatal_error.dump_traceback = dump_callback;
 
+#ifdef HAVE_SIGALTSTACK
     /* Try to allocate an alternate stack for faulthandler() signal handler to
      * be able to allocate memory on the stack, even on a stack overflow. If it
      * fails, ignore the error. */
@@ -514,6 +553,7 @@
             stack.ss_sp = NULL;
         }
     }
+#endif
 
 #ifdef PYPY_FAULTHANDLER_LATER
     if (!RPyThreadLockInit(&thread_later.cancel_event) ||
@@ -550,12 +590,14 @@
 
         pypy_faulthandler_disable();
         fatal_error.initialized = 0;
+#ifdef HAVE_SIGALTSTACK
         if (stack.ss_sp) {
             stack.ss_flags = SS_DISABLE;
             sigaltstack(&stack, NULL);
             free(stack.ss_sp);
             stack.ss_sp = NULL;
         }
+#endif
     }
 }
 
diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -8,6 +8,7 @@
 #include <crtdefs.h>
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
+typedef ... ssize_t;
 #else
 #include <inttypes.h>
 #include <stdint.h>

From pypy.commits at gmail.com  Thu Apr  6 12:50:14 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 09:50:14 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: oops
Message-ID: <58e671c6.8d421c0a.8a248.27bc@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r91004:c3b6d867909e
Date: 2017-04-06 18:49 +0200
http://bitbucket.org/pypy/pypy/changeset/c3b6d867909e/

Log:	oops

diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -8,7 +8,7 @@
 #include <crtdefs.h>
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
-typedef ... ssize_t;
+typedef intptr_t ssize_t;
 #else
 #include <inttypes.h>
 #include <stdint.h>

From pypy.commits at gmail.com  Thu Apr  6 13:08:05 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 10:08:05 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: Fixes
Message-ID: <58e675f5.eb8adf0a.ee28c.1130@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r91005:dac86db0cb31
Date: 2017-04-06 19:07 +0200
http://bitbucket.org/pypy/pypy/changeset/dac86db0cb31/

Log:	Fixes

diff --git a/pypy/module/faulthandler/faulthandler.c b/pypy/module/faulthandler/faulthandler.c
--- a/pypy/module/faulthandler/faulthandler.c
+++ b/pypy/module/faulthandler/faulthandler.c
@@ -368,10 +368,12 @@
 
 #ifdef HAVE_SIGACTION
 static void faulthandler_user(int signum, siginfo_t *info, void *ucontext)
+{
 #else
 static void faulthandler_user(int signum)
+{
+    void *ucontext = NULL;
 #endif
-{
     int save_errno;
     user_signal_t *user = &user_signals[signum];
 
@@ -489,10 +491,12 @@
 static void
 #ifdef HAVE_SIGACTION
 faulthandler_fatal_error(int signum, siginfo_t *info, void *ucontext)
+{
 #else
 faulthandler_fatal_error(int signum)
+{
+    void *ucontext = NULL;
 #endif
-{
     int fd = fatal_error.fd;
     int i;
     fault_handler_t *handler = NULL;
@@ -616,7 +620,7 @@
             int err;
             struct sigaction action;
             fault_handler_t *handler = &faulthandler_handlers[i];
-
+#ifdef HAVE_SIGACTION
             action.sa_sigaction = faulthandler_fatal_error;
             sigemptyset(&action.sa_mask);
             /* Do not prevent the signal from being received from within
@@ -628,6 +632,11 @@
                 action.sa_flags |= SA_ONSTACK;
             }
             err = sigaction(handler->signum, &action, &handler->previous);
+#else
+            handler->previous = signal(handler->signum,
+                                       faulthandler_fatal_error);
+            err = (handler->previous == SIG_ERR);
+#endif
             if (err) {
                 return strerror(errno);
             }
@@ -647,7 +656,11 @@
             fault_handler_t *handler = &faulthandler_handlers[i];
             if (!handler->enabled)
                 continue;
+#ifdef HAVE_SIGACTION
             (void)sigaction(handler->signum, &handler->previous, NULL);
+#else
+            (void)signal(handler->signum, handler->previous);
+#endif
             handler->enabled = 0;
         }
     }

From pypy.commits at gmail.com  Thu Apr  6 13:17:11 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 10:17:11 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: Fix last error in this file,
 maybe
Message-ID: <58e67817.f185df0a.68eec.1bb7@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r91006:f04e9c9c9b04
Date: 2017-04-06 19:16 +0200
http://bitbucket.org/pypy/pypy/changeset/f04e9c9c9b04/

Log:	Fix last error in this file, maybe

diff --git a/pypy/module/faulthandler/faulthandler.c b/pypy/module/faulthandler/faulthandler.c
--- a/pypy/module/faulthandler/faulthandler.c
+++ b/pypy/module/faulthandler/faulthandler.c
@@ -618,9 +618,9 @@
 
         for (i = 0; i < faulthandler_nsignals; i++) {
             int err;
-            struct sigaction action;
             fault_handler_t *handler = &faulthandler_handlers[i];
 #ifdef HAVE_SIGACTION
+            struct sigaction action;
             action.sa_sigaction = faulthandler_fatal_error;
             sigemptyset(&action.sa_mask);
             /* Do not prevent the signal from being received from within

From pypy.commits at gmail.com  Thu Apr  6 13:25:07 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 10:25:07 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: Fix link errors now.
Message-ID: <58e679f3.51abdf0a.ed8c0.175c@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r91007:e6d283563e29
Date: 2017-04-06 19:24 +0200
http://bitbucket.org/pypy/pypy/changeset/e6d283563e29/

Log:	Fix link errors now.

diff --git a/pypy/module/faulthandler/faulthandler.c b/pypy/module/faulthandler/faulthandler.c
--- a/pypy/module/faulthandler/faulthandler.c
+++ b/pypy/module/faulthandler/faulthandler.c
@@ -511,7 +511,11 @@
 
     /* restore the previous handler */
     if (handler->enabled) {
+#ifdef HAVE_SIGACTION
         (void)sigaction(signum, &handler->previous, NULL);
+#else
+        (void)signal(signum, handler->previous);
+#endif
         handler->enabled = 0;
     }
 

From pypy.commits at gmail.com  Thu Apr  6 17:09:06 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 14:09:06 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: Close branch about to be
 merged.
Message-ID: <58e6ae72.08a6df0a.b63c3.5c1b@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r91009:6dc16ae25182
Date: 2017-04-06 22:51 +0200
http://bitbucket.org/pypy/pypy/changeset/6dc16ae25182/

Log:	Close branch about to be merged.


From pypy.commits at gmail.com  Thu Apr  6 17:09:08 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 14:09:08 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Fix compilation of the 'faulthandler' on
 Windows, and enable it.
Message-ID: <58e6ae74.c3a4df0a.fa877.577e@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91010:865eb91a519c
Date: 2017-04-06 22:57 +0200
http://bitbucket.org/pypy/pypy/changeset/865eb91a519c/

Log:	Fix compilation of the 'faulthandler' on Windows, and enable it.

	Most of lib-python/3/test now works correctly.

diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -72,8 +72,6 @@
 
     if "cppyy" in working_modules:
         working_modules.remove("cppyy")  # not tested on win32
-    if "faulthandler" in working_modules:
-        working_modules.remove("faulthandler")  # missing details
 
     # The _locale module is needed by site.py on Windows
     default_modules.add("_locale")
diff --git a/pypy/module/faulthandler/cintf.py b/pypy/module/faulthandler/cintf.py
--- a/pypy/module/faulthandler/cintf.py
+++ b/pypy/module/faulthandler/cintf.py
@@ -1,4 +1,5 @@
 import py
+import sys
 from rpython.rtyper.lltypesystem import lltype, llmemory, rffi, rstr
 from rpython.translator import cdir
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
@@ -8,11 +9,15 @@
 rvmp = cwd.join('../../..')
 rvmp = rvmp.join('rpython/rlib/rvmprof/src')
 
+compile_extra = ['-DRPYTHON_VMPROF']
+if sys.platform == 'win32':
+    compile_extra.append('-DVMPROF_WINDOWS')
+
 eci = ExternalCompilationInfo(
     includes=[cwd.join('faulthandler.h')],
     include_dirs=[str(cwd), cdir, rvmp],
     separate_module_files=[cwd.join('faulthandler.c')],
-    compile_extra=['-DRPYTHON_VMPROF=1'])
+    compile_extra=compile_extra)
 
 eci_later = eci.merge(ExternalCompilationInfo(
     pre_include_bits=['#define PYPY_FAULTHANDLER_LATER\n']))
diff --git a/pypy/module/faulthandler/faulthandler.c b/pypy/module/faulthandler/faulthandler.c
--- a/pypy/module/faulthandler/faulthandler.c
+++ b/pypy/module/faulthandler/faulthandler.c
@@ -5,8 +5,10 @@
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
+#ifndef _WIN32
 #include <unistd.h>
 #include <sys/resource.h>
+#endif
 #include <math.h>
 
 #ifdef RPYTHON_LL2CTYPES
@@ -21,8 +23,16 @@
 #define MAX_FRAME_DEPTH   100
 #define FRAME_DEPTH_N     RVMPROF_TRACEBACK_ESTIMATE_N(MAX_FRAME_DEPTH)
 
+#ifndef _WIN32
+#define HAVE_SIGACTION 1
+#define HAVE_SIGALTSTACK 1
+#endif
 
+#ifdef HAVE_SIGACTION
 typedef struct sigaction _Py_sighandler_t;
+#else
+typedef void (*_Py_sighandler_t)(int);
+#endif
 
 typedef struct {
     const int signum;
@@ -38,7 +48,9 @@
     volatile pypy_faulthandler_cb_t dump_traceback;
 } fatal_error;
 
+#ifdef HAVE_SIGALTSTACK
 static stack_t stack;
+#endif
 
 
 static fault_handler_t faulthandler_handlers[] = {
@@ -317,11 +329,16 @@
 # endif
 #endif
 
+#ifdef HAVE_SIGACTION
 static void faulthandler_user(int signum, siginfo_t *info, void *ucontext);
+#else
+static void faulthandler_user(int signum);
+#endif
 
 static int
 faulthandler_register(int signum, int chain, _Py_sighandler_t *p_previous)
 {
+#ifdef HAVE_SIGACTION
     struct sigaction action;
     action.sa_sigaction = faulthandler_user;
     sigemptyset(&action.sa_mask);
@@ -340,10 +357,23 @@
         action.sa_flags |= SA_ONSTACK;
     }
     return sigaction(signum, &action, p_previous);
+#else
+    _Py_sighandler_t previous;
+    previous = signal(signum, faulthandler_user);
+    if (p_previous != NULL)
+        *p_previous = previous;
+    return (previous == SIG_ERR);
+#endif
 }
 
+#ifdef HAVE_SIGACTION
 static void faulthandler_user(int signum, siginfo_t *info, void *ucontext)
 {
+#else
+static void faulthandler_user(int signum)
+{
+    void *ucontext = NULL;
+#endif
     int save_errno;
     user_signal_t *user = &user_signals[signum];
 
@@ -353,6 +383,7 @@
     save_errno = errno;
     faulthandler_dump_traceback(user->fd, user->all_threads, ucontext);
 
+#ifdef HAVE_SIGACTION
     if (user->chain) {
         (void)sigaction(signum, &user->previous, NULL);
         errno = save_errno;
@@ -365,6 +396,13 @@
     }
 
     errno = save_errno;
+#else
+    if (user->chain) {
+        errno = save_errno;
+        /* call the previous signal handler */
+        user->previous(signum);
+    }
+#endif
 }
 
 RPY_EXTERN
@@ -451,8 +489,14 @@
    This function is signal-safe and should only call signal-safe functions. */
 
 static void
+#ifdef HAVE_SIGACTION
 faulthandler_fatal_error(int signum, siginfo_t *info, void *ucontext)
 {
+#else
+faulthandler_fatal_error(int signum)
+{
+    void *ucontext = NULL;
+#endif
     int fd = fatal_error.fd;
     int i;
     fault_handler_t *handler = NULL;
@@ -467,7 +511,11 @@
 
     /* restore the previous handler */
     if (handler->enabled) {
+#ifdef HAVE_SIGACTION
         (void)sigaction(signum, &handler->previous, NULL);
+#else
+        (void)signal(signum, handler->previous);
+#endif
         handler->enabled = 0;
     }
 
@@ -478,7 +526,7 @@
     faulthandler_dump_traceback(fd, fatal_error.all_threads, ucontext);
 
     errno = save_errno;
-#ifdef MS_WINDOWS
+#ifdef _WIN32
     if (signum == SIGSEGV) {
         /* don't explicitly call the previous handler for SIGSEGV in this signal
            handler, because the Windows signal handler would not be called */
@@ -499,6 +547,7 @@
     assert(!fatal_error.enabled);
     fatal_error.dump_traceback = dump_callback;
 
+#ifdef HAVE_SIGALTSTACK
     /* Try to allocate an alternate stack for faulthandler() signal handler to
      * be able to allocate memory on the stack, even on a stack overflow. If it
      * fails, ignore the error. */
@@ -512,6 +561,7 @@
             stack.ss_sp = NULL;
         }
     }
+#endif
 
 #ifdef PYPY_FAULTHANDLER_LATER
     if (!RPyThreadLockInit(&thread_later.cancel_event) ||
@@ -548,12 +598,14 @@
 
         pypy_faulthandler_disable();
         fatal_error.initialized = 0;
+#ifdef HAVE_SIGALTSTACK
         if (stack.ss_sp) {
             stack.ss_flags = SS_DISABLE;
             sigaltstack(&stack, NULL);
             free(stack.ss_sp);
             stack.ss_sp = NULL;
         }
+#endif
     }
 }
 
@@ -570,9 +622,9 @@
 
         for (i = 0; i < faulthandler_nsignals; i++) {
             int err;
+            fault_handler_t *handler = &faulthandler_handlers[i];
+#ifdef HAVE_SIGACTION
             struct sigaction action;
-            fault_handler_t *handler = &faulthandler_handlers[i];
-
             action.sa_sigaction = faulthandler_fatal_error;
             sigemptyset(&action.sa_mask);
             /* Do not prevent the signal from being received from within
@@ -584,6 +636,11 @@
                 action.sa_flags |= SA_ONSTACK;
             }
             err = sigaction(handler->signum, &action, &handler->previous);
+#else
+            handler->previous = signal(handler->signum,
+                                       faulthandler_fatal_error);
+            err = (handler->previous == SIG_ERR);
+#endif
             if (err) {
                 return strerror(errno);
             }
@@ -603,7 +660,11 @@
             fault_handler_t *handler = &faulthandler_handlers[i];
             if (!handler->enabled)
                 continue;
+#ifdef HAVE_SIGACTION
             (void)sigaction(handler->signum, &handler->previous, NULL);
+#else
+            (void)signal(handler->signum, handler->previous);
+#endif
             handler->enabled = 0;
         }
     }
@@ -625,7 +686,7 @@
 static void
 faulthandler_suppress_crash_report(void)
 {
-#ifdef MS_WINDOWS
+#ifdef _WIN32
     UINT mode;
 
     /* Configure Windows to not display the Windows Error Reporting dialog */
@@ -633,7 +694,7 @@
     SetErrorMode(mode | SEM_NOGPFAULTERRORBOX);
 #endif
 
-#ifndef MS_WINDOWS
+#ifndef _WIN32
     struct rlimit rl;
 
     /* Disable creation of core dump */
@@ -664,7 +725,7 @@
 void pypy_faulthandler_sigsegv(void)
 {
     faulthandler_suppress_crash_report();
-#if defined(MS_WINDOWS)
+#ifdef _WIN32
     /* For SIGSEGV, faulthandler_fatal_error() restores the previous signal
        handler and then gives back the execution flow to the program (without
        explicitly calling the previous error handler). In a normal case, the
diff --git a/pypy/module/faulthandler/faulthandler.h b/pypy/module/faulthandler/faulthandler.h
--- a/pypy/module/faulthandler/faulthandler.h
+++ b/pypy/module/faulthandler/faulthandler.h
@@ -2,7 +2,11 @@
 #define PYPY_FAULTHANDLER_H
 
 #include "src/precommondefs.h"
+#ifdef _MSC_VER
+#include <crtdefs.h>
+#else
 #include <stdint.h>
+#endif
 
 
 typedef void (*pypy_faulthandler_cb_t)(int fd, intptr_t *array_p,
diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -5,8 +5,10 @@
 #define SINGLE_BUF_SIZE (8192 - 2 * sizeof(unsigned int))
 
 #ifdef VMPROF_WINDOWS
-#include "msiinttypes/inttypes.h"
-#include "msiinttypes/stdint.h"
+#include <crtdefs.h>
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+typedef intptr_t ssize_t;
 #else
 #include <inttypes.h>
 #include <stdint.h>

From pypy.commits at gmail.com  Thu Apr  6 17:09:04 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 14:09:04 -0700 (PDT)
Subject: [pypy-commit] pypy win32-faulthandler: hg backout 832db07f1970
Message-ID: <58e6ae70.5886df0a.7c03d.5c87@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: win32-faulthandler
Changeset: r91008:8a26b88f227a
Date: 2017-04-06 22:47 +0200
http://bitbucket.org/pypy/pypy/changeset/8a26b88f227a/

Log:	hg backout 832db07f1970

diff --git a/pypy/testrunner_cfg.py b/pypy/testrunner_cfg.py
--- a/pypy/testrunner_cfg.py
+++ b/pypy/testrunner_cfg.py
@@ -9,7 +9,11 @@
 ]
 
 def collect_one_testdir(testdirs, reldir, tests):
-    if reldir.startswith('module/faulthandler'):
+    for dir in DIRS_SPLIT:
+        if reldir.startswith(dir):
+            testdirs.extend(tests)
+            break
+    else:
         testdirs.append(reldir)
 
 

From pypy.commits at gmail.com  Thu Apr  6 17:09:11 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 14:09:11 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: hg merge heads
Message-ID: <58e6ae77.7896df0a.8734b.5fd8@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91012:08e002eab7ec
Date: 2017-04-06 23:08 +0200
http://bitbucket.org/pypy/pypy/changeset/08e002eab7ec/

Log:	hg merge heads

diff --git a/lib-python/3/test/_test_multiprocessing.py b/lib-python/3/test/_test_multiprocessing.py
--- a/lib-python/3/test/_test_multiprocessing.py
+++ b/lib-python/3/test/_test_multiprocessing.py
@@ -2147,7 +2147,8 @@
 
         # Because we are using xmlrpclib for serialization instead of
         # pickle this will cause a serialization error.
-        self.assertRaises(Exception, queue.put, time.sleep)
+        # Changed on PyPy: passing functions to xmlrpc is broken
+        #self.assertRaises(Exception, queue.put, time.sleep)
 
         # Make queue finalizer run before the server is stopped
         del queue
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -597,7 +597,7 @@
                     py.test.skip("%s module not included in %s" % (mod,
                                                                    execpath))
 
-            cmd = "%s %s %s" % (execpath, regrrun, fspath.purebasename)
+            cmd = "%s -m test -v %s" % (execpath, fspath.purebasename)
             # add watchdog for timing out
             cmd = "%s %s %s %s" % (python, watchdog_script, TIMEOUT, cmd)
         else:
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -5,6 +5,10 @@
 .. this is the revision after release-pypy3.3-5.7.x was branched
 .. startrev: afbf09453369
 
+.. branch: mtest
+Use "<python> -m test" to run the CPython test suite, as documented by CPython,
+instead of our outdated regrverbose.py script.
+
 .. branch: win32-faulthandler
 
 Enable the 'faulthandler' module on Windows;

From pypy.commits at gmail.com  Thu Apr  6 17:09:10 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 14:09:10 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Document merged branches
Message-ID: <58e6ae76.c3a4df0a.fa877.577f@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91011:0710ee3e66e6
Date: 2017-04-06 23:04 +0200
http://bitbucket.org/pypy/pypy/changeset/0710ee3e66e6/

Log:	Document merged branches

diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -5,3 +5,12 @@
 .. this is the revision after release-pypy3.3-5.7.x was branched
 .. startrev: afbf09453369
 
+.. branch: win32-faulthandler
+
+Enable the 'faulthandler' module on Windows;
+this unblocks the Python test suite.
+
+.. branch: superjumbo
+
+Implement posix.posix_fallocate() and posix.posix_fadvise()
+

From pypy.commits at gmail.com  Thu Apr  6 18:10:09 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Thu, 06 Apr 2017 15:10:09 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Don't hardcode 'python32.lib',
 use sys.version instead.
Message-ID: <58e6bcc1.16acdf0a.f0e6f.1ed9@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91013:2d2290c10270
Date: 2017-04-06 23:54 +0200
http://bitbucket.org/pypy/pypy/changeset/2d2290c10270/

Log:	Don't hardcode 'python32.lib', use sys.version instead.

diff --git a/lib_pypy/_pypy_testcapi.py b/lib_pypy/_pypy_testcapi.py
--- a/lib_pypy/_pypy_testcapi.py
+++ b/lib_pypy/_pypy_testcapi.py
@@ -61,13 +61,12 @@
     # set link options
     output_filename = modulename + _get_c_extension_suffix()
     if sys.platform == 'win32':
-        # XXX pyconfig.h uses a pragma to link to the import library,
-        #     which is currently python3.lib
-        library = os.path.join(thisdir, '..', 'libs', 'python32')
+        libname = 'python{0[0]}{0[1]}'.format(sys.version_info)
+        library = os.path.join(thisdir, '..', 'lib', libname)
         if not os.path.exists(library + '.lib'):
             # For a local translation or nightly build
-            library = os.path.join(thisdir, '..', 'pypy', 'goal', 'python32')
-        assert os.path.exists(library + '.lib'),'Could not find import library "%s"' % library
+            library = os.path.join(thisdir, '..', 'pypy', 'goal', libname)
+        assert os.path.exists(library + '.lib'), 'Could not find import library "%s"' % library
         libraries = [library, 'oleaut32']
         extra_ldargs = ['/MANIFEST',  # needed for VC10
                         '/EXPORT:PyInit_' + modulename]

From pypy.commits at gmail.com  Thu Apr  6 20:03:57 2017
From: pypy.commits at gmail.com (antocuni)
Date: Thu, 06 Apr 2017 17:03:57 -0700 (PDT)
Subject: [pypy-commit] extradoc extradoc: final tweaks
Message-ID: <58e6d76d.c70a1c0a.60c23.926e@mx.google.com>

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: extradoc
Changeset: r5799:f6e2cae28ab9
Date: 2017-04-07 01:50 +0200
http://bitbucket.org/pypy/extradoc/changeset/f6e2cae28ab9/

Log:	final tweaks

diff --git a/talk/pycon-italy-2017/talk.rst b/talk/pycon-italy-2017/talk.rst
--- a/talk/pycon-italy-2017/talk.rst
+++ b/talk/pycon-italy-2017/talk.rst
@@ -61,8 +61,8 @@
    :align: left
 
 
-- High frequency trading of sport bets
-
+- High frequency trading platform for sports bets
+  
   * low latency is a must
 
 - PyPy used in production since 2012
@@ -145,6 +145,11 @@
 
 - Use CFFI if possible
 
+demo
+----
+
+live demo time :)
+  
 numpy
 -----
 
@@ -233,6 +238,41 @@
 - What about Python 3? |ok|
 
 - **Bonus topic: vmprof**
+
+VMProf
+------
+
+- Statistical profiler
+
+- Low overhead (~5%)
+
+- For CPython and PyPy
+
+- Distinguish between:
+
+  - Interpreter
+
+  - Native code
+
+  - JIT (PyPy only)
+
+  - GC (PyPy only)
+
+    
+VMProf example
+--------------
+
+::
+
+   $ python -m vmprof --web foobar.py
+
+   $ pypy -m vmprof --web foobar.py
+
+
+..
+    CPython: http://vmprof.com/#/f7c45f78-fcb0-4c31-8fb5-d53546b94c09
+
+    PyPy: http://vmprof.com/#/7d25c9ab-aeb8-495f-9e69-54bd2e242745
   
 ..
    Topics

From pypy.commits at gmail.com  Fri Apr  7 07:25:56 2017
From: pypy.commits at gmail.com (arigo)
Date: Fri, 07 Apr 2017 04:25:56 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: Fix WriteBarrierSlowPath. Add
 ReacqGilSlowPath.
Message-ID: <58e77744.8a891c0a.106e7.2e0f@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r91014:a47cbc896847
Date: 2017-04-07 13:24 +0200
http://bitbucket.org/pypy/pypy/changeset/a47cbc896847/

Log:	Fix WriteBarrierSlowPath. Add ReacqGilSlowPath.

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -41,33 +41,6 @@
 from rpython.rlib.objectmodel import compute_unique_id
 
 
-class SlowPath(object):
-    def __init__(self, mc, condition):
-        mc.J_il(condition, 0xfffff)     # patched later
-        self.cond_jump_addr = mc.get_relative_pos(break_basic_block=False)
-        self.saved_scratch_value_1 = mc.get_scratch_register_known_value()
-
-    def set_continue_addr(self, mc):
-        self.continue_addr = mc.get_relative_pos(break_basic_block=False)
-        self.saved_scratch_value_2 = mc.get_scratch_register_known_value()
-
-    def generate(self, assembler, mc):
-        # no alignment here, prefer compactness for these slow-paths.
-        # patch the original jump to go here
-        offset = mc.get_relative_pos() - self.cond_jump_addr
-        mc.overwrite32(self.cond_jump_addr-4, offset)
-        # restore the knowledge of the scratch register value
-        # (this does not emit any code)
-        mc.restore_scratch_register_known_value(self.saved_scratch_value_1)
-        # generate the body of the slow-path
-        self.generate_body(assembler, mc)
-        # reload (if needed) the (possibly different) scratch register value
-        mc.load_scratch_if_known(self.saved_scratch_value_2)
-        # jump back
-        curpos = mc.get_relative_pos() + 5
-        mc.JMP_l(self.continue_addr - curpos)
-
-
 class Assembler386(BaseAssembler, VectorAssemblerMixin):
     _regalloc = None
     _output_loop_log = None
@@ -865,7 +838,7 @@
         for ofs in self.frame_depth_to_patch:
             self._patch_frame_depth(ofs + rawstart, framedepth)
 
-    class IncreaseStackSlowPath(SlowPath):
+    class IncreaseStackSlowPath(codebuf.SlowPath):
         def generate_body(self, assembler, mc):
             mc.MOV_si(WORD, 0xffffff)     # force writing 32 bit
             ofs2 = mc.get_relative_pos(break_basic_block=False) - 4
@@ -1033,7 +1006,7 @@
         if gcrootmap and gcrootmap.is_shadow_stack:
             self._call_header_shadowstack(gcrootmap)
 
-    class StackCheckSlowPath(SlowPath):
+    class StackCheckSlowPath(codebuf.SlowPath):
         def generate_body(self, assembler, mc):
             mc.CALL(imm(assembler.stack_check_slowpath))
 
@@ -2291,8 +2264,9 @@
 
     # ------------------- END CALL ASSEMBLER -----------------------
 
-    class WriteBarrierSlowPath(SlowPath):
+    class WriteBarrierSlowPath(codebuf.SlowPath):
         def generate_body(self, assembler, mc):
+            mc.force_frame_size(DEFAULT_FRAME_BYTES)
             # for cond_call_gc_wb_array, also add another fast path:
             # if GCFLAG_CARDS_SET, then we can just set one bit and be done
             card_marking = (self.loc_index is not None)
@@ -2312,6 +2286,8 @@
             elif (assembler._regalloc is not None and
                   assembler._regalloc.xrm.reg_bindings):
                 helper_num += 2
+            descr = self.descr
+            loc_base = self.loc_base
             if assembler.wb_slowpath[helper_num] == 0:    # tests only
                 assert not we_are_translated()
                 assembler.cpu.gc_ll_descr.write_barrier_descr = descr
@@ -2404,8 +2380,10 @@
             loc = addr_add_const(loc_base, descr.jit_wb_if_flag_byteofs)
         mc.TEST8(loc, imm(mask))
         sp = self.WriteBarrierSlowPath(mc, rx86.Conditions['NZ'])
+        sp.loc_base = loc_base
         sp.loc_index = loc_index
         sp.is_frame = is_frame
+        sp.descr = descr
         sp.set_continue_addr(mc)
         self.pending_slowpaths.append(sp)
 
@@ -2438,7 +2416,7 @@
     def label(self):
         self._check_frame_depth_debug(self.mc)
 
-    class CondCallSlowPath(SlowPath):
+    class CondCallSlowPath(codebuf.SlowPath):
         guard_token_no_exception = None
 
         def generate_body(self, assembler, mc):
@@ -2508,7 +2486,7 @@
         sp.resloc = resloc
         self.pending_slowpaths.append(sp)
 
-    class MallocCondSlowPath(SlowPath):
+    class MallocCondSlowPath(codebuf.SlowPath):
         def generate_body(self, assembler, mc):
             assembler.push_gcmap(mc, self.gcmap, store=True)
             mc.CALL(imm(follow_jump(assembler.malloc_slowpath)))
@@ -2541,7 +2519,7 @@
         sp.set_continue_addr(self.mc)
         self.pending_slowpaths.append(sp)
 
-    class MallocCondVarsizeSlowPath(SlowPath):
+    class MallocCondVarsizeSlowPath(codebuf.SlowPath):
         def generate_body(self, assembler, mc):
             # save the gcmap
             assembler.push_gcmap(mc, self.gcmap, store=True)
diff --git a/rpython/jit/backend/x86/callbuilder.py b/rpython/jit/backend/x86/callbuilder.py
--- a/rpython/jit/backend/x86/callbuilder.py
+++ b/rpython/jit/backend/x86/callbuilder.py
@@ -11,6 +11,7 @@
     r12, r13, r14, r15, X86_64_SCRATCH_REG, X86_64_XMM_SCRATCH_REG,
     RegLoc, RawEspLoc, RawEbpLoc, imm, ImmedLoc)
 from rpython.jit.backend.x86.jump import remap_frame_layout
+from rpython.jit.backend.x86 import codebuf
 from rpython.jit.backend.llsupport.callbuilder import AbstractCallBuilder
 from rpython.jit.backend.llsupport import llerrno
 from rpython.rtyper.lltypesystem import llmemory, rffi
@@ -293,6 +294,41 @@
             tlofsreg = self.get_tlofs_reg()    # => esi (possibly reused)
             mc.MOV32_mr((tlofsreg.value, lasterror), eax.value)
 
+    class ReacqGilSlowPath(codebuf.SlowPath):
+        early_jump_addr = 0
+
+        def generate_body(self, assembler, mc):
+            if self.early_jump_addr != 0:
+                # This slow-path has two entry points, with two
+                # conditional jumps.  We can jump to the regular start
+                # of this slow-path with the 2nd conditional jump.  Or,
+                # we can jump past the "MOV(heap(fastgil), ecx)"
+                # instruction from the 1st conditional jump.
+                # This instruction reverts the rpy_fastgil acquired
+                # previously, so that the general 'reacqgil_addr'
+                # function can acquire it again.  It must only be done
+                # if we actually succeeded in acquiring rpy_fastgil.
+                from rpython.jit.backend.x86.assembler import heap
+                mc.MOV(heap(self.fastgil), ecx)
+                offset = mc.get_relative_pos() - self.early_jump_addr
+                mc.overwrite32(self.early_jump_addr-4, offset)
+                # scratch register forgotten here, by get_relative_pos()
+
+            # call the reacqgil() function
+            cb = self.callbuilder
+            if not cb.result_value_saved_early:
+                cb.save_result_value(save_edx=False)
+            if assembler._is_asmgcc():
+                if IS_X86_32:
+                    css_value = edx
+                    old_value = ecx
+                    mc.MOV_sr(4, old_value.value)
+                    mc.MOV_sr(0, css_value.value)
+                # on X86_64, they are already in the right registers
+            mc.CALL(imm(follow_jump(assembler.reacqgil_addr)))
+            if not cb.result_value_saved_early:
+                cb.restore_result_value(save_edx=False)
+
     def move_real_result_and_call_reacqgil_addr(self, fastgil):
         from rpython.jit.backend.x86 import rx86
         #
@@ -314,8 +350,8 @@
                     if not self.result_value_saved_early:
                         mc.MOV_sr(12, edx.value)
                         restore_edx = True
-                css_value = edx
-                old_value = ecx
+                css_value = edx    # note: duplicated in ReacqGilSlowPath
+                old_value = ecx    #
             elif IS_X86_64:
                 css_value = edi
                 old_value = esi
@@ -341,36 +377,25 @@
             # thread.  So here we check if the shadowstack pointer
             # is still the same as before we released the GIL (saved
             # in 'ebx'), and if not, we fall back to 'reacqgil_addr'.
-            jne_location = mc.emit_forward_jump('NE')
+            mc.J_il(rx86.Conditions['NE'], 0xfffff)     # patched later
+            early_jump_addr = mc.get_relative_pos(break_basic_block=False)
+            # ^^^ this jump will go to almost the same place as the
+            # ReacqGilSlowPath() computes, but one instruction farther,
+            # i.e. just after the "MOV(heap(fastgil), ecx)".
+
             # here, ecx (=old_value) is zero (so rpy_fastgil was in 'released'
             # state before the XCHG, but the XCHG acquired it by writing 1)
             rst = gcrootmap.get_root_stack_top_addr()
             mc = self.mc
             mc.CMP(ebx, heap(rst))
-            # PPP FIX ME
-            je_location = mc.emit_forward_jump('E')
-            # revert the rpy_fastgil acquired above, so that the
-            # general 'reacqgil_addr' below can acquire it again...
-            mc.MOV(heap(fastgil), ecx)
-            # patch the JNE above
-            mc.patch_forward_jump(jne_location)
+            sp = self.ReacqGilSlowPath(mc, rx86.Conditions['NE'])
+            sp.early_jump_addr = early_jump_addr
+            sp.fastgil = fastgil
         else:
-            je_location = mc.emit_forward_jump('E')
-        #
-        # Yes, we need to call the reacqgil() function
-        if not self.result_value_saved_early:
-            self.save_result_value(save_edx=False)
-        if self.asm._is_asmgcc():
-            if IS_X86_32:
-                mc.MOV_sr(4, old_value.value)
-                mc.MOV_sr(0, css_value.value)
-            # on X86_64, they are already in the right registers
-        mc.CALL(imm(follow_jump(self.asm.reacqgil_addr)))
-        if not self.result_value_saved_early:
-            self.restore_result_value(save_edx=False)
-        #
-        # patch the JE above
-        mc.patch_forward_jump(je_location)
+            sp = self.ReacqGilSlowPath(mc, rx86.Conditions['NE'])
+        sp.callbuilder = self
+        sp.set_continue_addr(mc)
+        self.asm.pending_slowpaths.append(sp)
         #
         if restore_edx:
             mc.MOV_rs(edx.value, 12)   # restore this
diff --git a/rpython/jit/backend/x86/codebuf.py b/rpython/jit/backend/x86/codebuf.py
--- a/rpython/jit/backend/x86/codebuf.py
+++ b/rpython/jit/backend/x86/codebuf.py
@@ -81,3 +81,30 @@
         if break_basic_block:
             self.forget_scratch_register()
         return BlockBuilderMixin.get_relative_pos(self)
+
+
+class SlowPath(object):
+    def __init__(self, mc, condition):
+        mc.J_il(condition, 0xfffff)     # patched later
+        self.cond_jump_addr = mc.get_relative_pos(break_basic_block=False)
+        self.saved_scratch_value_1 = mc.get_scratch_register_known_value()
+
+    def set_continue_addr(self, mc):
+        self.continue_addr = mc.get_relative_pos(break_basic_block=False)
+        self.saved_scratch_value_2 = mc.get_scratch_register_known_value()
+
+    def generate(self, assembler, mc):
+        # no alignment here, prefer compactness for these slow-paths.
+        # patch the original jump to go here
+        offset = mc.get_relative_pos() - self.cond_jump_addr
+        mc.overwrite32(self.cond_jump_addr-4, offset)
+        # restore the knowledge of the scratch register value
+        # (this does not emit any code)
+        mc.restore_scratch_register_known_value(self.saved_scratch_value_1)
+        # generate the body of the slow-path
+        self.generate_body(assembler, mc)
+        # reload (if needed) the (possibly different) scratch register value
+        mc.load_scratch_if_known(self.saved_scratch_value_2)
+        # jump back
+        curpos = mc.get_relative_pos() + 5
+        mc.JMP_l(self.continue_addr - curpos)

From pypy.commits at gmail.com  Fri Apr  7 08:55:38 2017
From: pypy.commits at gmail.com (arigo)
Date: Fri, 07 Apr 2017 05:55:38 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: Fix: can't use
 assembler._regalloc: the current state of the register
Message-ID: <58e78c4a.0a88df0a.2b3b3.34e1@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r91015:b3337c98a745
Date: 2017-04-07 14:54 +0200
http://bitbucket.org/pypy/pypy/changeset/b3337c98a745/

Log:	Fix: can't use assembler._regalloc: the current state of the
	register allocation is different (actually None)!

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -2280,25 +2280,15 @@
             # Write only a CALL to the helper prepared in advance, passing it as
             # argument the address of the structure we are writing into
             # (the first argument to COND_CALL_GC_WB).
-            helper_num = card_marking
-            if self.is_frame:
-                helper_num = 4
-            elif (assembler._regalloc is not None and
-                  assembler._regalloc.xrm.reg_bindings):
-                helper_num += 2
+            helper_num = self.helper_num
+            is_frame = (helper_num == 4)
             descr = self.descr
             loc_base = self.loc_base
-            if assembler.wb_slowpath[helper_num] == 0:    # tests only
-                assert not we_are_translated()
-                assembler.cpu.gc_ll_descr.write_barrier_descr = descr
-                assembler._build_wb_slowpath(card_marking,
-                                    bool(assembler._regalloc.xrm.reg_bindings))
-                assert assembler.wb_slowpath[helper_num] != 0
             #
-            if not self.is_frame:
+            if not is_frame:
                 mc.PUSH(loc_base)
             mc.CALL(imm(assembler.wb_slowpath[helper_num]))
-            if not self.is_frame:
+            if not is_frame:
                 mc.stack_frame_size_delta(-WORD)
 
             if card_marking:
@@ -2362,6 +2352,7 @@
             cls = self.cpu.gc_ll_descr.has_write_barrier_class()
             assert cls is not None and isinstance(descr, cls)
         #
+        card_marking = False
         loc_index = None
         mask = descr.jit_wb_if_flag_singlebyte
         if array and descr.jit_wb_cards_set != 0:
@@ -2369,6 +2360,7 @@
             assert (descr.jit_wb_cards_set_byteofs ==
                     descr.jit_wb_if_flag_byteofs)
             assert descr.jit_wb_cards_set_singlebyte == -0x80
+            card_marking = True
             loc_index = arglocs[1]
             mask = descr.jit_wb_if_flag_singlebyte | -0x80
         #
@@ -2378,11 +2370,24 @@
             loc = raw_stack(descr.jit_wb_if_flag_byteofs)
         else:
             loc = addr_add_const(loc_base, descr.jit_wb_if_flag_byteofs)
+        #
+        helper_num = card_marking
+        if is_frame:
+            helper_num = 4
+        elif self._regalloc is not None and self._regalloc.xrm.reg_bindings:
+            helper_num += 2
+        if self.wb_slowpath[helper_num] == 0:    # tests only
+            assert not we_are_translated()
+            self.cpu.gc_ll_descr.write_barrier_descr = descr
+            self._build_wb_slowpath(card_marking,
+                                    bool(self._regalloc.xrm.reg_bindings))
+            assert self.wb_slowpath[helper_num] != 0
+        #
         mc.TEST8(loc, imm(mask))
         sp = self.WriteBarrierSlowPath(mc, rx86.Conditions['NZ'])
         sp.loc_base = loc_base
         sp.loc_index = loc_index
-        sp.is_frame = is_frame
+        sp.helper_num = helper_num
         sp.descr = descr
         sp.set_continue_addr(mc)
         self.pending_slowpaths.append(sp)
@@ -2425,7 +2430,7 @@
             # first save away the 4 registers from
             # 'cond_call_register_arguments' plus the register 'eax'
             base_ofs = assembler.cpu.get_baseofs_of_frame_field()
-            should_be_saved = assembler._regalloc.rm.reg_bindings.values()
+            should_be_saved = self.should_be_saved
             restore_eax = False
             for gpr in cond_call_register_arguments + [eax]:
                 if gpr not in should_be_saved or gpr is self.resloc:
@@ -2447,17 +2452,7 @@
             #
             # figure out which variant of cond_call_slowpath to call,
             # and call it
-            callee_only = False
-            floats = False
-            if assembler._regalloc is not None:
-                for reg in assembler._regalloc.rm.reg_bindings.values():
-                    if reg not in assembler._regalloc.rm.save_around_call_regs:
-                        break
-                else:
-                    callee_only = True
-                if assembler._regalloc.xrm.reg_bindings:
-                    floats = True
-            cond_call_adr = assembler.cond_call_slowpath[floats*2 + callee_only]
+            cond_call_adr = assembler.cond_call_slowpath[self.variant_num]
             mc.CALL(imm(follow_jump(cond_call_adr)))
             # if this is a COND_CALL_VALUE, we need to move the result in place
             resloc = self.resloc
@@ -2484,6 +2479,20 @@
         sp.imm_func = imm_func
         sp.arglocs = arglocs
         sp.resloc = resloc
+        sp.should_be_saved = self._regalloc.rm.reg_bindings.values()
+        #
+        callee_only = False
+        floats = False
+        if self._regalloc is not None:
+            for reg in self._regalloc.rm.reg_bindings.values():
+                if reg not in self._regalloc.rm.save_around_call_regs:
+                    break
+            else:
+                callee_only = True
+            if self._regalloc.xrm.reg_bindings:
+                floats = True
+        sp.variant_num = floats * 2 + callee_only
+        #
         self.pending_slowpaths.append(sp)
 
     class MallocCondSlowPath(codebuf.SlowPath):

From pypy.commits at gmail.com  Fri Apr  7 10:14:15 2017
From: pypy.commits at gmail.com (arigo)
Date: Fri, 07 Apr 2017 07:14:15 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: fix test
Message-ID: <58e79eb7.8f8bdf0a.fc4f4.4ac6@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r91016:1af5108d7af4
Date: 2017-04-07 16:13 +0200
http://bitbucket.org/pypy/pypy/changeset/1af5108d7af4/

Log:	fix test

diff --git a/rpython/jit/backend/x86/test/test_runner.py b/rpython/jit/backend/x86/test/test_runner.py
--- a/rpython/jit/backend/x86/test/test_runner.py
+++ b/rpython/jit/backend/x86/test/test_runner.py
@@ -39,7 +39,7 @@
                                  'nop; '    # for the label
                                  'add; test; je; jmp;')   # plus some padding
         bridge_loop_instructions = (
-            'cmp; jge; mov;( movabs;| lea;)? mov; (mov|movabs|lea); call; mov(abs)?; jmp;')
+            'cmp; jl; mov(abs)?; jmp;')
 
     def get_cpu(self):
         cpu = CPU(rtyper=None, stats=FakeStats())

From pypy.commits at gmail.com  Fri Apr  7 10:35:30 2017
From: pypy.commits at gmail.com (arigo)
Date: Fri, 07 Apr 2017 07:35:30 -0700 (PDT)
Subject: [pypy-commit] pypy default: document branch-prediction
Message-ID: <58e7a3b2.968adf0a.2c48e.569d@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91019:545406083429
Date: 2017-04-07 16:34 +0200
http://bitbucket.org/pypy/pypy/changeset/545406083429/

Log:	document branch-prediction

diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -23,3 +23,8 @@
 PyPy support to profile native frames in vmprof.
 
 .. branch: reusing-r11
+.. branch: branch-prediction
+
+Performance tweaks in the x86 JIT-generated machine code: rarely taken
+blocks are moved off-line.  Also, the temporary register used to contain
+large constants is reused across instructions.

From pypy.commits at gmail.com  Fri Apr  7 10:35:26 2017
From: pypy.commits at gmail.com (arigo)
Date: Fri, 07 Apr 2017 07:35:26 -0700 (PDT)
Subject: [pypy-commit] pypy branch-prediction: Close branch, ready to merge
Message-ID: <58e7a3ae.45921c0a.aee20.6d44@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: branch-prediction
Changeset: r91017:46e70fda3f39
Date: 2017-04-07 16:30 +0200
http://bitbucket.org/pypy/pypy/changeset/46e70fda3f39/

Log:	Close branch, ready to merge


From pypy.commits at gmail.com  Fri Apr  7 10:35:28 2017
From: pypy.commits at gmail.com (arigo)
Date: Fri, 07 Apr 2017 07:35:28 -0700 (PDT)
Subject: [pypy-commit] pypy default: hg merge branch-prediction
Message-ID: <58e7a3b0.422e1c0a.fa01.6e10@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91018:16bac2ad5e92
Date: 2017-04-07 16:33 +0200
http://bitbucket.org/pypy/pypy/changeset/16bac2ad5e92/

Log:	hg merge branch-prediction

	Help the branch predictor on x86 CPUs. Our JIT-generated machine
	code is a single long basic block, and now it contains only forward
	conditional jumps that are rarely taken. It is better than
	previously, where a subset of the forward conditional jumps were
	over slow-path code and so expected to be usually taken. Now these
	blocks of slow-path code are put off-line after the main block.

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -76,6 +76,7 @@
         BaseAssembler.setup(self, looptoken)
         assert self.memcpy_addr != 0, "setup_once() not called?"
         self.current_clt = looptoken.compiled_loop_token
+        self.pending_slowpaths = []
         self.pending_guard_tokens = []
         if WORD == 8:
             self.pending_memoryerror_trampoline_from = []
@@ -95,6 +96,7 @@
             self.pending_memoryerror_trampoline_from = None
         self.mc = None
         self.current_clt = None
+        self.frame_depth_to_patch = None
 
     def _build_float_constants(self):
         # 0x80000000000000008000000000000000
@@ -181,6 +183,7 @@
         """ This builds a general call slowpath, for whatever call happens to
         come.
         """
+        self.pending_slowpaths = []
         mc = codebuf.MachineCodeBlockWrapper()
         # copy registers to the frame, with the exception of the
         # 'cond_call_register_arguments' and eax, because these have already
@@ -211,6 +214,7 @@
         self.pop_gcmap(mc)   # cancel the push_gcmap(store=True) in the caller
         self._pop_all_regs_from_frame(mc, [eax], supports_floats, callee_only)
         mc.RET()
+        self.flush_pending_slowpaths(mc)
         return mc.materialize(self.cpu, [])
 
     def _build_malloc_slowpath(self, kind):
@@ -227,6 +231,7 @@
         This function must preserve all registers apart from ecx and edx.
         """
         assert kind in ['fixed', 'str', 'unicode', 'var']
+        self.pending_slowpaths = []
         mc = codebuf.MachineCodeBlockWrapper()
         self._push_all_regs_to_frame(mc, [ecx, edx], self.cpu.supports_floats)
         # the caller already did push_gcmap(store=True)
@@ -276,13 +281,13 @@
         self.set_extra_stack_depth(mc, 0)
         #
         mc.TEST_rr(eax.value, eax.value)
+        # common case: not taken
         mc.J_il(rx86.Conditions['Z'], 0xfffff) # patched later
         jz_location = mc.get_relative_pos(break_basic_block=False)
         mc.MOV_rr(ecx.value, eax.value)
         #
         nursery_free_adr = self.cpu.gc_ll_descr.get_nursery_free_addr()
         self._pop_all_regs_from_frame(mc, [ecx, edx], self.cpu.supports_floats)
-        mc.MOV(edx, heap(nursery_free_adr))   # load this in EDX
         self.pop_gcmap(mc)   # push_gcmap(store=True) done by the caller
         mc.RET()
         #
@@ -298,6 +303,7 @@
         mc.force_frame_size(DEFAULT_FRAME_BYTES + WORD)
         mc.ADD_ri(esp.value, WORD)
         mc.JMP(imm(self.propagate_exception_path))
+        self.flush_pending_slowpaths(mc)
         #
         rawstart = mc.materialize(self.cpu, [])
         return rawstart
@@ -756,7 +762,17 @@
         gcreftracers.append(tracer)    # keepalive
         self.teardown_gcrefs_list()
 
+    def flush_pending_slowpaths(self, mc):
+        # for each pending slowpath, generate it now.  Note that this
+        # may occasionally add an extra guard_token in
+        # pending_guard_tokens, so it must be done before the
+        # following loop in write_pending_failure_recoveries().
+        for sp in self.pending_slowpaths:
+            sp.generate(self, mc)
+        self.pending_slowpaths = None
+
     def write_pending_failure_recoveries(self, regalloc):
+        self.flush_pending_slowpaths(self.mc)
         # for each pending guard, generate the code of the recovery stub
         # at the end of self.mc.
         for tok in self.pending_guard_tokens:
@@ -822,6 +838,14 @@
         for ofs in self.frame_depth_to_patch:
             self._patch_frame_depth(ofs + rawstart, framedepth)
 
+    class IncreaseStackSlowPath(codebuf.SlowPath):
+        def generate_body(self, assembler, mc):
+            mc.MOV_si(WORD, 0xffffff)     # force writing 32 bit
+            ofs2 = mc.get_relative_pos(break_basic_block=False) - 4
+            assembler.frame_depth_to_patch.append(ofs2)
+            assembler.push_gcmap(mc, self.gcmap, store=True)
+            mc.CALL(imm(assembler._frame_realloc_slowpath))
+
     def _check_frame_depth(self, mc, gcmap):
         """ check if the frame is of enough depth to follow this bridge.
         Otherwise reallocate the frame in a helper.
@@ -832,15 +856,11 @@
         ofs = self.cpu.unpack_fielddescr(descrs.arraydescr.lendescr)
         mc.CMP_bi(ofs, 0xffffff)     # force writing 32 bit
         stack_check_cmp_ofs = mc.get_relative_pos(break_basic_block=False) - 4
-        jg_location = mc.emit_forward_jump('GE')
-        mc.MOV_si(WORD, 0xffffff)     # force writing 32 bit
-        ofs2 = mc.get_relative_pos(break_basic_block=False) - 4
-        self.push_gcmap(mc, gcmap, store=True)
-        mc.CALL(imm(self._frame_realloc_slowpath))
-        # patch the JG above
-        mc.patch_forward_jump(jg_location)
         self.frame_depth_to_patch.append(stack_check_cmp_ofs)
-        self.frame_depth_to_patch.append(ofs2)
+        sp = self.IncreaseStackSlowPath(mc, rx86.Conditions['L'])
+        sp.gcmap = gcmap
+        sp.set_continue_addr(mc)
+        self.pending_slowpaths.append(sp)
 
     def _check_frame_depth_debug(self, mc):
         """ double check the depth size. It prints the error (and potentially
@@ -986,6 +1006,10 @@
         if gcrootmap and gcrootmap.is_shadow_stack:
             self._call_header_shadowstack(gcrootmap)
 
+    class StackCheckSlowPath(codebuf.SlowPath):
+        def generate_body(self, assembler, mc):
+            mc.CALL(imm(assembler.stack_check_slowpath))
+
     def _call_header_with_stack_check(self):
         self._call_header()
         if self.stack_check_slowpath == 0:
@@ -995,11 +1019,9 @@
             self.mc.MOV(eax, heap(endaddr))             # MOV eax, [start]
             self.mc.SUB(eax, esp)                       # SUB eax, current
             self.mc.CMP(eax, heap(lengthaddr))          # CMP eax, [length]
-            jb_location = self.mc.emit_forward_jump('BE')#JBE .skip
-            self.mc.CALL(imm(self.stack_check_slowpath))# CALL slowpath
-            # patch the JB above                        # .skip:
-            self.mc.patch_forward_jump(jb_location)
-            #
+            sp = self.StackCheckSlowPath(self.mc, rx86.Conditions['A'])
+            sp.set_continue_addr(self.mc)
+            self.pending_slowpaths.append(sp)
 
     def _call_footer(self):
         # the return value is the jitframe
@@ -1155,9 +1177,9 @@
                                                     faillocs, frame_depth)
         genop_guard_list[guard_opnum](self, guard_op, guard_token,
                                       arglocs, resloc)
-        if not we_are_translated():
-            # must be added by the genop_guard_list[]()
-            assert guard_token is self.pending_guard_tokens[-1]
+        # this must usually have added guard_token as last element
+        # of self.pending_guard_tokens, but not always (see
+        # genop_guard_guard_no_exception)
 
     def load_effective_addr(self, sizereg, baseofs, scale, result, frm=imm0):
         self.mc.LEA(result, addr_add(frm, sizereg, baseofs, scale))
@@ -1536,9 +1558,11 @@
         reg = arglocs[0]
         self.mc.TEST(reg, reg)
         if WORD == 4:
+            # common case: not taken
             self.mc.J_il(rx86.Conditions['Z'], self.propagate_exception_path)
             self.mc.add_pending_relocation()
         elif WORD == 8:
+            # common case: not taken
             self.mc.J_il(rx86.Conditions['Z'], 0)
             pos = self.mc.get_relative_pos(break_basic_block=False)
             self.pending_memoryerror_trampoline_from.append(pos)
@@ -1695,22 +1719,21 @@
     genop_guard_guard_isnull = genop_guard_guard_false
 
     def genop_guard_guard_no_exception(self, guard_op, guard_token, locs, ign):
+        # If the previous operation was a COND_CALL, don't emit
+        # anything now.  Instead, we'll emit the GUARD_NO_EXCEPTION at
+        # the end of the slowpath in CondCallSlowPath.
+        if self._find_nearby_operation(-1).getopnum() in (
+                rop.COND_CALL, rop.COND_CALL_VALUE_I, rop.COND_CALL_VALUE_R):
+            sp = self.pending_slowpaths[-1]
+            assert isinstance(sp, self.CondCallSlowPath)
+            sp.guard_token_no_exception = guard_token
+        else:
+            self.generate_guard_no_exception(guard_token)
+
+    def generate_guard_no_exception(self, guard_token):
         self.mc.CMP(heap(self.cpu.pos_exception()), imm0)
         self.guard_success_cc = rx86.Conditions['Z']
         self.implement_guard(guard_token)
-        # If the previous operation was a COND_CALL, overwrite its conditional
-        # jump to jump over this GUARD_NO_EXCEPTION as well, if we can
-        if self._find_nearby_operation(-1).getopnum() in (
-                rop.COND_CALL, rop.COND_CALL_VALUE_I, rop.COND_CALL_VALUE_R):
-            j_location = self.previous_cond_call_jcond
-            try:
-                self.mc.patch_forward_jump(j_location)
-            except codebuf.ShortJumpTooFar:
-                pass    # ignore this case
-            else:
-                # succeeded: forget the saved value of the scratch
-                # register here
-                self.mc.forget_scratch_register()
 
     def genop_guard_guard_not_invalidated(self, guard_op, guard_token,
                                           locs, ign):
@@ -2073,6 +2096,7 @@
     def implement_guard(self, guard_token):
         # These jumps are patched later.
         assert self.guard_success_cc >= 0
+        # common case: not taken
         self.mc.J_il(rx86.invert_condition(self.guard_success_cc), 0)
         self.guard_success_cc = rx86.cond_none
         pos = self.mc.get_relative_pos(break_basic_block=False)
@@ -2240,6 +2264,84 @@
 
     # ------------------- END CALL ASSEMBLER -----------------------
 
+    class WriteBarrierSlowPath(codebuf.SlowPath):
+        def generate_body(self, assembler, mc):
+            mc.force_frame_size(DEFAULT_FRAME_BYTES)
+            # for cond_call_gc_wb_array, also add another fast path:
+            # if GCFLAG_CARDS_SET, then we can just set one bit and be done
+            card_marking = (self.loc_index is not None)
+            if card_marking:
+                # GCFLAG_CARDS_SET is in this byte at 0x80, so this fact can
+                # been checked by the sign flags of the previous TEST8
+                js_location = mc.emit_forward_jump('S')   # patched later
+            else:
+                js_location = 0
+
+            # Write only a CALL to the helper prepared in advance, passing it as
+            # argument the address of the structure we are writing into
+            # (the first argument to COND_CALL_GC_WB).
+            helper_num = self.helper_num
+            is_frame = (helper_num == 4)
+            descr = self.descr
+            loc_base = self.loc_base
+            #
+            if not is_frame:
+                mc.PUSH(loc_base)
+            mc.CALL(imm(assembler.wb_slowpath[helper_num]))
+            if not is_frame:
+                mc.stack_frame_size_delta(-WORD)
+
+            if card_marking:
+                # The helper ends again with a check of the flag in the object.
+                # So here, we can simply write again a 'JNS', which will be
+                # taken if GCFLAG_CARDS_SET is still not set.
+                jns_location = mc.emit_forward_jump('NS')   # patched later
+                #
+                # patch the JS above
+                mc.patch_forward_jump(js_location)
+                #
+                # case GCFLAG_CARDS_SET: emit a few instructions to do
+                # directly the card flag setting
+                loc_index = self.loc_index
+                if isinstance(loc_index, RegLoc):
+                    if IS_X86_64 and isinstance(loc_base, RegLoc):
+                        # copy loc_index into r11
+                        tmp1 = X86_64_SCRATCH_REG
+                        mc.forget_scratch_register()
+                        mc.MOV_rr(tmp1.value, loc_index.value)
+                        final_pop = False
+                    else:
+                        # must save the register loc_index before it is mutated
+                        mc.PUSH_r(loc_index.value)
+                        tmp1 = loc_index
+                        final_pop = True
+                    # SHR tmp, card_page_shift
+                    mc.SHR_ri(tmp1.value, descr.jit_wb_card_page_shift)
+                    # XOR tmp, -8
+                    mc.XOR_ri(tmp1.value, -8)
+                    # BTS [loc_base], tmp
+                    if final_pop:
+                        # r11 is not specially used, fall back to regloc.py
+                        mc.BTS(addr_add_const(loc_base, 0), tmp1)
+                    else:
+                        # tmp1 is r11!  but in this case, loc_base is a
+                        # register so we can invoke directly rx86.py
+                        mc.BTS_mr((loc_base.value, 0), tmp1.value)
+                    # done
+                    if final_pop:
+                        mc.POP_r(loc_index.value)
+                    #
+                elif isinstance(loc_index, ImmedLoc):
+                    byte_index = loc_index.value >> descr.jit_wb_card_page_shift
+                    byte_ofs = ~(byte_index >> 3)
+                    byte_val = 1 << (byte_index & 7)
+                    mc.OR8(addr_add_const(loc_base, byte_ofs), imm(byte_val))
+                else:
+                    raise AssertionError("index is neither RegLoc nor ImmedLoc")
+                #
+                # patch the JNS above
+                mc.patch_forward_jump(jns_location)
+
     def _write_barrier_fastpath(self, mc, descr, arglocs, array=False,
                                 is_frame=False):
         # Write code equivalent to write_barrier() in the GC: it checks
@@ -2251,6 +2353,7 @@
             assert cls is not None and isinstance(descr, cls)
         #
         card_marking = False
+        loc_index = None
         mask = descr.jit_wb_if_flag_singlebyte
         if array and descr.jit_wb_cards_set != 0:
             # assumptions the rest of the function depends on:
@@ -2258,6 +2361,7 @@
                     descr.jit_wb_if_flag_byteofs)
             assert descr.jit_wb_cards_set_singlebyte == -0x80
             card_marking = True
+            loc_index = arglocs[1]
             mask = descr.jit_wb_if_flag_singlebyte | -0x80
         #
         loc_base = arglocs[0]
@@ -2266,21 +2370,7 @@
             loc = raw_stack(descr.jit_wb_if_flag_byteofs)
         else:
             loc = addr_add_const(loc_base, descr.jit_wb_if_flag_byteofs)
-        mc.TEST8(loc, imm(mask))
-        jz_location = mc.emit_forward_jump('Z')   # patched later
-
-        # for cond_call_gc_wb_array, also add another fast path:
-        # if GCFLAG_CARDS_SET, then we can just set one bit and be done
-        if card_marking:
-            # GCFLAG_CARDS_SET is in this byte at 0x80, so this fact can
-            # been checked by the sign flags of the previous TEST8
-            js_location = mc.emit_forward_jump('S')   # patched later
-        else:
-            js_location = 0
-
-        # Write only a CALL to the helper prepared in advance, passing it as
-        # argument the address of the structure we are writing into
-        # (the first argument to COND_CALL_GC_WB).
+        #
         helper_num = card_marking
         if is_frame:
             helper_num = 4
@@ -2293,65 +2383,14 @@
                                     bool(self._regalloc.xrm.reg_bindings))
             assert self.wb_slowpath[helper_num] != 0
         #
-        if not is_frame:
-            mc.PUSH(loc_base)
-        mc.CALL(imm(self.wb_slowpath[helper_num]))
-        if not is_frame:
-            mc.stack_frame_size_delta(-WORD)
-
-        if card_marking:
-            # The helper ends again with a check of the flag in the object.
-            # So here, we can simply write again a 'JNS', which will be
-            # taken if GCFLAG_CARDS_SET is still not set.
-            jns_location = mc.emit_forward_jump('NS')   # patched later
-            #
-            # patch the JS above
-            mc.patch_forward_jump(js_location)
-            #
-            # case GCFLAG_CARDS_SET: emit a few instructions to do
-            # directly the card flag setting
-            loc_index = arglocs[1]
-            if isinstance(loc_index, RegLoc):
-                if IS_X86_64 and isinstance(loc_base, RegLoc):
-                    # copy loc_index into r11
-                    tmp1 = X86_64_SCRATCH_REG
-                    mc.forget_scratch_register()
-                    mc.MOV_rr(tmp1.value, loc_index.value)
-                    final_pop = False
-                else:
-                    # must save the register loc_index before it is mutated
-                    mc.PUSH_r(loc_index.value)
-                    tmp1 = loc_index
-                    final_pop = True
-                # SHR tmp, card_page_shift
-                mc.SHR_ri(tmp1.value, descr.jit_wb_card_page_shift)
-                # XOR tmp, -8
-                mc.XOR_ri(tmp1.value, -8)
-                # BTS [loc_base], tmp
-                if final_pop:
-                    # r11 is not specially used, fall back to regloc.py
-                    mc.BTS(addr_add_const(loc_base, 0), tmp1)
-                else:
-                    # tmp1 is r11!  but in this case, loc_base is a
-                    # register so we can invoke directly rx86.py
-                    mc.BTS_mr((loc_base.value, 0), tmp1.value)
-                # done
-                if final_pop:
-                    mc.POP_r(loc_index.value)
-                #
-            elif isinstance(loc_index, ImmedLoc):
-                byte_index = loc_index.value >> descr.jit_wb_card_page_shift
-                byte_ofs = ~(byte_index >> 3)
-                byte_val = 1 << (byte_index & 7)
-                mc.OR8(addr_add_const(loc_base, byte_ofs), imm(byte_val))
-            else:
-                raise AssertionError("index is neither RegLoc nor ImmedLoc")
-            #
-            # patch the JNS above
-            mc.patch_forward_jump(jns_location)
-
-        # patch the JZ above
-        mc.patch_forward_jump(jz_location)
+        mc.TEST8(loc, imm(mask))
+        sp = self.WriteBarrierSlowPath(mc, rx86.Conditions['NZ'])
+        sp.loc_base = loc_base
+        sp.loc_index = loc_index
+        sp.helper_num = helper_num
+        sp.descr = descr
+        sp.set_continue_addr(mc)
+        self.pending_slowpaths.append(sp)
 
     def genop_discard_cond_call_gc_wb(self, op, arglocs):
         self._write_barrier_fastpath(self.mc, op.getdescr(), arglocs)
@@ -2382,37 +2421,66 @@
     def label(self):
         self._check_frame_depth_debug(self.mc)
 
+    class CondCallSlowPath(codebuf.SlowPath):
+        guard_token_no_exception = None
+
+        def generate_body(self, assembler, mc):
+            assembler.push_gcmap(mc, self.gcmap, store=True)
+            #
+            # first save away the 4 registers from
+            # 'cond_call_register_arguments' plus the register 'eax'
+            base_ofs = assembler.cpu.get_baseofs_of_frame_field()
+            should_be_saved = self.should_be_saved
+            restore_eax = False
+            for gpr in cond_call_register_arguments + [eax]:
+                if gpr not in should_be_saved or gpr is self.resloc:
+                    continue
+                v = gpr_reg_mgr_cls.all_reg_indexes[gpr.value]
+                mc.MOV_br(v * WORD + base_ofs, gpr.value)
+                if gpr is eax:
+                    restore_eax = True
+            #
+            # load the 0-to-4 arguments into these registers
+            from rpython.jit.backend.x86.jump import remap_frame_layout
+            arglocs = self.arglocs
+            remap_frame_layout(assembler, arglocs,
+                               cond_call_register_arguments[:len(arglocs)],
+                               X86_64_SCRATCH_REG if IS_X86_64 else None)
+            #
+            # load the constant address of the function to call into eax
+            mc.MOV(eax, self.imm_func)
+            #
+            # figure out which variant of cond_call_slowpath to call,
+            # and call it
+            cond_call_adr = assembler.cond_call_slowpath[self.variant_num]
+            mc.CALL(imm(follow_jump(cond_call_adr)))
+            # if this is a COND_CALL_VALUE, we need to move the result in place
+            resloc = self.resloc
+            if resloc is not None and resloc is not eax:
+                mc.MOV(resloc, eax)
+            # restoring the registers saved above, and doing pop_gcmap(), is
+            # left to the cond_call_slowpath helper.  We must only restore eax,
+            # if needed.
+            if restore_eax:
+                v = gpr_reg_mgr_cls.all_reg_indexes[eax.value]
+                mc.MOV_rb(eax.value, v * WORD + base_ofs)
+            #
+            # if needed, emit now the guard_no_exception
+            if self.guard_token_no_exception is not None:
+                assembler.generate_guard_no_exception(
+                             self.guard_token_no_exception)
+
     def cond_call(self, gcmap, imm_func, arglocs, resloc=None):
         assert self.guard_success_cc >= 0
-        j_location = self.mc.emit_forward_jump_cond(
-            rx86.invert_condition(self.guard_success_cc))
+        sp = self.CondCallSlowPath(self.mc, self.guard_success_cc)
+        sp.set_continue_addr(self.mc)
         self.guard_success_cc = rx86.cond_none
+        sp.gcmap = gcmap
+        sp.imm_func = imm_func
+        sp.arglocs = arglocs
+        sp.resloc = resloc
+        sp.should_be_saved = self._regalloc.rm.reg_bindings.values()
         #
-        self.push_gcmap(self.mc, gcmap, store=True)
-        #
-        # first save away the 4 registers from 'cond_call_register_arguments'
-        # plus the register 'eax'
-        base_ofs = self.cpu.get_baseofs_of_frame_field()
-        should_be_saved = self._regalloc.rm.reg_bindings.values()
-        restore_eax = False
-        for gpr in cond_call_register_arguments + [eax]:
-            if gpr not in should_be_saved or gpr is resloc:
-                continue
-            v = gpr_reg_mgr_cls.all_reg_indexes[gpr.value]
-            self.mc.MOV_br(v * WORD + base_ofs, gpr.value)
-            if gpr is eax:
-                restore_eax = True
-        #
-        # load the 0-to-4 arguments into these registers
-        from rpython.jit.backend.x86.jump import remap_frame_layout
-        remap_frame_layout(self, arglocs,
-                           cond_call_register_arguments[:len(arglocs)],
-                           X86_64_SCRATCH_REG if IS_X86_64 else None)
-        #
-        # load the constant address of the function to call into eax
-        self.mc.MOV(eax, imm_func)
-        #
-        # figure out which variant of cond_call_slowpath to call, and call it
         callee_only = False
         floats = False
         if self._regalloc is not None:
@@ -2423,34 +2491,25 @@
                 callee_only = True
             if self._regalloc.xrm.reg_bindings:
                 floats = True
-        cond_call_adr = self.cond_call_slowpath[floats * 2 + callee_only]
-        self.mc.CALL(imm(follow_jump(cond_call_adr)))
-        # if this is a COND_CALL_VALUE, we need to move the result in place
-        if resloc is not None and resloc is not eax:
-            self.mc.MOV(resloc, eax)
-        # restoring the registers saved above, and doing pop_gcmap(), is left
-        # to the cond_call_slowpath helper.  We must only restore eax, if
-        # needed.
-        if restore_eax:
-            v = gpr_reg_mgr_cls.all_reg_indexes[eax.value]
-            self.mc.MOV_rb(eax.value, v * WORD + base_ofs)
+        sp.variant_num = floats * 2 + callee_only
         #
-        self.mc.patch_forward_jump(j_location)
-        # might be overridden again to skip over the following
-        # guard_no_exception too
-        self.previous_cond_call_jcond = j_location
+        self.pending_slowpaths.append(sp)
+
+    class MallocCondSlowPath(codebuf.SlowPath):
+        def generate_body(self, assembler, mc):
+            assembler.push_gcmap(mc, self.gcmap, store=True)
+            mc.CALL(imm(follow_jump(assembler.malloc_slowpath)))
 
     def malloc_cond(self, nursery_free_adr, nursery_top_adr, size, gcmap):
         assert size & (WORD-1) == 0     # must be correctly aligned
         self.mc.MOV(ecx, heap(nursery_free_adr))
         self.mc.LEA_rm(edx.value, (ecx.value, size))
         self.mc.CMP(edx, heap(nursery_top_adr))
-        jna_location = self.mc.emit_forward_jump('NA')   # patched later
-        # save the gcmap
-        self.push_gcmap(self.mc, gcmap, store=True)
-        self.mc.CALL(imm(follow_jump(self.malloc_slowpath)))
-        self.mc.patch_forward_jump(jna_location)
+        sp = self.MallocCondSlowPath(self.mc, rx86.Conditions['A'])
+        sp.gcmap = gcmap
         self.mc.MOV(heap(nursery_free_adr), edx)
+        sp.set_continue_addr(self.mc)
+        self.pending_slowpaths.append(sp)
 
     def malloc_cond_varsize_frame(self, nursery_free_adr, nursery_top_adr,
                                   sizeloc, gcmap):
@@ -2463,12 +2522,31 @@
         else:
             self.mc.LEA_ra(edx.value, (ecx.value, sizeloc.value, 0, 0))
         self.mc.CMP(edx, heap(nursery_top_adr))
-        jna_location = self.mc.emit_forward_jump('NA')   # patched later
-        # save the gcmap
-        self.push_gcmap(self.mc, gcmap, store=True)
-        self.mc.CALL(imm(follow_jump(self.malloc_slowpath)))
-        self.mc.patch_forward_jump(jna_location)
+        sp = self.MallocCondSlowPath(self.mc, rx86.Conditions['A'])
+        sp.gcmap = gcmap
         self.mc.MOV(heap(nursery_free_adr), edx)
+        sp.set_continue_addr(self.mc)
+        self.pending_slowpaths.append(sp)
+
+    class MallocCondVarsizeSlowPath(codebuf.SlowPath):
+        def generate_body(self, assembler, mc):
+            # save the gcmap
+            assembler.push_gcmap(mc, self.gcmap, store=True)
+            kind = self.kind
+            if kind == rewrite.FLAG_ARRAY:
+                mc.MOV_si(WORD, self.itemsize)
+                mc.MOV_ri(ecx.value, self.arraydescr.tid)
+                addr = assembler.malloc_slowpath_varsize
+            else:
+                if kind == rewrite.FLAG_STR:
+                    addr = assembler.malloc_slowpath_str
+                else:
+                    assert kind == rewrite.FLAG_UNICODE
+                    addr = assembler.malloc_slowpath_unicode
+            lengthloc = self.lengthloc
+            assert lengthloc is not ecx and lengthloc is not edx
+            mc.MOV(edx, lengthloc)
+            mc.CALL(imm(follow_jump(addr)))
 
     def malloc_cond_varsize(self, kind, nursery_free_adr, nursery_top_adr,
                             lengthloc, itemsize, maxlength, gcmap,
@@ -2509,34 +2587,24 @@
         # now edx contains the total size in bytes, rounded up to a multiple
         # of WORD, plus nursery_free_adr
         self.mc.CMP(edx, heap(nursery_top_adr))
-        jna_location = self.mc.emit_forward_jump('NA')   # patched later
-        #
         self.mc.patch_forward_jump(ja_location)
-        # save the gcmap
-        self.push_gcmap(self.mc, gcmap, store=True)
-        if kind == rewrite.FLAG_ARRAY:
-            self.mc.MOV_si(WORD, itemsize)
-            self.mc.MOV(edx, lengthloc)
-            self.mc.MOV_ri(ecx.value, arraydescr.tid)
-            addr = self.malloc_slowpath_varsize
-        else:
-            if kind == rewrite.FLAG_STR:
-                addr = self.malloc_slowpath_str
-            else:
-                assert kind == rewrite.FLAG_UNICODE
-                addr = self.malloc_slowpath_unicode
-            self.mc.MOV(edx, lengthloc)
-        self.mc.CALL(imm(follow_jump(addr)))
-        jmp_location = self.mc.emit_forward_jump_uncond()  # jump to later
-        #
-        self.mc.patch_forward_jump(jna_location)
-        self.mc.force_frame_size(DEFAULT_FRAME_BYTES)
-        # write down the tid, but not if it's the result of the CALL
+        # Note: we call the slow path in condition 'A', which may be
+        # true either because the CMP just above really got that
+        # condition, or because we jumped here from ja_location before.
+        # In both cases, the jumps are forward-going and the expected
+        # common case is "not taken".
+        sp = self.MallocCondVarsizeSlowPath(self.mc, rx86.Conditions['A'])
+        sp.gcmap = gcmap
+        sp.kind = kind
+        sp.itemsize = itemsize
+        sp.lengthloc = lengthloc
+        sp.arraydescr = arraydescr
+        # some more code that is only if we *don't* call the slow
+        # path: write down the tid, and save edx into nursery_free_adr
         self.mc.MOV(mem(ecx, 0), imm(arraydescr.tid))
-        # while we're at it, this line is not needed if we've done the CALL
         self.mc.MOV(heap(nursery_free_adr), edx)
-        #
-        self.mc.patch_forward_jump(jmp_location)
+        sp.set_continue_addr(self.mc)
+        self.pending_slowpaths.append(sp)
 
     def store_force_descr(self, op, fail_locs, frame_depth):
         guard_token = self.implement_guard_recovery(op.opnum,
diff --git a/rpython/jit/backend/x86/callbuilder.py b/rpython/jit/backend/x86/callbuilder.py
--- a/rpython/jit/backend/x86/callbuilder.py
+++ b/rpython/jit/backend/x86/callbuilder.py
@@ -11,6 +11,7 @@
     r12, r13, r14, r15, X86_64_SCRATCH_REG, X86_64_XMM_SCRATCH_REG,
     RegLoc, RawEspLoc, RawEbpLoc, imm, ImmedLoc)
 from rpython.jit.backend.x86.jump import remap_frame_layout
+from rpython.jit.backend.x86 import codebuf
 from rpython.jit.backend.llsupport.callbuilder import AbstractCallBuilder
 from rpython.jit.backend.llsupport import llerrno
 from rpython.rtyper.lltypesystem import llmemory, rffi
@@ -293,6 +294,41 @@
             tlofsreg = self.get_tlofs_reg()    # => esi (possibly reused)
             mc.MOV32_mr((tlofsreg.value, lasterror), eax.value)
 
+    class ReacqGilSlowPath(codebuf.SlowPath):
+        early_jump_addr = 0
+
+        def generate_body(self, assembler, mc):
+            if self.early_jump_addr != 0:
+                # This slow-path has two entry points, with two
+                # conditional jumps.  We can jump to the regular start
+                # of this slow-path with the 2nd conditional jump.  Or,
+                # we can jump past the "MOV(heap(fastgil), ecx)"
+                # instruction from the 1st conditional jump.
+                # This instruction reverts the rpy_fastgil acquired
+                # previously, so that the general 'reacqgil_addr'
+                # function can acquire it again.  It must only be done
+                # if we actually succeeded in acquiring rpy_fastgil.
+                from rpython.jit.backend.x86.assembler import heap
+                mc.MOV(heap(self.fastgil), ecx)
+                offset = mc.get_relative_pos() - self.early_jump_addr
+                mc.overwrite32(self.early_jump_addr-4, offset)
+                # scratch register forgotten here, by get_relative_pos()
+
+            # call the reacqgil() function
+            cb = self.callbuilder
+            if not cb.result_value_saved_early:
+                cb.save_result_value(save_edx=False)
+            if assembler._is_asmgcc():
+                if IS_X86_32:
+                    css_value = edx
+                    old_value = ecx
+                    mc.MOV_sr(4, old_value.value)
+                    mc.MOV_sr(0, css_value.value)
+                # on X86_64, they are already in the right registers
+            mc.CALL(imm(follow_jump(assembler.reacqgil_addr)))
+            if not cb.result_value_saved_early:
+                cb.restore_result_value(save_edx=False)
+
     def move_real_result_and_call_reacqgil_addr(self, fastgil):
         from rpython.jit.backend.x86 import rx86
         #
@@ -314,8 +350,8 @@
                     if not self.result_value_saved_early:
                         mc.MOV_sr(12, edx.value)
                         restore_edx = True
-                css_value = edx
-                old_value = ecx
+                css_value = edx    # note: duplicated in ReacqGilSlowPath
+                old_value = ecx    #
             elif IS_X86_64:
                 css_value = edi
                 old_value = esi
@@ -341,35 +377,25 @@
             # thread.  So here we check if the shadowstack pointer
             # is still the same as before we released the GIL (saved
             # in 'ebx'), and if not, we fall back to 'reacqgil_addr'.
-            jne_location = mc.emit_forward_jump('NE')
+            mc.J_il(rx86.Conditions['NE'], 0xfffff)     # patched later
+            early_jump_addr = mc.get_relative_pos(break_basic_block=False)
+            # ^^^ this jump will go to almost the same place as the
+            # ReacqGilSlowPath() computes, but one instruction farther,
+            # i.e. just after the "MOV(heap(fastgil), ecx)".
+
             # here, ecx (=old_value) is zero (so rpy_fastgil was in 'released'
             # state before the XCHG, but the XCHG acquired it by writing 1)
             rst = gcrootmap.get_root_stack_top_addr()
             mc = self.mc
             mc.CMP(ebx, heap(rst))
-            je_location = mc.emit_forward_jump('E')
-            # revert the rpy_fastgil acquired above, so that the
-            # general 'reacqgil_addr' below can acquire it again...
-            mc.MOV(heap(fastgil), ecx)
-            # patch the JNE above
-            mc.patch_forward_jump(jne_location)
+            sp = self.ReacqGilSlowPath(mc, rx86.Conditions['NE'])
+            sp.early_jump_addr = early_jump_addr
+            sp.fastgil = fastgil
         else:
-            je_location = mc.emit_forward_jump('E')
-        #
-        # Yes, we need to call the reacqgil() function
-        if not self.result_value_saved_early:
-            self.save_result_value(save_edx=False)
-        if self.asm._is_asmgcc():
-            if IS_X86_32:
-                mc.MOV_sr(4, old_value.value)
-                mc.MOV_sr(0, css_value.value)
-            # on X86_64, they are already in the right registers
-        mc.CALL(imm(follow_jump(self.asm.reacqgil_addr)))
-        if not self.result_value_saved_early:
-            self.restore_result_value(save_edx=False)
-        #
-        # patch the JE above
-        mc.patch_forward_jump(je_location)
+            sp = self.ReacqGilSlowPath(mc, rx86.Conditions['NE'])
+        sp.callbuilder = self
+        sp.set_continue_addr(mc)
+        self.asm.pending_slowpaths.append(sp)
         #
         if restore_edx:
             mc.MOV_rs(edx.value, 12)   # restore this
diff --git a/rpython/jit/backend/x86/codebuf.py b/rpython/jit/backend/x86/codebuf.py
--- a/rpython/jit/backend/x86/codebuf.py
+++ b/rpython/jit/backend/x86/codebuf.py
@@ -81,3 +81,30 @@
         if break_basic_block:
             self.forget_scratch_register()
         return BlockBuilderMixin.get_relative_pos(self)
+
+
+class SlowPath(object):
+    def __init__(self, mc, condition):
+        mc.J_il(condition, 0xfffff)     # patched later
+        self.cond_jump_addr = mc.get_relative_pos(break_basic_block=False)
+        self.saved_scratch_value_1 = mc.get_scratch_register_known_value()
+
+    def set_continue_addr(self, mc):
+        self.continue_addr = mc.get_relative_pos(break_basic_block=False)
+        self.saved_scratch_value_2 = mc.get_scratch_register_known_value()
+
+    def generate(self, assembler, mc):
+        # no alignment here, prefer compactness for these slow-paths.
+        # patch the original jump to go here
+        offset = mc.get_relative_pos() - self.cond_jump_addr
+        mc.overwrite32(self.cond_jump_addr-4, offset)
+        # restore the knowledge of the scratch register value
+        # (this does not emit any code)
+        mc.restore_scratch_register_known_value(self.saved_scratch_value_1)
+        # generate the body of the slow-path
+        self.generate_body(assembler, mc)
+        # reload (if needed) the (possibly different) scratch register value
+        mc.load_scratch_if_known(self.saved_scratch_value_2)
+        # jump back
+        curpos = mc.get_relative_pos() + 5
+        mc.JMP_l(self.continue_addr - curpos)
diff --git a/rpython/jit/backend/x86/regloc.py b/rpython/jit/backend/x86/regloc.py
--- a/rpython/jit/backend/x86/regloc.py
+++ b/rpython/jit/backend/x86/regloc.py
@@ -373,7 +373,7 @@
 class LocationCodeBuilder(object):
     _mixin_ = True
 
-    _scratch_register_value = 0    # 0 means 'unknown'
+    _scratch_register_value = -1    # -1 means 'unknown'
 
     def _binaryop(name):
 
@@ -552,7 +552,7 @@
         # If we are within a "reuse_scratch_register" block, we remember the
         # last value we loaded to the scratch register and encode the address
         # as an offset from that if we can
-        if self._scratch_register_value != 0:
+        if self._scratch_register_value != -1:
             offset = r_uint(addr) - r_uint(self._scratch_register_value)
             offset = intmask(offset)
             if rx86.fits_in_32bits(offset):
@@ -593,7 +593,7 @@
         return (reg, scalereg, scale, ofs)
 
     def _load_scratch(self, value):
-        if self._scratch_register_value != 0:
+        if self._scratch_register_value != -1:
             if self._scratch_register_value == value:
                 #print '_load_scratch(%x) [REUSED]' % (value,)
                 return
@@ -619,7 +619,7 @@
         self.MOV_ri(X86_64_SCRATCH_REG.value, value)
 
     def forget_scratch_register(self):
-        self._scratch_register_value = 0
+        self._scratch_register_value = -1
 
     def get_scratch_register_known_value(self):
         return self._scratch_register_value
@@ -627,6 +627,11 @@
     def restore_scratch_register_known_value(self, saved_value):
         self._scratch_register_value = saved_value
 
+    def load_scratch_if_known(self, saved_value):
+        if saved_value != -1:
+            assert IS_X86_64
+            self._load_scratch(saved_value)
+
     def trap(self):
         self.INT3()
 
diff --git a/rpython/jit/backend/x86/test/test_regloc.py b/rpython/jit/backend/x86/test/test_regloc.py
--- a/rpython/jit/backend/x86/test/test_regloc.py
+++ b/rpython/jit/backend/x86/test/test_regloc.py
@@ -211,9 +211,9 @@
     def test_64bit_address_4(self):
         base_addr = intmask(0xFEDCBA9876543210)
         cb = LocationCodeBuilder64()
-        assert cb._scratch_register_value == 0
+        assert cb._scratch_register_value == -1
         cb.MOV(ecx, AddressLoc(edx, esi, 2, base_addr))
-        assert cb._scratch_register_value == 0
+        assert cb._scratch_register_value == -1
         # this case is a CMP_ra
         #
         expected_instructions = (
diff --git a/rpython/jit/backend/x86/test/test_runner.py b/rpython/jit/backend/x86/test/test_runner.py
--- a/rpython/jit/backend/x86/test/test_runner.py
+++ b/rpython/jit/backend/x86/test/test_runner.py
@@ -39,7 +39,7 @@
                                  'nop; '    # for the label
                                  'add; test; je; jmp;')   # plus some padding
         bridge_loop_instructions = (
-            'cmp; jge; mov;( movabs;| lea;)? mov; (mov|movabs|lea); call; mov(abs)?; jmp;')
+            'cmp; jl; mov(abs)?; jmp;')
 
     def get_cpu(self):
         cpu = CPU(rtyper=None, stats=FakeStats())

From pypy.commits at gmail.com  Sun Apr  9 07:49:00 2017
From: pypy.commits at gmail.com (mattip)
Date: Sun, 09 Apr 2017 04:49:00 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: win32 does not have stdint.h, work around
Message-ID: <58ea1fac.dda1df0a.19db6.ac99@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.5
Changeset: r91020:afb359dd552e
Date: 2017-04-09 14:48 +0300
http://bitbucket.org/pypy/pypy/changeset/afb359dd552e/

Log:	win32 does not have stdint.h, work around

diff --git a/lib_pypy/_decimal_build.py b/lib_pypy/_decimal_build.py
--- a/lib_pypy/_decimal_build.py
+++ b/lib_pypy/_decimal_build.py
@@ -226,6 +226,16 @@
 _libdir = os.path.join(os.path.dirname(__file__), '_libmpdec')
 ffi.set_source('_decimal_cffi',
     """
+#ifdef _MSC_VER
+  #if defined(_WIN64)
+    typedef __int64 LONG_PTR; 
+  #else
+    typedef long LONG_PTR;
+  #endif
+  typedef LONG_PTR ssize_t;
+#else
+  #define HAVE_STDINT_H
+#endif
 #include "mpdecimal.h"
 
 #define MPD_Float_operation MPD_Not_implemented
@@ -266,7 +276,6 @@
     include_dirs=[_libdir],
     extra_compile_args=[
         "-DANSI",
-        "-DHAVE_STDINT_H",
         "-DHAVE_INTTYPES_H",
         "-DCONFIG_64" if sys.maxsize > 1 << 32 else "-DCONFIG_32",
     ],

From pypy.commits at gmail.com  Mon Apr 10 04:04:40 2017
From: pypy.commits at gmail.com (arigo)
Date: Mon, 10 Apr 2017 01:04:40 -0700 (PDT)
Subject: [pypy-commit] pypy default: Patch issue #2535 (david naylor)
Message-ID: <58eb3c98.8aa4df0a.c08e7.caba@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91021:0c750a7ba24a
Date: 2017-04-10 10:04 +0200
http://bitbucket.org/pypy/pypy/changeset/0c750a7ba24a/

Log:	Patch issue #2535 (david naylor)

	Use cc/c++ instead of gcc/g++

diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py b/lib-python/2.7/distutils/sysconfig_pypy.py
--- a/lib-python/2.7/distutils/sysconfig_pypy.py
+++ b/lib-python/2.7/distutils/sysconfig_pypy.py
@@ -61,12 +61,12 @@
 def _init_posix():
     """Initialize the module as appropriate for POSIX systems."""
     g = {}
-    g['CC'] = "gcc -pthread"
-    g['CXX'] = "g++ -pthread"
+    g['CC'] = "cc -pthread"
+    g['CXX'] = "c++ -pthread"
     g['OPT'] = "-DNDEBUG -O2"
     g['CFLAGS'] = "-DNDEBUG -O2"
     g['CCSHARED'] = "-fPIC"
-    g['LDSHARED'] = "gcc -pthread -shared"
+    g['LDSHARED'] = "cc -pthread -shared"
     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
     g['AR'] = "ar"
     g['ARFLAGS'] = "rc"

From pypy.commits at gmail.com  Mon Apr 10 04:06:44 2017
From: pypy.commits at gmail.com (arigo)
Date: Mon, 10 Apr 2017 01:06:44 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Forward-port of 0c750a7ba24a
Message-ID: <58eb3d14.2483df0a.4e0d7.b7be@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r91022:eec301b81cfb
Date: 2017-04-10 10:06 +0200
http://bitbucket.org/pypy/pypy/changeset/eec301b81cfb/

Log:	Forward-port of 0c750a7ba24a

diff --git a/lib-python/3/distutils/sysconfig_pypy.py b/lib-python/3/distutils/sysconfig_pypy.py
--- a/lib-python/3/distutils/sysconfig_pypy.py
+++ b/lib-python/3/distutils/sysconfig_pypy.py
@@ -66,12 +66,12 @@
     so_ext = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
 
     g = {}
-    g['CC'] = "gcc -pthread"
-    g['CXX'] = "g++ -pthread"
+    g['CC'] = "cc -pthread"
+    g['CXX'] = "c++ -pthread"
     g['OPT'] = "-DNDEBUG -O2"
     g['CFLAGS'] = "-DNDEBUG -O2"
     g['CCSHARED'] = "-fPIC"
-    g['LDSHARED'] = "gcc -pthread -shared"
+    g['LDSHARED'] = "cc -pthread -shared"
     g['EXT_SUFFIX'] = so_ext
     g['SHLIB_SUFFIX'] = so_ext
     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility

From pypy.commits at gmail.com  Mon Apr 10 04:08:38 2017
From: pypy.commits at gmail.com (arigo)
Date: Mon, 10 Apr 2017 01:08:38 -0700 (PDT)
Subject: [pypy-commit] pypy default: Patch issue #2536 (david naylor)
Message-ID: <58eb3d86.429d1c0a.9d8cc.1a1b@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91023:4c6aed86d95a
Date: 2017-04-10 10:08 +0200
http://bitbucket.org/pypy/pypy/changeset/4c6aed86d95a/

Log:	Patch issue #2536 (david naylor)

	bsdtar does allow of overriding of user/group

diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -234,12 +234,14 @@
             zf.close()
         else:
             archive = str(builddir.join(name + '.tar.bz2'))
-            if sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
+            if sys.platform == 'darwin':
                 print >>sys.stderr, """Warning: tar on current platform does not suport overriding the uid and gid
 for its contents. The tarball will contain your uid and gid. If you are
 building the actual release for the PyPy website, you may want to be
 using another platform..."""
                 e = os.system('tar --numeric-owner -cvjf ' + archive + " " + name)
+            elif sys.platform.startswith('freebsd'):
+                e = os.system('tar --uname=root --gname=wheel -cvjf ' + archive + " " + name)
             elif sys.platform == 'cygwin':
                 e = os.system('tar --owner=Administrator --group=Administrators --numeric-owner -cvjf ' + archive + " " + name)
             else:

From pypy.commits at gmail.com  Mon Apr 10 04:33:47 2017
From: pypy.commits at gmail.com (tobweber)
Date: Mon, 10 Apr 2017 01:33:47 -0700 (PDT)
Subject: [pypy-commit] stmgc c8-long-transactions: Merge overheads
 instrumentation
Message-ID: <58eb436b.4790df0a.b171d.cc0b@mx.google.com>

Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-long-transactions
Changeset: r2038:1c544f12ca42
Date: 2017-04-10 10:32 +0200
http://bitbucket.org/pypy/stmgc/changeset/1c544f12ca42/

Log:	Merge overheads instrumentation

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -158,6 +158,9 @@
 {
     /* returns true if we reached a valid state, or false if
        we need to abort now */
+    start_timer();
+    stm_thread_local_t *thread_local_for_logging = STM_SEGMENT->running_thread;
+
     dprintf(("_stm_validate() at cl=%p, rev=%lu\n", STM_PSEGMENT->last_commit_log_entry,
              STM_PSEGMENT->last_commit_log_entry->rev_num));
     /* go from last known entry in commit log to the
@@ -171,6 +174,11 @@
 
     if (STM_PSEGMENT->transaction_state == TS_INEVITABLE) {
         assert(first_cl->next == INEV_RUNNING);
+
+        if (thread_local_for_logging != NULL) {
+            stop_timer_and_publish_for_thread(
+                thread_local_for_logging, STM_DURATION_VALIDATION);
+        }
         return true;
     }
 
@@ -338,6 +346,11 @@
         release_privatization_lock(my_segnum);
     }
 
+    if (thread_local_for_logging != NULL) {
+        stop_timer_and_publish_for_thread(
+            thread_local_for_logging, STM_DURATION_VALIDATION);
+    }
+
     return !needs_abort;
 }
 
@@ -346,6 +359,8 @@
 {
     /* puts all modified_old_objects in a new commit log entry */
 
+    start_timer();
+
     // we don't need the privatization lock, as we are only
     // reading from modified_old_objs and nobody but us can change it
     struct list_s *list = STM_PSEGMENT->modified_old_objects;
@@ -358,6 +373,9 @@
     result->rev_num = -1;       /* invalid */
     result->written_count = count;
     memcpy(result->written, list->items, count * sizeof(struct stm_undo_s));
+
+    stop_timer_and_publish(STM_DURATION_CREATE_CLE);
+
     return result;
 }
 
@@ -400,6 +418,8 @@
 */
 static void _validate_and_attach(struct stm_commit_log_entry_s *new)
 {
+    start_timer();
+
     uintptr_t cle_length = 0;
     struct stm_commit_log_entry_s *old;
 
@@ -412,10 +432,17 @@
     soon_finished_or_inevitable_thread_segment();
 
  retry_from_start:
+    pause_timer();
     if (!_stm_validate()) {
+        continue_timer();
+
         free_cle(new);
-        stm_abort_transaction();
+
+        stop_timer_and_publish(STM_DURATION_VALIDATION);
+
+        stm_abort_transaction(); // leaves method by longjump
     }
+    continue_timer();
 
     if (cle_length != list_count(STM_PSEGMENT->modified_old_objects)) {
         /* something changed the list of modified objs during _stm_validate; or
@@ -475,6 +502,8 @@
         dprintf(("_validate_and_attach(%p) failed, retrying\n", new));
         goto retry_from_start;
     }
+
+    stop_timer_and_publish(STM_DURATION_VALIDATION);
 }
 
 /* This is called to do stm_validate() and then attach INEV_RUNNING to
@@ -495,6 +524,8 @@
 
 static void _validate_and_add_to_commit_log(void)
 {
+    start_timer();
+
     struct stm_commit_log_entry_s *old, *new;
 
     new = _create_commit_log_entry();
@@ -523,8 +554,12 @@
         release_modification_lock_wr(STM_SEGMENT->segment_num);
     }
     else {
+        pause_timer();
         _validate_and_attach(new);
+        continue_timer();
     }
+
+    stop_timer_and_publish(STM_DURATION_VALIDATION);
 }
 
 /* ############# STM ############# */
@@ -817,6 +852,8 @@
 
 static void write_slowpath_common(object_t *obj, bool mark_card)
 {
+    start_timer();
+
     assert(_seems_to_be_running_transaction());
     assert(!_is_in_nursery(obj));
     assert(obj->stm_flags & GCFLAG_WRITE_BARRIER);
@@ -826,6 +863,8 @@
            part again: */
         assert(!(obj->stm_flags & GCFLAG_WB_EXECUTED));
         write_slowpath_overflow_obj(obj, mark_card);
+
+        stop_timer_and_publish(STM_DURATION_WRITE_GC_ONLY);
         return;
     }
 
@@ -893,11 +932,15 @@
     }
 
     DEBUG_EXPECT_SEGFAULT(true);
+
+    stop_timer_and_publish(STM_DURATION_WRITE_SLOWPATH);
 }
 
 
 void _stm_write_slowpath_card(object_t *obj, uintptr_t index)
 {
+    start_timer();
+
     dprintf_test(("write_slowpath_card(%p, %lu)\n",
                   obj, index));
 
@@ -906,9 +949,15 @@
        card marking instead. */
     if (!(obj->stm_flags & GCFLAG_CARDS_SET)) {
         bool mark_card = obj_should_use_cards(STM_SEGMENT->segment_base, obj);
+
+        pause_timer();
         write_slowpath_common(obj, mark_card);
-        if (!mark_card)
+        continue_timer();
+
+        if (!mark_card) {
+            stop_timer_and_publish(STM_DURATION_WRITE_SLOWPATH);
             return;
+        }
     }
 
     assert(obj_should_use_cards(STM_SEGMENT->segment_base, obj));
@@ -955,13 +1004,13 @@
 
     dprintf(("mark %p index %lu, card:%lu with %d\n",
              obj, index, get_index_to_card_index(index), CARD_MARKED));
+
+    stop_timer_and_publish(STM_DURATION_WRITE_SLOWPATH);
 }
 
 __attribute__((flatten))
 void _stm_write_slowpath(object_t *obj) {
-    start_timer()
     write_slowpath_common(obj,  /* mark_card */ false);
-    stop_timer_and_publish(STM_DURATION_WRITE_BARRIER)
 }
 
 
@@ -1021,6 +1070,8 @@
 
 static void _do_start_transaction(stm_thread_local_t *tl)
 {
+    start_timer();
+
     assert(!_stm_in_transaction(tl));
     tl->wait_event_emitted = 0;
 
@@ -1084,6 +1135,8 @@
         reset_transaction_read_version();
     }
 
+    stop_timer_and_publish(STM_DURATION_START_TRX);
+
     stm_validate();
 }
 
@@ -1208,6 +1261,9 @@
 
 static void _core_commit_transaction(bool external)
 {
+    start_timer();
+    stm_thread_local_t *thread_local_for_logging = STM_SEGMENT->running_thread;
+
     exec_local_finalizers();
 
     assert(!_has_mutex());
@@ -1226,11 +1282,17 @@
     assert(STM_SEGMENT->running_thread->wait_event_emitted == 0);
 
     dprintf(("> stm_commit_transaction(external=%d)\n", (int)external));
+
+    pause_timer();
     minor_collection(/*commit=*/ true, external);
+    continue_timer();
+
     if (!external && is_major_collection_requested()) {
         s_mutex_lock();
         if (is_major_collection_requested()) {   /* if still true */
+            pause_timer();
             major_collection_with_mutex();
+            continue_timer();
         }
         s_mutex_unlock();
     }
@@ -1246,7 +1308,10 @@
        stm_validate() at the start of a new transaction is happy even
        if there is an inevitable tx running) */
     bool was_inev = STM_PSEGMENT->transaction_state == TS_INEVITABLE;
+
+    pause_timer();
     _validate_and_add_to_commit_log();
+    continue_timer();
 
     if (external) {
         /* from this point on, unlink the original 'stm_thread_local_t *'
@@ -1295,6 +1360,9 @@
 
     s_mutex_unlock();
 
+    stop_timer_and_publish_for_thread(
+        thread_local_for_logging, STM_DURATION_COMMIT_EXCEPT_GC);
+
     /* between transactions, call finalizers. this will execute
        a transaction itself */
     if (tl != NULL)
diff --git a/c8/stm/gcpage.c b/c8/stm/gcpage.c
--- a/c8/stm/gcpage.c
+++ b/c8/stm/gcpage.c
@@ -747,9 +747,13 @@
     dprintf((" .----- major collection -----------------------\n"));
     assert(_has_mutex());
 
+    stm_thread_local_t *thread_local_for_logging = STM_SEGMENT->running_thread;
+
     /* first, force a minor collection in each of the other segments */
     major_do_validation_and_minor_collections();
 
+    start_timer();
+
     dprintf((" | used before collection: %ld\n",
              (long)pages_ctl.total_allocated));
     dprintf((" | commit log entries before: %ld\n",
@@ -779,9 +783,12 @@
         dprintf((" | used after collection:  %ld\n",
                 (long)pages_ctl.total_allocated));
         dprintf((" `----------------------------------------------\n"));
+
+        stop_timer_and_publish_for_thread(
+            thread_local_for_logging, STM_DURATION_MAJOR_GC_LOG_ONLY);
+
         if (must_abort())
             abort_with_mutex();
-
         return;
 #endif
     }
@@ -836,6 +843,10 @@
        must abort, do it now. The others are in safe-points that will
        abort if they need to. */
     dprintf(("must abort?:%d\n", (int)must_abort()));
+
+    stop_timer_and_publish_for_thread(
+        thread_local_for_logging, STM_DURATION_MAJOR_GC_FULL);
+
     if (must_abort())
         abort_with_mutex();
 }
diff --git a/c8/stm/nursery.c b/c8/stm/nursery.c
--- a/c8/stm/nursery.c
+++ b/c8/stm/nursery.c
@@ -534,6 +534,8 @@
 
 static void _do_minor_collection(bool commit)
 {
+    start_timer();
+
     dprintf(("minor_collection commit=%d\n", (int)commit));
     assert(!STM_SEGMENT->no_safe_point_here);
 
@@ -578,6 +580,8 @@
     throw_away_nursery(get_priv_segment(STM_SEGMENT->segment_num));
 
     assert(MINOR_NOTHING_TO_DO(STM_PSEGMENT));
+
+    stop_timer_and_publish(STM_DURATION_MINOR_GC);
 }
 
 static void minor_collection(bool commit, bool external)
diff --git a/c8/stm/timing.h b/c8/stm/timing.h
--- a/c8/stm/timing.h
+++ b/c8/stm/timing.h
@@ -1,32 +1,48 @@
 #include <time.h>
 
+#define continue_timer() clock_gettime(CLOCK_MONOTONIC_RAW, &start);
+
 /* Use raw monotonic time, i.e., solely based on local hardware (no NTP
    adjustments) as in prof.c to obtain values comparable with total program
    runtime. */
-#define start_timer() struct timespec start;                                 \
-                      clock_gettime(CLOCK_MONOTONIC_RAW, &start);
+#define start_timer() struct timespec start, stop;                             \
+                      struct timespec duration = { .tv_sec = 0, .tv_nsec = 0 };\
+                      uint32_t nanosec_diff, sec_diff;                         \
+                      continue_timer()
 
-#define stop_timer() struct timespec stop;                                   \
-                     clock_gettime(CLOCK_MONOTONIC_RAW, &stop);
+/* Must use start_timer before using this macro. */
+#define get_duration() nanosec_diff = stop.tv_nsec - start.tv_nsec;         \
+                       sec_diff = stop.tv_sec - start.tv_sec;               \
+                       if (stop.tv_nsec < start.tv_nsec) {                  \
+                           nanosec_diff += 1000000000;                      \
+                           sec_diff -= 1;                                   \
+                       }                                                    \
+                       duration.tv_sec += sec_diff;                         \
+                       duration.tv_nsec += nanosec_diff;                    \
+                       if (duration.tv_nsec >= 1000000000) {                \
+                           duration.tv_sec += 1;                            \
+                           duration.tv_nsec -= 1000000000;                  \
+                       }
 
-/* Must use start_timer and stop_timer before using this macro. */
-#define get_duration() struct timespec duration = {                          \
-                           stop.tv_sec - start.tv_sec,                       \
-                           stop.tv_nsec - start.tv_nsec                      \
-                       };
+#define pause_timer() clock_gettime(CLOCK_MONOTONIC_RAW, &stop);            \
+                      get_duration()
 
-#define stm_duration_payload(duration)                                       \
-    stm_timing_event_payload_data_t stm_duration_data =                      \
-        { .duration = &duration };                                           \
-    stm_timing_event_payload_t stm_duration_payload =                        \
+#define stm_duration_payload(duration)                                      \
+    stm_timing_event_payload_data_t stm_duration_data =                     \
+        { .duration = &duration };                                          \
+    stm_timing_event_payload_t stm_duration_payload =                       \
         { STM_EVENT_PAYLOAD_DURATION, stm_duration_data };
 
-#define publish_event(event)                                                 \
-    (timing_enabled() ?                                                      \
-        stmcb_timing_event(STM_SEGMENT->running_thread, event, &stm_duration_payload) : \
+#define publish_event(thread_local, event)                                  \
+    (timing_enabled() ?                                                     \
+        stmcb_timing_event(thread_local, event, &stm_duration_payload) :    \
         (void)0);
 
-#define stop_timer_and_publish(event) stop_timer()                           \
-                                      get_duration()                         \
-                                      stm_duration_payload(duration)         \
-                                      publish_event(event)
+#define stop_timer_and_publish_for_thread(thread_local, event)              \
+    pause_timer()                                                           \
+    stm_duration_payload(duration)                                          \
+    assert(thread_local != NULL);                                           \
+    publish_event(thread_local, event)
+
+#define stop_timer_and_publish(event)                                       \
+    stop_timer_and_publish_for_thread(STM_SEGMENT->running_thread, event)
diff --git a/c8/stmgc.h b/c8/stmgc.h
--- a/c8/stmgc.h
+++ b/c8/stmgc.h
@@ -575,33 +575,41 @@
     STM_GC_MAJOR_DONE,
 
     /* execution duration profiling events */
-    STM_DURATION_WRITE_BARRIER,
+    STM_DURATION_START_TRX,
+    STM_DURATION_WRITE_GC_ONLY,
+    STM_DURATION_WRITE_SLOWPATH,
     STM_DURATION_VALIDATION,
-    STM_DURATION_COMMIT,
+    STM_DURATION_CREATE_CLE,
+    STM_DURATION_COMMIT_EXCEPT_GC,
     STM_DURATION_MINOR_GC,
-    STM_DURATION_MAJOR_GC,
+    STM_DURATION_MAJOR_GC_LOG_ONLY,
+    STM_DURATION_MAJOR_GC_FULL,
 
     _STM_EVENT_N
 };
 
-#define STM_EVENT_NAMES                         \
-    "transaction start",                        \
-    "transaction commit",                       \
-    "transaction abort",                        \
-    "contention write read",                    \
-    "wait free segment",                        \
-    "wait other inevitable",                    \
-    "wait done",                                \
-    "gc minor start",                           \
-    "gc minor done",                            \
-    "gc major start",                           \
-    "gc major done",                            \
-    /* names of duration events */              \
-    "duration of write slowpath",               \
-    "duration of validation",                   \
-    "duration of commit",                       \
-    "duration of minor gc",                     \
-    "duration of major gc"
+#define STM_EVENT_NAMES                             \
+    "transaction start",                            \
+    "transaction commit",                           \
+    "transaction abort",                            \
+    "contention write read",                        \
+    "wait free segment",                            \
+    "wait other inevitable",                        \
+    "wait done",                                    \
+    "gc minor start",                               \
+    "gc minor done",                                \
+    "gc major start",                               \
+    "gc major done",                                \
+    /* names of duration events */                  \
+    "duration of transaction start",                \
+    "duration of gc due to write",                  \
+    "duration of write slowpath",                   \
+    "duration of validation",                       \
+    "duration of commit log entry creation",        \
+    "duration of commit except gc",                 \
+    "duration of minor gc",                         \
+    "duration of major gc doing log clean up only", \
+    "duration of full major gc"
 
 /* The markers pushed in the shadowstack are an odd number followed by a
    regular object pointer. */

From pypy.commits at gmail.com  Mon Apr 10 05:33:48 2017
From: pypy.commits at gmail.com (antocuni)
Date: Mon, 10 Apr 2017 02:33:48 -0700 (PDT)
Subject: [pypy-commit] extradoc extradoc: include --jitlog
Message-ID: <58eb517c.c70a1c0a.89c48.32b5@mx.google.com>

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: extradoc
Changeset: r5800:b1dc930c1b52
Date: 2017-04-10 11:32 +0200
http://bitbucket.org/pypy/extradoc/changeset/b1dc930c1b52/

Log:	include --jitlog

diff --git a/talk/pycon-italy-2017/talk.rst b/talk/pycon-italy-2017/talk.rst
--- a/talk/pycon-italy-2017/talk.rst
+++ b/talk/pycon-italy-2017/talk.rst
@@ -268,6 +268,7 @@
 
    $ pypy -m vmprof --web foobar.py
 
+   $ pypy -m vmprof --web --jitlog foobar.py
 
 ..
     CPython: http://vmprof.com/#/f7c45f78-fcb0-4c31-8fb5-d53546b94c09

From pypy.commits at gmail.com  Mon Apr 10 05:33:50 2017
From: pypy.commits at gmail.com (antocuni)
Date: Mon, 10 Apr 2017 02:33:50 -0700 (PDT)
Subject: [pypy-commit] extradoc extradoc: commit the pdf of the slides as
 they were presented
Message-ID: <58eb517e.96b81c0a.1ad36.b598@mx.google.com>

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: extradoc
Changeset: r5801:a7f037c7cafa
Date: 2017-04-10 11:33 +0200
http://bitbucket.org/pypy/extradoc/changeset/a7f037c7cafa/

Log:	commit the pdf of the slides as they were presented

diff --git a/talk/pycon-italy-2017/talk.pdf b/talk/pycon-italy-2017/talk.pdf
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d07ec927c51115335fc7dc8c5d7723087cbb3719
GIT binary patch

[cut]


From pypy.commits at gmail.com  Mon Apr 10 11:59:11 2017
From: pypy.commits at gmail.com (rlamy)
Date: Mon, 10 Apr 2017 08:59:11 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Add Buffer.w_getitem,
 fix memoryview.__getitem__ in the single-element case
Message-ID: <58ebabcf.179d1c0a.8caa6.bf42@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91029:278bd2e57510
Date: 2017-04-10 16:58 +0100
http://bitbucket.org/pypy/pypy/changeset/278bd2e57510/

Log:	Add Buffer.w_getitem, fix memoryview.__getitem__ in the single-
	element case

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -2,6 +2,7 @@
 from rpython.rlib.signature import signature
 from rpython.rlib import types
 
+
 class Buffer(object):
     """Abstract base class for buffers."""
     _attrs_ = ['readonly']
@@ -77,6 +78,20 @@
             if copiedbytes >= bytesize:
                 break
 
+    def w_getitem(self, space, idx):
+        from pypy.module.struct.formatiterator import UnpackFormatIterator
+        itemsize = self.getitemsize()
+        if itemsize == 1:
+            ch = self.as_binary()[idx]
+            return space.newint(ord(ch))
+        else:
+            # TODO: this probably isn't very fast
+            buf = SubBuffer(self.as_binary(), idx, itemsize)
+            fmtiter = UnpackFormatIterator(space, buf)
+            fmtiter.length = buf.getlength()
+            fmtiter.interpret(self.getformat())
+            return fmtiter.result_w[0]
+
 
 class SimpleBuffer(Buffer):
     _attrs_ = ['readonly', 'data']
@@ -113,6 +128,10 @@
     def getstrides(self):
         return [1]
 
+    def w_getitem(self, space, idx):
+        ch = self.data[idx]
+        return space.newint(ord(ch))
+
 
 class BinaryBuffer(object):
     """Base class for buffers of bytes"""
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -223,16 +223,7 @@
                 shape = self.getshape()
                 strides = self.getstrides()
                 idx = self.lookup_dimension(space, shape, strides, 0, 0, start)
-                if itemsize == 1:
-                    ch = self.buf.getitem(idx)
-                    return space.newint(ord(ch))
-                else:
-                    # TODO: this probably isn't very fast
-                    buf = SubBuffer(self.buf.as_binary(), idx, itemsize)
-                    fmtiter = UnpackFormatIterator(space, buf)
-                    fmtiter.length = buf.getlength()
-                    fmtiter.interpret(self.buf.getformat())
-                    return fmtiter.result_w[0]
+                return self.buf.w_getitem(space, idx)
             else:
                 raise oefmt(space.w_NotImplementedError, "multi-dimensional sub-views are not implemented")
         elif is_slice:

From pypy.commits at gmail.com  Mon Apr 10 13:09:04 2017
From: pypy.commits at gmail.com (mjacob)
Date: Mon, 10 Apr 2017 10:09:04 -0700 (PDT)
Subject: [pypy-commit] pypy llvm-translation-backend: Add stub
 implementation for debug_assert_not_none llop.
Message-ID: <58ebbc30.972e1c0a.5b59.d467@mx.google.com>

Author: Manuel Jacob <me at manueljacob.de>
Branch: llvm-translation-backend
Changeset: r91030:320090532fe1
Date: 2017-04-10 17:27 +0200
http://bitbucket.org/pypy/pypy/changeset/320090532fe1/

Log:	Add stub implementation for debug_assert_not_none llop.

diff --git a/rpython/translator/llvm/genllvm.py b/rpython/translator/llvm/genllvm.py
--- a/rpython/translator/llvm/genllvm.py
+++ b/rpython/translator/llvm/genllvm.py
@@ -1103,6 +1103,9 @@
     def op_debug_assert(self, result, *args):
         pass
 
+    def op_debug_assert_not_none(self, result, *args):
+        pass
+
     def op_debug_llinterpcall(self, result, *args):
         self.w('call void @abort() noreturn nounwind')
         if result.type is not LLVMVoid:

From pypy.commits at gmail.com  Mon Apr 10 13:09:06 2017
From: pypy.commits at gmail.com (mjacob)
Date: Mon, 10 Apr 2017 10:09:06 -0700 (PDT)
Subject: [pypy-commit] pypy llvm-translation-backend: Implement new
 _translated_to_c symbolic.
Message-ID: <58ebbc32.2ea0df0a.528b4.890f@mx.google.com>

Author: Manuel Jacob <me at manueljacob.de>
Branch: llvm-translation-backend
Changeset: r91031:6a9bfe2a2164
Date: 2017-04-10 17:35 +0200
http://bitbucket.org/pypy/pypy/changeset/6a9bfe2a2164/

Log:	Implement new _translated_to_c symbolic.

diff --git a/rpython/translator/llvm/genllvm.py b/rpython/translator/llvm/genllvm.py
--- a/rpython/translator/llvm/genllvm.py
+++ b/rpython/translator/llvm/genllvm.py
@@ -18,7 +18,7 @@
 from rpython.rlib.compilerinfo import COMPILER_INFO
 from rpython.rlib.jit import _we_are_jitted
 from rpython.rlib.objectmodel import (Symbolic, ComputedIntSymbolic,
-     CDefinedIntSymbolic, malloc_zero_filled)
+     CDefinedIntSymbolic, malloc_zero_filled, _translated_to_c)
 from rpython.rtyper.annlowlevel import MixLevelHelperAnnotator
 from rpython.rtyper.llannotation import lltype_to_annotation
 from rpython.rtyper.lltypesystem import (llarena, llgroup, llmemory, lltype,
@@ -194,6 +194,8 @@
             if value is malloc_zero_filled:
                 gctransformer = database.genllvm.gcpolicy.gctransformer
                 return str(int(gctransformer.malloc_zero_filled))
+            elif value is _translated_to_c:
+                return '1'
             elif value is _we_are_jitted:
                 return '0'
             elif value.expr.startswith('RPY_TLOFS_'):

From pypy.commits at gmail.com  Mon Apr 10 13:09:10 2017
From: pypy.commits at gmail.com (mjacob)
Date: Mon, 10 Apr 2017 10:09:10 -0700 (PDT)
Subject: [pypy-commit] pypy llvm-translation-backend: Fix.
Message-ID: <58ebbc36.cf0d1c0a.a512f.da56@mx.google.com>

Author: Manuel Jacob <me at manueljacob.de>
Branch: llvm-translation-backend
Changeset: r91033:2d857d1faf07
Date: 2017-04-10 18:10 +0200
http://bitbucket.org/pypy/pypy/changeset/2d857d1faf07/

Log:	Fix.

diff --git a/rpython/translator/llvm/genllvm.py b/rpython/translator/llvm/genllvm.py
--- a/rpython/translator/llvm/genllvm.py
+++ b/rpython/translator/llvm/genllvm.py
@@ -1377,7 +1377,7 @@
     def op_raw_malloc(self, result, size, zero):
         if zero.value is True:
             self.op_direct_call(result, get_repr(raw_calloc), size,
-                                ConstantRepr(LLVMInt, 1))
+                                ConstantRepr(LLVMSigned, 1))
         elif zero.value is False:
             self.op_direct_call(result, get_repr(raw_malloc), size)
         else:

From pypy.commits at gmail.com  Mon Apr 10 13:09:08 2017
From: pypy.commits at gmail.com (mjacob)
Date: Mon, 10 Apr 2017 10:09:08 -0700 (PDT)
Subject: [pypy-commit] pypy llvm-translation-backend: Remove another
 reference to raisingop2direct_call.
Message-ID: <58ebbc34.098c1c0a.6b6bf.d61c@mx.google.com>

Author: Manuel Jacob <me at manueljacob.de>
Branch: llvm-translation-backend
Changeset: r91032:249f55947826
Date: 2017-04-10 17:37 +0200
http://bitbucket.org/pypy/pypy/changeset/249f55947826/

Log:	Remove another reference to raisingop2direct_call.

diff --git a/rpython/config/translationoption.py b/rpython/config/translationoption.py
--- a/rpython/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -56,8 +56,7 @@
                  ["c", "llvm"], default="c",
                  requires={
                      "c":      [("translation.type_system", "lltype")],
-                     "llvm":   [("translation.type_system", "lltype"),
-                                ("translation.backendopt.raisingop2direct_call", True)],
+                     "llvm":   [("translation.type_system", "lltype")],
                      },
                  cmdline="-b --backend"),
 

From pypy.commits at gmail.com  Mon Apr 10 13:37:22 2017
From: pypy.commits at gmail.com (rlamy)
Date: Mon, 10 Apr 2017 10:37:22 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Create Buffer.setitem_w
Message-ID: <58ebc2d2.4e8bdf0a.993bc.9443@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91034:c15ffb651607
Date: 2017-04-10 18:22 +0100
http://bitbucket.org/pypy/pypy/changeset/c15ffb651607/

Log:	Create Buffer.setitem_w

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -92,6 +92,25 @@
             fmtiter.interpret(self.getformat())
             return fmtiter.result_w[0]
 
+    def setitem_w(self, space, idx, w_obj):
+        from pypy.objspace.std.bytesobject import getbytevalue
+        from pypy.module.struct.formatiterator import PackFormatIterator
+        itemsize = self.getitemsize()
+        if itemsize == 1:
+            ch = getbytevalue(space, w_obj)
+            self.as_binary()[idx] = ch
+        else:
+            # TODO: this probably isn't very fast
+            fmtiter = PackFormatIterator(space, [w_obj], itemsize)
+            try:
+                fmtiter.interpret(self.getformat())
+            except StructError as e:
+                raise oefmt(space.w_TypeError,
+                            "memoryview: invalid type for format '%s'",
+                            self.getformat())
+            byteval = fmtiter.result.build()
+            self.setslice(idx, byteval)
+
 
 class SimpleBuffer(Buffer):
     _attrs_ = ['readonly', 'data']
@@ -132,6 +151,11 @@
         ch = self.data[idx]
         return space.newint(ord(ch))
 
+    def setitem_w(self, space, idx, w_obj):
+        from pypy.objspace.std.bytesobject import getbytevalue
+        ch = getbytevalue(space, w_obj)
+        self.data[idx] = ch
+
 
 class BinaryBuffer(object):
     """Base class for buffers of bytes"""
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -11,7 +11,6 @@
 from pypy.interpreter.gateway import interp2app
 from pypy.interpreter.typedef import TypeDef, GetSetProperty,  make_weakref_descr
 from pypy.module.struct.formatiterator import UnpackFormatIterator, PackFormatIterator
-from pypy.objspace.std.bytesobject import getbytevalue
 from rpython.rlib.unroll import unrolling_iterable
 from rpython.rlib.objectmodel import always_inline
 
@@ -267,19 +266,7 @@
             shape = self.getshape()
             strides = self.getstrides()
             idx = self.lookup_dimension(space, shape, strides, 0, 0, start)
-            if itemsize == 1:
-                ch = getbytevalue(space, w_obj)
-                self.buf.setitem(idx, ch)
-            else:
-                # TODO: this probably isn't very fast
-                fmtiter = PackFormatIterator(space, [w_obj], itemsize)
-                try:
-                    fmtiter.interpret(self.getformat())
-                except StructError as e:
-                    raise oefmt(space.w_TypeError,
-                                "memoryview: invalid type for format '%s'",
-                                self.getformat())
-                self.buf.setslice(idx, fmtiter.result.build())
+            self.buf.setitem_w(space, idx, w_obj)
         elif step == 1:
             value = space.buffer_w(w_obj, space.BUF_CONTIG_RO)
             if value.getlength() != slicelength * itemsize:

From pypy.commits at gmail.com  Mon Apr 10 13:37:25 2017
From: pypy.commits at gmail.com (rlamy)
Date: Mon, 10 Apr 2017 10:37:25 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Move getbytevalue() to space.byte_w()
 (to avoid local import hacks)
Message-ID: <58ebc2d5.2394df0a.e4b2e.92cc@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91035:01ef9fd9fb98
Date: 2017-04-10 18:36 +0100
http://bitbucket.org/pypy/pypy/changeset/01ef9fd9fb98/

Log:	Move getbytevalue() to space.byte_w() (to avoid local import hacks)

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1633,6 +1633,18 @@
     def fsencode_or_none_w(self, w_obj):
         return None if self.is_none(w_obj) else self.fsencode_w(w_obj)
 
+    def byte_w(self, w_obj):
+        """
+        Convert an index-like object to an interp-level char
+
+        Used for app-level code like "bytearray(b'abc')[0] = 42".
+        """
+        value = self.getindex_w(w_obj, None)
+        if not 0 <= value < 256:
+            # this includes the OverflowError in case the long is too large
+            raise oefmt(self.w_ValueError, "byte must be in range(0, 256)")
+        return chr(value)
+
     def int_w(self, w_obj, allow_conversion=True):
         """
         Unwrap an app-level int object into an interpret-level int.
diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -93,12 +93,10 @@
             return fmtiter.result_w[0]
 
     def setitem_w(self, space, idx, w_obj):
-        from pypy.objspace.std.bytesobject import getbytevalue
         from pypy.module.struct.formatiterator import PackFormatIterator
         itemsize = self.getitemsize()
         if itemsize == 1:
-            ch = getbytevalue(space, w_obj)
-            self.as_binary()[idx] = ch
+            self.as_binary()[idx] = space.byte_w(w_obj)
         else:
             # TODO: this probably isn't very fast
             fmtiter = PackFormatIterator(space, [w_obj], itemsize)
@@ -152,9 +150,7 @@
         return space.newint(ord(ch))
 
     def setitem_w(self, space, idx, w_obj):
-        from pypy.objspace.std.bytesobject import getbytevalue
-        ch = getbytevalue(space, w_obj)
-        self.data[idx] = ch
+        self.data[idx] = space.byte_w(w_obj)
 
 
 class BinaryBuffer(object):
diff --git a/pypy/module/_rawffi/interp_rawffi.py b/pypy/module/_rawffi/interp_rawffi.py
--- a/pypy/module/_rawffi/interp_rawffi.py
+++ b/pypy/module/_rawffi/interp_rawffi.py
@@ -5,7 +5,6 @@
 from pypy.interpreter.gateway import interp2app, unwrap_spec
 from pypy.interpreter.typedef import interp_attrproperty
 from pypy.interpreter.typedef import TypeDef, GetSetProperty
-from pypy.objspace.std.bytesobject import getbytevalue
 
 from rpython.rlib.clibffi import *
 from rpython.rlib.objectmodel import we_are_translated
@@ -410,7 +409,7 @@
                                               space.float_w(w_arg)))
     elif letter == "c":
         if space.isinstance_w(w_arg, space.w_int):
-            val = getbytevalue(space, w_arg)
+            val = space.byte_w(w_arg)
         else:
             s = space.bytes_w(w_arg)
             if len(s) != 1:
diff --git a/pypy/objspace/std/bytearrayobject.py b/pypy/objspace/std/bytearrayobject.py
--- a/pypy/objspace/std/bytearrayobject.py
+++ b/pypy/objspace/std/bytearrayobject.py
@@ -13,8 +13,7 @@
 
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.error import OperationError, oefmt
-from pypy.objspace.std.bytesobject import (
-    getbytevalue, makebytesdata_w, newbytesdata_w)
+from pypy.objspace.std.bytesobject import makebytesdata_w, newbytesdata_w
 from pypy.interpreter.gateway import WrappedDefault, interp2app, unwrap_spec
 from pypy.interpreter.typedef import TypeDef
 from pypy.interpreter.buffer import SimpleBuffer, BinaryBuffer
@@ -392,7 +391,7 @@
                                   slicelength, sequence2, empty_elem='\x00')
         else:
             idx = space.getindex_w(w_index, space.w_IndexError, "bytearray")
-            newvalue = getbytevalue(space, w_other)
+            newvalue = space.byte_w(w_other)
             self._data[self._fixindex(space, idx)] = newvalue
 
     def descr_delitem(self, space, w_idx):
@@ -418,7 +417,7 @@
                              _shrink_after_delete_from_start, self)
 
     def descr_append(self, space, w_item):
-        self._data.append(getbytevalue(space, w_item))
+        self._data.append(space.byte_w(w_item))
 
     def descr_extend(self, space, w_other):
         if isinstance(w_other, W_BytearrayObject):
@@ -428,10 +427,8 @@
 
     def descr_insert(self, space, w_idx, w_other):
         where = space.int_w(w_idx)
-        val = getbytevalue(space, w_other)
-        data = self.getdata()
-        length = len(data)
-        index = get_positive_index(where, length)
+        index = get_positive_index(where, len(self.getdata()))
+        val = space.byte_w(w_other)
         data.insert(index, val)
 
     @unwrap_spec(w_idx=WrappedDefault(-1))
diff --git a/pypy/objspace/std/bytesobject.py b/pypy/objspace/std/bytesobject.py
--- a/pypy/objspace/std/bytesobject.py
+++ b/pypy/objspace/std/bytesobject.py
@@ -542,7 +542,7 @@
                 length = space.len_w(w_source)
                 if jit.isconstant(length) and length == 1:
                     w_item = space.getitem(w_source, space.newint(0))
-                    value = getbytevalue(space, w_item)
+                    value = space.byte_w(w_item)
                     return W_BytesObject(value)
             else:
                 # special-case 'bytes(X)' if X has a __bytes__() method:
@@ -702,13 +702,6 @@
 W_BytesObject.EMPTY = W_BytesObject('')
 
 
-def getbytevalue(space, w_value):
-    value = space.getindex_w(w_value, None)
-    if not 0 <= value < 256:
-        # this includes the OverflowError in case the long is too large
-        raise oefmt(space.w_ValueError, "byte must be in range(0, 256)")
-    return chr(value)
-
 def invoke_bytes_method(space, w_source):
     w_bytes_method = space.lookup(w_source, "__bytes__")
     if w_bytes_method is not None:
@@ -809,7 +802,7 @@
             if not e.match(space, space.w_StopIteration):
                 raise
             break
-        value = getbytevalue(space, w_item)
+        value = space.byte_w(w_item)
         builder.append(value)
     return builder.build()
 

From pypy.commits at gmail.com  Mon Apr 10 14:39:43 2017
From: pypy.commits at gmail.com (rlamy)
Date: Mon, 10 Apr 2017 11:39:43 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Move W_MemoryObject.lookup_dimension()
 to Buffer.get_offset()
Message-ID: <58ebd16f.d4b81c0a.e1371.e984@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91036:21e7a68c528e
Date: 2017-04-10 19:39 +0100
http://bitbucket.org/pypy/pypy/changeset/21e7a68c528e/

Log:	Move W_MemoryObject.lookup_dimension() to Buffer.get_offset()

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -2,6 +2,8 @@
 from rpython.rlib.signature import signature
 from rpython.rlib import types
 
+from pypy.interpreter.error import oefmt
+
 
 class Buffer(object):
     """Abstract base class for buffers."""
@@ -78,15 +80,30 @@
             if copiedbytes >= bytesize:
                 break
 
+    def get_offset(self, space, dim, index):
+        "Convert index at dimension `dim` into a byte offset"
+        shape = self.getshape()
+        nitems = shape[dim]
+        if index < 0:
+            index += nitems
+        if index < 0 or index >= nitems:
+            raise oefmt(space.w_IndexError,
+                "index out of bounds on dimension %d", dim+1)
+        # TODO suboffsets?
+        strides = self.getstrides()
+        return strides[dim] * index
+
+
     def w_getitem(self, space, idx):
+        offset = self.get_offset(space, 0, idx)
         from pypy.module.struct.formatiterator import UnpackFormatIterator
         itemsize = self.getitemsize()
         if itemsize == 1:
-            ch = self.as_binary()[idx]
+            ch = self.as_binary()[offset]
             return space.newint(ord(ch))
         else:
             # TODO: this probably isn't very fast
-            buf = SubBuffer(self.as_binary(), idx, itemsize)
+            buf = SubBuffer(self.as_binary(), offset, itemsize)
             fmtiter = UnpackFormatIterator(space, buf)
             fmtiter.length = buf.getlength()
             fmtiter.interpret(self.getformat())
@@ -94,9 +111,10 @@
 
     def setitem_w(self, space, idx, w_obj):
         from pypy.module.struct.formatiterator import PackFormatIterator
+        offset = self.get_offset(space, 0, idx)
         itemsize = self.getitemsize()
         if itemsize == 1:
-            self.as_binary()[idx] = space.byte_w(w_obj)
+            self.as_binary()[offset] = space.byte_w(w_obj)
         else:
             # TODO: this probably isn't very fast
             fmtiter = PackFormatIterator(space, [w_obj], itemsize)
@@ -107,7 +125,7 @@
                             "memoryview: invalid type for format '%s'",
                             self.getformat())
             byteval = fmtiter.result.build()
-            self.setslice(idx, byteval)
+            self.setslice(offset, byteval)
 
 
 class SimpleBuffer(Buffer):
@@ -145,11 +163,24 @@
     def getstrides(self):
         return [1]
 
+    def get_offset(self, space, dim, index):
+        "Convert index at dimension `dim` into a byte offset"
+        assert dim == 0
+        nitems = self.getlength()
+        if index < 0:
+            index += nitems
+        if index < 0 or index >= nitems:
+            raise oefmt(space.w_IndexError,
+                "index out of bounds on dimension %d", dim + 1)
+        return index
+
     def w_getitem(self, space, idx):
+        idx = self.get_offset(space, 0, idx)
         ch = self.data[idx]
         return space.newint(ord(ch))
 
     def setitem_w(self, space, idx, w_obj):
+        idx = self.get_offset(space, 0, idx)
         self.data[idx] = space.byte_w(w_obj)
 
 
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -158,22 +158,10 @@
         while dim < length:
             w_obj = w_tuple.getitem(space, dim)
             index = space.getindex_w(w_obj, space.w_IndexError)
-            shape = self.buf.getshape()
-            strides = self.buf.getstrides()
-            start = self.lookup_dimension(space, shape, strides, start, dim, index)
+            start += self.buf.get_offset(space, dim, index)
             dim += 1
         return start
 
-    def lookup_dimension(self, space, shape, strides, start, dim, index):
-        nitems = shape[dim]
-        if index < 0:
-            index += nitems
-        if index < 0 or index >= nitems:
-            raise oefmt(space.w_IndexError,
-                "index out of bounds on dimension %d", dim+1)
-        # TODO suboffsets?
-        return start + strides[dim] * index
-
     def _getitem_tuple_indexed(self, space, w_index):
         view = self.buf
 
@@ -219,10 +207,7 @@
             if dim == 0:
                 raise oefmt(space.w_TypeError, "invalid indexing of 0-dim memory")
             elif dim == 1:
-                shape = self.getshape()
-                strides = self.getstrides()
-                idx = self.lookup_dimension(space, shape, strides, 0, 0, start)
-                return self.buf.w_getitem(space, idx)
+                return self.buf.w_getitem(space, start)
             else:
                 raise oefmt(space.w_NotImplementedError, "multi-dimensional sub-views are not implemented")
         elif is_slice:
@@ -263,10 +248,7 @@
         start, stop, step, slicelength = self._decode_index(space, w_index, is_slice)
         itemsize = self.getitemsize()
         if step == 0:  # index only
-            shape = self.getshape()
-            strides = self.getstrides()
-            idx = self.lookup_dimension(space, shape, strides, 0, 0, start)
-            self.buf.setitem_w(space, idx, w_obj)
+            self.buf.setitem_w(space, start, w_obj)
         elif step == 1:
             value = space.buffer_w(w_obj, space.BUF_CONTIG_RO)
             if value.getlength() != slicelength * itemsize:

From pypy.commits at gmail.com  Mon Apr 10 17:59:06 2017
From: pypy.commits at gmail.com (mjacob)
Date: Mon, 10 Apr 2017 14:59:06 -0700 (PDT)
Subject: [pypy-commit] pypy llvm-translation-backend: Implement
 jit_conditional_call_value llop (as a no-op).
Message-ID: <58ec002a.1a9ddf0a.a0dc3.d3d5@mx.google.com>

Author: Manuel Jacob <me at manueljacob.de>
Branch: llvm-translation-backend
Changeset: r91037:fd0b9058b540
Date: 2017-04-10 23:58 +0200
http://bitbucket.org/pypy/pypy/changeset/fd0b9058b540/

Log:	Implement jit_conditional_call_value llop (as a no-op).

diff --git a/rpython/translator/llvm/genllvm.py b/rpython/translator/llvm/genllvm.py
--- a/rpython/translator/llvm/genllvm.py
+++ b/rpython/translator/llvm/genllvm.py
@@ -1494,8 +1494,14 @@
     op_jit_marker = _ignore
     op_jit_ffi_save_result = _ignore
     op_jit_conditional_call = _ignore
+    op_jit_conditional_call_value = _ignore
     op_gc__collect = _ignore
 
+    def op_jit_conditional_call_value(self, result, *args):
+        if result.type is not LLVMVoid:
+            self.w('{result.V} = bitcast {result.T} undef to {result.T}'
+                    .format(**locals()))
+
     def op_jit_force_virtual(self, result, x):
         self._cast(result, x)
 

From pypy.commits at gmail.com  Tue Apr 11 11:29:49 2017
From: pypy.commits at gmail.com (arigo)
Date: Tue, 11 Apr 2017 08:29:49 -0700 (PDT)
Subject: [pypy-commit] cffi default: (dstufft) Don't overwrite a
 user-specified value for Py_LIMITED_API, if
Message-ID: <58ecf66d.c791df0a.286d3.f8f0@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r2925:3948391a4ce9
Date: 2017-04-11 17:29 +0200
http://bitbucket.org/cffi/cffi/changeset/3948391a4ce9/

Log:	(dstufft) Don't overwrite a user-specified value for Py_LIMITED_API,
	if any

diff --git a/cffi/_cffi_include.h b/cffi/_cffi_include.h
--- a/cffi/_cffi_include.h
+++ b/cffi/_cffi_include.h
@@ -8,7 +8,7 @@
    the same works for the other two macros.  Py_DEBUG implies them,
    but not the other way around.
 */
-#ifndef _CFFI_USE_EMBEDDING
+#if !defined(_CFFI_USE_EMBEDDING) && !defined(Py_LIMITED_API)
 #  include <pyconfig.h>
 #  if !defined(Py_DEBUG) && !defined(Py_TRACE_REFS) && !defined(Py_REF_DEBUG)
 #    define Py_LIMITED_API

From pypy.commits at gmail.com  Tue Apr 11 13:09:14 2017
From: pypy.commits at gmail.com (arigo)
Date: Tue, 11 Apr 2017 10:09:14 -0700 (PDT)
Subject: [pypy-commit] pypy default: Fix co_freevars and co_cellvars to
 always list variables in alphabetical
Message-ID: <58ed0dba.898e1c0a.f3fe4.3553@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91038:423026acc94c
Date: 2017-04-11 19:08 +0200
http://bitbucket.org/pypy/pypy/changeset/423026acc94c/

Log:	Fix co_freevars and co_cellvars to always list variables in
	alphabetical order. It seems that some bytecode hacks depend on it
	(or at least getting a consistent order even between different
	functions).

diff --git a/pypy/interpreter/astcompiler/assemble.py b/pypy/interpreter/astcompiler/assemble.py
--- a/pypy/interpreter/astcompiler/assemble.py
+++ b/pypy/interpreter/astcompiler/assemble.py
@@ -7,6 +7,7 @@
 from pypy.interpreter.astcompiler import ast, misc, symtable
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.pycode import PyCode
+from pypy.interpreter.miscutils import string_sort
 from pypy.tool import stdlib_opcode as ops
 
 
@@ -138,9 +139,12 @@
 
 
 def _make_index_dict_filter(syms, flag):
+    names = syms.keys()
+    string_sort(names)   # return cell vars in alphabetical order
     i = 0
     result = {}
-    for name, scope in syms.iteritems():
+    for name in names:
+        scope = syms[name]
         if scope == flag:
             result[name] = i
             i += 1
@@ -170,6 +174,7 @@
         self.var_names = _list_to_dict(scope.varnames)
         self.cell_vars = _make_index_dict_filter(scope.symbols,
                                                  symtable.SCOPE_CELL)
+        string_sort(scope.free_vars)    # return free vars in alphabetical order
         self.free_vars = _list_to_dict(scope.free_vars, len(self.cell_vars))
         self.w_consts = space.newdict()
         self.argcount = 0
diff --git a/pypy/interpreter/astcompiler/symtable.py b/pypy/interpreter/astcompiler/symtable.py
--- a/pypy/interpreter/astcompiler/symtable.py
+++ b/pypy/interpreter/astcompiler/symtable.py
@@ -36,7 +36,7 @@
         self.roles = {}
         self.varnames = []
         self.children = []
-        self.free_vars = []
+        self.free_vars = []    # a bag of names: the order doesn't matter here
         self.temp_name_counter = 1
         self.has_exec = False
         self.has_free = False
diff --git a/pypy/interpreter/miscutils.py b/pypy/interpreter/miscutils.py
--- a/pypy/interpreter/miscutils.py
+++ b/pypy/interpreter/miscutils.py
@@ -2,6 +2,9 @@
 Miscellaneous utilities.
 """
 
+from rpython.rlib.listsort import make_timsort_class
+
+
 class ThreadLocals:
     """Pseudo thread-local storage, for 'space.threadlocals'.
     This is not really thread-local at all; the intention is that the PyPy
@@ -53,3 +56,15 @@
             def set(self, key, value):
                 self._dict[key] = value
         return FakeWeakValueDict()
+
+
+_StringBaseTimSort = make_timsort_class()
+
+class StringSort(_StringBaseTimSort):
+    def lt(self, a, b):
+        return a < b
+
+def string_sort(lst):
+    """Sort a (resizable) list of strings."""
+    sorter = StringSort(lst, len(lst))
+    sorter.sort()
diff --git a/pypy/interpreter/test/test_compiler.py b/pypy/interpreter/test/test_compiler.py
--- a/pypy/interpreter/test/test_compiler.py
+++ b/pypy/interpreter/test/test_compiler.py
@@ -787,6 +787,32 @@
         else:
             assert l1 == l2 == l3 == l4 == [1, 3, 2, 4]
 
+    def test_freevars_order(self):
+        # co_cellvars and co_freevars are guaranteed to appear in
+        # alphabetical order.  See CPython Issue #15368 (which does
+        # not come with tests).
+        source = """if 1:
+        def f1(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15):
+            def g1():
+                return (x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15)
+            return g1
+        def f2(x15,x14,x13,x12,x11,x10,x9,x8,x7,x6,x5,x4,x3,x2,x1):
+            def g2():
+                return (x15,x14,x13,x12,x11,x10,x9,x8,x7,x6,x5,x4,x3,x2,x1)
+            return g2
+        c1 = f1(*range(15)).__code__.co_freevars
+        c2 = f2(*range(15)).__code__.co_freevars
+        r1 = f1.__code__.co_cellvars
+        r2 = f2.__code__.co_cellvars
+        """
+        d = {}
+        exec(source, d)
+        assert d['c1'] == d['c2']
+        # the test above is important for a few bytecode hacks,
+        # but actually we get them in alphabetical order, so check that:
+        assert d['c1'] == tuple(sorted(d['c1']))
+        assert d['r1'] == d['r2'] == d['c1']
+
 
 ##class TestPythonAstCompiler(BaseTestCompiler):
 ##    def setup_method(self, method):
diff --git a/pypy/objspace/std/listobject.py b/pypy/objspace/std/listobject.py
--- a/pypy/objspace/std/listobject.py
+++ b/pypy/objspace/std/listobject.py
@@ -23,6 +23,7 @@
     WrappedDefault, applevel, interp2app, unwrap_spec)
 from pypy.interpreter.signature import Signature
 from pypy.interpreter.typedef import TypeDef
+from pypy.interpreter.miscutils import StringSort
 from pypy.objspace.std.bytesobject import W_BytesObject
 from pypy.objspace.std.floatobject import W_FloatObject
 from pypy.objspace.std.intobject import W_IntObject
@@ -2060,7 +2061,6 @@
 IntBaseTimSort = make_timsort_class()
 FloatBaseTimSort = make_timsort_class()
 IntOrFloatBaseTimSort = make_timsort_class()
-StringBaseTimSort = make_timsort_class()
 UnicodeBaseTimSort = make_timsort_class()
 
 
@@ -2097,11 +2097,6 @@
         return fa < fb
 
 
-class StringSort(StringBaseTimSort):
-    def lt(self, a, b):
-        return a < b
-
-
 class UnicodeSort(UnicodeBaseTimSort):
     def lt(self, a, b):
         return a < b
diff --git a/pypy/objspace/std/typeobject.py b/pypy/objspace/std/typeobject.py
--- a/pypy/objspace/std/typeobject.py
+++ b/pypy/objspace/std/typeobject.py
@@ -1043,7 +1043,7 @@
 
 
 def create_all_slots(w_self, hasoldstylebase, w_bestbase, force_new_layout):
-    from pypy.objspace.std.listobject import StringSort
+    from pypy.interpreter.miscutils import string_sort
 
     base_layout = w_bestbase.layout
     index_next_extra_slot = base_layout.nslots
@@ -1077,8 +1077,7 @@
             else:
                 newslotnames.append(slot_name)
         # Sort the list of names collected so far
-        sorter = StringSort(newslotnames, len(newslotnames))
-        sorter.sort()
+        string_sort(newslotnames)
         # Try to create all slots in order.  The creation of some of
         # them might silently fail; then we delete the name from the
         # list.  At the end, 'index_next_extra_slot' has been advanced

From pypy.commits at gmail.com  Tue Apr 11 13:41:18 2017
From: pypy.commits at gmail.com (rlamy)
Date: Tue, 11 Apr 2017 10:41:18 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Add .getbytes() and .setbytes() to
 Buffer to replace deleted getslice() and setslice()
Message-ID: <58ed153e.d0a2df0a.7cc1.1deb@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91039:3efce1d06791
Date: 2017-04-11 17:32 +0100
http://bitbucket.org/pypy/pypy/changeset/3efce1d06791/

Log:	Add .getbytes() and .setbytes() to Buffer to replace deleted
	getslice() and setslice()

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -1,6 +1,7 @@
 from rpython.rlib.rgc import nonmoving_raw_ptr_for_resizable_list
 from rpython.rlib.signature import signature
 from rpython.rlib import types
+from rpython.rlib.rstruct.error import StructError
 
 from pypy.interpreter.error import oefmt
 
@@ -18,6 +19,15 @@
         "Returns an interp-level string with the whole content of the buffer."
         return ''.join(self._copy_buffer())
 
+    def getbytes(self, start, stop, step, size):
+        # May be overridden.  No bounds checks.
+        return ''.join([self.getitem(i) for i in range(start, stop, step)])
+
+    def setbytes(self, start, string):
+        # May be overridden.  No bounds checks.
+        for i in range(len(string)):
+            self.setitem(start + i, string[i])
+
     def get_raw_address(self):
         raise ValueError("no raw buffer")
 
@@ -46,7 +56,7 @@
     def _copy_buffer(self):
         if self.getndim() == 0:
             itemsize = self.getitemsize()
-            return [self.getslice(0, itemsize, 1, itemsize)]
+            return [self.getbytes(0, itemsize, 1, itemsize)]
         data = []
         self._copy_rec(0, data, 0)
         return data
@@ -72,7 +82,7 @@
         bytesize = self.getlength()
         copiedbytes = 0
         for i in range(step):
-            bytes = self.getslice(off, off+itemsize, 1, itemsize)
+            bytes = self.getbytes(off, off+itemsize, 1, itemsize)
             data.append(bytes)
             copiedbytes += len(bytes)
             off += strides[0]
@@ -125,7 +135,7 @@
                             "memoryview: invalid type for format '%s'",
                             self.getformat())
             byteval = fmtiter.result.build()
-            self.setslice(offset, byteval)
+            self.setbytes(offset, byteval)
 
 
 class SimpleBuffer(Buffer):
@@ -142,6 +152,13 @@
     def as_str(self):
         return self.data.as_str()
 
+    def getbytes(self, start, stop, step, size):
+        assert step == 1
+        return self.data[start:stop]
+
+    def setbytes(self, offset, s):
+        self.data.setslice(offset, s)
+
     def get_raw_address(self):
         return self.data.get_raw_address()
 
diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -380,8 +380,13 @@
     def getlength(self):
         return self.size
 
-    def getitem(self, index):
-        return self.ptr[index]
+    def getbytes(self, start, stop, step, size):
+        return ''.join([self.ptr[i] for i in range(start, stop, step)])
+
+    def setbytes(self, start, string):
+        # absolutely no safety checks, what could go wrong?
+        for i in range(len(string)):
+            self.ptr[start + i] = string[i]
 
     def get_raw_address(self):
         return rffi.cast(rffi.CCHARP, self.ptr)
@@ -401,10 +406,6 @@
     def getndim(self):
         return self.ndim
 
-    def setitem(self, index, char):
-        # absolutely no safety checks, what could go wrong?
-        self.ptr[index] = char
-
 class FQ(rgc.FinalizerQueue):
     Class = CPyBuffer
     def finalizer_trigger(self):
diff --git a/pypy/objspace/std/bytearrayobject.py b/pypy/objspace/std/bytearrayobject.py
--- a/pypy/objspace/std/bytearrayobject.py
+++ b/pypy/objspace/std/bytearrayobject.py
@@ -427,7 +427,8 @@
 
     def descr_insert(self, space, w_idx, w_other):
         where = space.int_w(w_idx)
-        index = get_positive_index(where, len(self.getdata()))
+        data = self.getdata()
+        index = get_positive_index(where, len(data))
         val = space.byte_w(w_other)
         data.insert(index, val)
 
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -4,7 +4,6 @@
 import operator
 
 from rpython.rlib.objectmodel import compute_hash
-from rpython.rlib.rstruct.error import StructError
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.buffer import Buffer, SubBuffer
 from pypy.interpreter.error import OperationError, oefmt
@@ -254,7 +253,7 @@
             if value.getlength() != slicelength * itemsize:
                 raise oefmt(space.w_ValueError,
                             "cannot modify size of memoryview object")
-            self.buf.setslice(start * itemsize, value.as_str())
+            self.buf.setbytes(start * itemsize, value.as_str())
         else:
             if self.getndim() != 1:
                 raise oefmt(space.w_NotImplementedError,
@@ -274,7 +273,7 @@
             src_shape0 = slicelength
             src_stride0 = src.getstrides()[0]
             for i in range(src_shape0):
-                data.append(src.getslice(off,off+itemsize,1,itemsize))
+                data.append(src.getbytes(off,off+itemsize,1,itemsize))
                 off += src_stride0
             off = 0
             dst_stride0 = self.getstrides()[0] * step
@@ -655,6 +654,19 @@
     def getlength(self):
         return self.shape[0] * self.getitemsize()
 
+    def getbytes(self, start, stop, step, size):
+        if start == stop:
+            return ''     # otherwise, adding self.offset might make them
+                          # out of bounds
+        return self.buf.getbytes(self.offset + start, self.offset + stop,
+                                    step, size)
+
+    def setbytes(self, start, string):
+        if len(string) == 0:
+            return        # otherwise, adding self.offset might make 'start'
+                          # out of bounds
+        self.buf.setbytes(self.offset + start, string)
+
     def get_raw_address(self):
         from rpython.rtyper.lltypesystem import rffi
         ptr = self.buf.get_raw_address()
@@ -689,6 +701,12 @@
     def as_str_and_offset_maybe(self):
         return self.parent.as_str_and_offset_maybe()
 
+    def getbytes(self, start, stop, step, size):
+        return self.parent.getbytes(start, stop, step, size)
+
+    def setbytes(self, start, string):
+        self.parent.setbytes(start, string)
+
     def get_raw_address(self):
         return self.parent.get_raw_address()
 

From pypy.commits at gmail.com  Tue Apr 11 13:41:20 2017
From: pypy.commits at gmail.com (rlamy)
Date: Tue, 11 Apr 2017 10:41:20 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: fix BufferSlice.w_getitem()
Message-ID: <58ed1540.184a1c0a.f6dec.37bd@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91040:459611e8d6b4
Date: 2017-04-11 17:58 +0100
http://bitbucket.org/pypy/pypy/changeset/459611e8d6b4/

Log:	fix BufferSlice.w_getitem()

diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -687,6 +687,15 @@
     def getstrides(self):
         return self.strides
 
+    def parent_index(self, idx):
+        return self.offset + self.step * idx
+
+    def w_getitem(self, space, idx):
+        return self.buf.w_getitem(space, self.parent_index(idx))
+
+    def setitem_w(self, space, idx, w_obj):
+        return self.buf.setitem_w(space, self.parent_index(idx), w_obj)
+
 
 class BufferViewBase(Buffer):
     _immutable_ = True

From pypy.commits at gmail.com  Tue Apr 11 13:41:22 2017
From: pypy.commits at gmail.com (rlamy)
Date: Tue, 11 Apr 2017 10:41:22 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Fix tolist() on 1-D buffers
Message-ID: <58ed1542.2483df0a.4e0d7.10bf@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91041:4d42369e2fb3
Date: 2017-04-11 18:40 +0100
http://bitbucket.org/pypy/pypy/changeset/4d42369e2fb3/

Log:	Fix tolist() on 1-D buffers

diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -104,8 +104,9 @@
             raise NotImplementedError
         elif dim == 1:
             itemsize = self.getitemsize()
-            return self._tolist(space, buf.as_binary(), self.getlength(), itemsize, fmt,
-                                self.getstrides())
+            n = self.getshape()[0]
+            values_w = [buf.w_getitem(space, i) for i in range(n)]
+            return space.newlist(values_w)
         else:
             return self._tolist_rec(space, buf.as_binary(), 0, 0, fmt)
 

From pypy.commits at gmail.com  Tue Apr 11 15:55:06 2017
From: pypy.commits at gmail.com (tobweber)
Date: Tue, 11 Apr 2017 12:55:06 -0700 (PDT)
Subject: [pypy-commit] stmgc c8-long-transactions: Log single thread mode
 changes
Message-ID: <58ed349a.d0a2df0a.7cc1.48f7@mx.google.com>

Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-long-transactions
Changeset: r2040:f7c0d9ef8692
Date: 2017-04-10 15:04 +0200
http://bitbucket.org/pypy/stmgc/changeset/f7c0d9ef8692/

Log:	Log single thread mode changes

diff --git a/c8/stm/nursery.c b/c8/stm/nursery.c
--- a/c8/stm/nursery.c
+++ b/c8/stm/nursery.c
@@ -25,9 +25,11 @@
 static void start_single_thread_mode(void) {
     stm_single_thread_mode_active = true;
     stm_fill_mark_nursery_bytes = SINGLE_THREAD_MODE_FILL_MARK_NURSERY_BYTES;
+    timing_event(STM_SEGMENT->running_thread, STM_SINGLE_THREAD_MODE_ON);
 }
 
 static void end_single_thread_mode(void) {
+    timing_event(STM_SEGMENT->running_thread, STM_SINGLE_THREAD_MODE_OFF);
     stm_fill_mark_nursery_bytes = DEFAULT_FILL_MARK_NURSERY_BYTES;
     stm_single_thread_mode_active = false;
 }
diff --git a/c8/stmgc.h b/c8/stmgc.h
--- a/c8/stmgc.h
+++ b/c8/stmgc.h
@@ -585,6 +585,9 @@
     STM_DURATION_MAJOR_GC_LOG_ONLY,
     STM_DURATION_MAJOR_GC_FULL,
 
+    STM_SINGLE_THREAD_MODE_ON,
+    STM_SINGLE_THREAD_MODE_OFF,
+
     _STM_EVENT_N
 };
 

From pypy.commits at gmail.com  Tue Apr 11 15:55:04 2017
From: pypy.commits at gmail.com (tobweber)
Date: Tue, 11 Apr 2017 12:55:04 -0700 (PDT)
Subject: [pypy-commit] stmgc c8-long-transactions: Implement simple single
 thread mode that is activated if there are two or less segments in use at
 transaction start and sets the nursery mark to a large number,
 thereby reducing the number of commits
Message-ID: <58ed3498.582d1c0a.13d1.6286@mx.google.com>

Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-long-transactions
Changeset: r2039:1b47d69c4988
Date: 2017-04-10 11:06 +0200
http://bitbucket.org/pypy/stmgc/changeset/1b47d69c4988/

Log:	Implement simple single thread mode that is activated if there are
	two or less segments in use at transaction start and sets the
	nursery mark to a large number, thereby reducing the number of
	commits

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -1163,6 +1163,12 @@
 
     if (repeat_count == 0) {  /* else, 'nursery_mark' was already set
                                  in abort_data_structures_from_segment_num() */
+        if (number_of_segments_in_use() <= 2) {
+            /* TODO two is a hack b/c benchmarks have a main thread */
+            start_single_thread_mode();
+        } else if (stm_single_thread_mode_active) {
+            end_single_thread_mode();
+        }
         STM_SEGMENT->nursery_mark = ((stm_char *)_stm_nursery_start +
                                      stm_fill_mark_nursery_bytes);
     }
diff --git a/c8/stm/nursery.c b/c8/stm/nursery.c
--- a/c8/stm/nursery.c
+++ b/c8/stm/nursery.c
@@ -13,13 +13,24 @@
 
 static uintptr_t _stm_nursery_start;
 
+static bool stm_single_thread_mode_active = false;
 
-#define DEFAULT_FILL_MARK_NURSERY_BYTES   (NURSERY_SIZE / 4)
+#define SINGLE_THREAD_MODE_FILL_MARK_NURSERY_BYTES  (NURSERY_SIZE * 9999)
+#define DEFAULT_FILL_MARK_NURSERY_BYTES             (NURSERY_SIZE / 4)
 
 uintptr_t stm_fill_mark_nursery_bytes = DEFAULT_FILL_MARK_NURSERY_BYTES;
 
 /************************************************************/
 
+static void start_single_thread_mode(void) {
+    stm_single_thread_mode_active = true;
+    stm_fill_mark_nursery_bytes = SINGLE_THREAD_MODE_FILL_MARK_NURSERY_BYTES;
+}
+
+static void end_single_thread_mode(void) {
+    stm_fill_mark_nursery_bytes = DEFAULT_FILL_MARK_NURSERY_BYTES;
+    stm_single_thread_mode_active = false;
+}
 
 static void setup_nursery(void)
 {
diff --git a/c8/stm/nursery.h b/c8/stm/nursery.h
--- a/c8/stm/nursery.h
+++ b/c8/stm/nursery.h
@@ -9,6 +9,9 @@
 
 static uint32_t highest_overflow_number;
 
+static void start_single_thread_mode(void);
+static void end_single_thread_mode(void);
+
 static void _cards_cleared_in_object(struct stm_priv_segment_info_s *pseg, object_t *obj,
                                      bool strict);
 static void _reset_object_cards(struct stm_priv_segment_info_s *pseg,
diff --git a/c8/stm/sync.c b/c8/stm/sync.c
--- a/c8/stm/sync.c
+++ b/c8/stm/sync.c
@@ -176,6 +176,16 @@
 
 /************************************************************/
 
+static uint8_t number_of_segments_in_use(void) {
+    uint8_t result = 0;
+    int num;
+    for (num = 1; num < NB_SEGMENTS; num++) {
+        if (sync_ctl.in_use1[num] > 0) {
+            result++;
+        }
+    }
+    return result;
+}
 
 #if 0
 void stm_wait_for_current_inevitable_transaction(void)
@@ -202,7 +212,6 @@
 }
 #endif
 
-
 static void acquire_thread_segment(stm_thread_local_t *tl)
 {
     /* This function acquires a segment for the currently running thread,
diff --git a/c8/stm/sync.h b/c8/stm/sync.h
--- a/c8/stm/sync.h
+++ b/c8/stm/sync.h
@@ -22,6 +22,7 @@
 static void set_gs_register(char *value);
 static void ensure_gs_register(long segnum);
 
+static uint8_t number_of_segments_in_use(void);
 
 /* acquire and release one of the segments for running the given thread
    (must have the mutex acquired!) */

From pypy.commits at gmail.com  Tue Apr 11 15:55:07 2017
From: pypy.commits at gmail.com (tobweber)
Date: Tue, 11 Apr 2017 12:55:07 -0700 (PDT)
Subject: [pypy-commit] stmgc c8-long-transactions: Add debug output and
 minor refactorings
Message-ID: <58ed349b.c3a4df0a.fa877.4394@mx.google.com>

Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-long-transactions
Changeset: r2041:9fd6311549e1
Date: 2017-04-11 21:54 +0200
http://bitbucket.org/pypy/stmgc/changeset/9fd6311549e1/

Log:	Add debug output and minor refactorings

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -1163,8 +1163,12 @@
 
     if (repeat_count == 0) {  /* else, 'nursery_mark' was already set
                                  in abort_data_structures_from_segment_num() */
-        if (number_of_segments_in_use() <= 2) {
-            /* TODO two is a hack b/c benchmarks have a main thread */
+        int segments_in_use = number_of_segments_in_use();
+        int single_thread_mode_segments_in_use_limit = 2;
+        dprintf((((segments_in_use <= single_thread_mode_segments_in_use_limit) ?
+                "can activate 1TM (%d segments)\n" : "cannot activate 1TM (%d segments)\n"),
+                segments_in_use));
+        if (segments_in_use <= single_thread_mode_segments_in_use_limit) {
             start_single_thread_mode();
         } else if (stm_single_thread_mode_active) {
             end_single_thread_mode();
diff --git a/c8/stm/nursery.c b/c8/stm/nursery.c
--- a/c8/stm/nursery.c
+++ b/c8/stm/nursery.c
@@ -15,7 +15,7 @@
 
 static bool stm_single_thread_mode_active = false;
 
-#define SINGLE_THREAD_MODE_FILL_MARK_NURSERY_BYTES  (NURSERY_SIZE * 9999)
+#define SINGLE_THREAD_MODE_FILL_MARK_NURSERY_BYTES  (NURSERY_SIZE * 500000)
 #define DEFAULT_FILL_MARK_NURSERY_BYTES             (NURSERY_SIZE / 4)
 
 uintptr_t stm_fill_mark_nursery_bytes = DEFAULT_FILL_MARK_NURSERY_BYTES;
@@ -26,12 +26,14 @@
     stm_single_thread_mode_active = true;
     stm_fill_mark_nursery_bytes = SINGLE_THREAD_MODE_FILL_MARK_NURSERY_BYTES;
     timing_event(STM_SEGMENT->running_thread, STM_SINGLE_THREAD_MODE_ON);
+    dprintf(("single thread mode ON\n"));
 }
 
 static void end_single_thread_mode(void) {
     timing_event(STM_SEGMENT->running_thread, STM_SINGLE_THREAD_MODE_OFF);
     stm_fill_mark_nursery_bytes = DEFAULT_FILL_MARK_NURSERY_BYTES;
     stm_single_thread_mode_active = false;
+    dprintf(("single thread mode OFF\n"));
 }
 
 static void setup_nursery(void)
diff --git a/c8/stm/sync.c b/c8/stm/sync.c
--- a/c8/stm/sync.c
+++ b/c8/stm/sync.c
@@ -176,8 +176,8 @@
 
 /************************************************************/
 
-static uint8_t number_of_segments_in_use(void) {
-    uint8_t result = 0;
+static int number_of_segments_in_use(void) {
+    int result = 0;
     int num;
     for (num = 1; num < NB_SEGMENTS; num++) {
         if (sync_ctl.in_use1[num] > 0) {
diff --git a/c8/stm/sync.h b/c8/stm/sync.h
--- a/c8/stm/sync.h
+++ b/c8/stm/sync.h
@@ -22,7 +22,7 @@
 static void set_gs_register(char *value);
 static void ensure_gs_register(long segnum);
 
-static uint8_t number_of_segments_in_use(void);
+static int number_of_segments_in_use(void);
 
 /* acquire and release one of the segments for running the given thread
    (must have the mutex acquired!) */

From pypy.commits at gmail.com  Wed Apr 12 04:16:32 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 12 Apr 2017 01:16:32 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: pathlib.mkdir(): apply the fixes done in
 CPython > 3.5, and apply on
Message-ID: <58ede260.02b3df0a.176bb.b5a1@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r91042:d944ef8c8aa0
Date: 2017-04-12 10:15 +0200
http://bitbucket.org/pypy/pypy/changeset/d944ef8c8aa0/

Log:	pathlib.mkdir(): apply the fixes done in CPython > 3.5, and apply on
	top of that the fix for CPython issue #29694

diff --git a/lib-python/3/pathlib.py b/lib-python/3/pathlib.py
--- a/lib-python/3/pathlib.py
+++ b/lib-python/3/pathlib.py
@@ -1209,23 +1209,19 @@
     def mkdir(self, mode=0o777, parents=False, exist_ok=False):
         if self._closed:
             self._raise_closed()
-        if not parents:
-            try:
-                self._accessor.mkdir(self, mode)
-            except FileExistsError:
-                if not exist_ok or not self.is_dir():
-                    raise
-        else:
-            try:
-                self._accessor.mkdir(self, mode)
-            except FileExistsError:
-                if not exist_ok or not self.is_dir():
-                    raise
-            except OSError as e:
-                if e.errno != ENOENT:
-                    raise
-                self.parent.mkdir(parents=True)
-                self._accessor.mkdir(self, mode)
+        # NOTE: version from CPython 3.7 plus fix at issue #29694
+        try:
+            self._accessor.mkdir(self, mode)
+        except FileNotFoundError:
+            if not parents or self.parent == self:
+                raise
+            self.parent.mkdir(parents=True, exist_ok=True)
+            self.mkdir(mode, parents=False, exist_ok=exist_ok)
+        except OSError:
+            # Cannot rely on checking for EEXIST, since the operating system
+            # could give priority to other errors like EACCES or EROFS
+            if not exist_ok or not self.is_dir():
+                raise
 
     def chmod(self, mode):
         """
diff --git a/lib-python/3/test/test_pathlib.py b/lib-python/3/test/test_pathlib.py
--- a/lib-python/3/test/test_pathlib.py
+++ b/lib-python/3/test/test_pathlib.py
@@ -8,6 +8,7 @@
 import stat
 import tempfile
 import unittest
+from unittest import mock
 
 from test import support
 TESTFN = support.TESTFN
@@ -1751,6 +1752,36 @@
             p.mkdir(exist_ok=True)
         self.assertEqual(cm.exception.errno, errno.EEXIST)
 
+    def test_mkdir_concurrent_parent_creation(self):
+        for pattern_num in range(32):
+            p = self.cls(BASE, 'dirCPC%d' % pattern_num)
+            self.assertFalse(p.exists())
+
+            def my_mkdir(path, mode=0o777):
+                path = str(path)
+                # Emulate another process that would create the directory
+                # just before we try to create it ourselves.  We do it
+                # in all possible pattern combinations, assuming that this
+                # function is called at most 5 times (dirCPC/dir1/dir2,
+                # dirCPC/dir1, dirCPC, dirCPC/dir1, cirCPC/dir1/dir2).
+                if pattern.pop():
+                    os.mkdir(path, mode)      # from another process
+                    concurrently_created.add(path)
+                os.mkdir(path, mode)          # our real call
+            org_mkdir = pathlib._normal_accessor.mkdir
+
+            pattern = [bool(pattern_num & (1 << n)) for n in range(5)]
+            concurrently_created = set()
+            p12 = p / 'dir1' / 'dir2'
+            try:
+                with mock.patch("pathlib._normal_accessor.mkdir", my_mkdir):
+                    p12.mkdir(parents=True, exist_ok=False)
+                got_exception = False
+            except FileExistsError:
+                got_exception = True
+            self.assertEqual(str(p12) in concurrently_created, got_exception)
+            self.assertTrue(p.exists())
+
     @with_symlinks
     def test_symlink_to(self):
         P = self.cls(BASE)

From pypy.commits at gmail.com  Wed Apr 12 10:17:48 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 12 Apr 2017 07:17:48 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Update from feedback
Message-ID: <58ee370c.011c190a.30e8c.7280@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r91043:a25d530e6773
Date: 2017-04-12 16:17 +0200
http://bitbucket.org/pypy/pypy/changeset/a25d530e6773/

Log:	Update from feedback

diff --git a/lib-python/3/test/test_pathlib.py b/lib-python/3/test/test_pathlib.py
--- a/lib-python/3/test/test_pathlib.py
+++ b/lib-python/3/test/test_pathlib.py
@@ -1768,7 +1768,6 @@
                     os.mkdir(path, mode)      # from another process
                     concurrently_created.add(path)
                 os.mkdir(path, mode)          # our real call
-            org_mkdir = pathlib._normal_accessor.mkdir
 
             pattern = [bool(pattern_num & (1 << n)) for n in range(5)]
             concurrently_created = set()
@@ -1776,10 +1775,10 @@
             try:
                 with mock.patch("pathlib._normal_accessor.mkdir", my_mkdir):
                     p12.mkdir(parents=True, exist_ok=False)
-                got_exception = False
             except FileExistsError:
-                got_exception = True
-            self.assertEqual(str(p12) in concurrently_created, got_exception)
+                self.assertIn(str(p12), concurrently_created)
+            else:
+                self.assertNotIn(str(p12), concurrently_created)
             self.assertTrue(p.exists())
 
     @with_symlinks

From pypy.commits at gmail.com  Wed Apr 12 13:50:53 2017
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 12 Apr 2017 10:50:53 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Move tolist() implementation from
 W_MemoryObject to Buffer
Message-ID: <58ee68fd.455c2e0a.28ca2.b632@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91044:23f969f08eb4
Date: 2017-04-12 00:12 +0100
http://bitbucket.org/pypy/pypy/changeset/23f969f08eb4/

Log:	Move tolist() implementation from W_MemoryObject to Buffer

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -105,8 +105,8 @@
 
 
     def w_getitem(self, space, idx):
+        from pypy.module.struct.formatiterator import UnpackFormatIterator
         offset = self.get_offset(space, 0, idx)
-        from pypy.module.struct.formatiterator import UnpackFormatIterator
         itemsize = self.getitemsize()
         if itemsize == 1:
             ch = self.as_binary()[offset]
@@ -137,6 +137,54 @@
             byteval = fmtiter.result.build()
             self.setbytes(offset, byteval)
 
+    def w_tolist(self, space):
+        dim = self.getndim()
+        fmt = self.getformat()
+        if dim == 0:
+            raise NotImplementedError
+        elif dim == 1:
+            n = self.getshape()[0]
+            values_w = [self.w_getitem(space, i) for i in range(n)]
+            return space.newlist(values_w)
+        else:
+            return self._tolist_rec(space, self.as_binary(), 0, 0, fmt)
+
+    def _tolist(self, space, buf, bytecount, itemsize, fmt, strides=None):
+        from pypy.module.struct.formatiterator import UnpackFormatIterator
+        # TODO: this probably isn't very fast
+        count = bytecount // itemsize
+        fmtiter = UnpackFormatIterator(space, buf)
+        # patch the length, necessary buffer might have offset
+        # which leads to wrong length calculation if e.g. the
+        # memoryview is reversed
+        fmtiter.length = bytecount
+        fmtiter.strides = strides
+        fmtiter.interpret(fmt * count)
+        return space.newlist(fmtiter.result_w)
+
+    def _tolist_rec(self, space, buf, start, idim, fmt):
+        strides = self.getstrides()
+        shape = self.getshape()
+        #
+        dim = idim + 1
+        stride = strides[idim]
+        itemsize = self.getitemsize()
+        dimshape = shape[idim]
+        #
+        if dim >= self.getndim():
+            bytecount = (stride * dimshape)
+            return self._tolist(space, buf, bytecount, itemsize, fmt, [stride])
+        items = [None] * dimshape
+
+        orig_buf = buf
+        for i in range(dimshape):
+            buf = SubBuffer(orig_buf, start, stride)
+            item = self._tolist_rec(space, buf, start, idim + 1, fmt)
+            items[i] = item
+            start += stride
+
+        return space.newlist(items)
+
 
 class SimpleBuffer(Buffer):
     _attrs_ = ['readonly', 'data']
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -96,55 +96,7 @@
 
     def descr_tolist(self, space):
         self._check_released(space)
-
-        buf = self.buf
-        dim = self.getndim()
-        fmt = self.getformat()
-        if dim == 0:
-            raise NotImplementedError
-        elif dim == 1:
-            itemsize = self.getitemsize()
-            n = self.getshape()[0]
-            values_w = [buf.w_getitem(space, i) for i in range(n)]
-            return space.newlist(values_w)
-        else:
-            return self._tolist_rec(space, buf.as_binary(), 0, 0, fmt)
-
-    def _tolist(self, space, buf, bytecount, itemsize, fmt, strides=None):
-        # TODO: this probably isn't very fast
-        count = bytecount // itemsize
-        fmtiter = UnpackFormatIterator(space, buf)
-        # patch the length, necessary buffer might have offset
-        # which leads to wrong length calculation if e.g. the
-        # memoryview is reversed
-        fmtiter.length = bytecount
-        fmtiter.strides = strides
-        fmtiter.interpret(fmt * count)
-        return space.newlist(fmtiter.result_w)
-
-    def _tolist_rec(self, space, buf, start, idim, fmt):
-        strides = self.getstrides()
-        shape = self.getshape()
-        #
-        dim = idim+1
-        stride = strides[idim]
-        itemsize = self.getitemsize()
-        dimshape = shape[idim]
-        #
-        if dim >= self.getndim():
-            bytecount = (stride * dimshape)
-            return self._tolist(space, buf, bytecount, itemsize, fmt, [stride])
-        items = [None] * dimshape
-
-        orig_buf = buf
-        for i in range(dimshape):
-            buf = SubBuffer(orig_buf, start, stride)
-            item = self._tolist_rec(space, buf, start, idim+1, fmt)
-            items[i] = item
-            start += stride
-
-        return space.newlist(items)
-
+        return self.buf.w_tolist(space)
 
     def _start_from_tuple(self, space, w_tuple):
         from pypy.objspace.std.tupleobject import W_AbstractTupleObject

From pypy.commits at gmail.com  Wed Apr 12 13:50:57 2017
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 12 Apr 2017 10:50:57 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: clean up ArrayBuffer
Message-ID: <58ee6901.1f002e0a.54226.8c3a@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91046:a2ed7ebe5863
Date: 2017-04-12 18:50 +0100
http://bitbucket.org/pypy/pypy/changeset/a2ed7ebe5863/

Log:	clean up ArrayBuffer

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -20,13 +20,10 @@
         return ''.join(self._copy_buffer())
 
     def getbytes(self, start, stop, step, size):
-        # May be overridden.  No bounds checks.
-        return ''.join([self.getitem(i) for i in range(start, stop, step)])
+        raise NotImplementedError
 
     def setbytes(self, start, string):
-        # May be overridden.  No bounds checks.
-        for i in range(len(string)):
-            self.setitem(start + i, string[i])
+        raise NotImplementedError
 
     def get_raw_address(self):
         raise ValueError("no raw buffer")
diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -897,17 +897,11 @@
     def as_str(self):
         return self.data.as_str()
 
-    def getitem(self, index):
-        return self.data.getitem(index)
-
-    def setitem(self, index, value):
-        return self.data.setitem(index, value)
-
-    def getslice(self, start, stop, step, size):
+    def getbytes(self, start, stop, step, size):
         return self.data.getslice(start, stop, step, size)
 
-    def setslice(self, start, string):
-        self.data.setslice(start, string)
+    def setbytes(self, offset, s):
+        return self.data.setslice(offset, s)
 
     def getformat(self):
         return self.fmt

From pypy.commits at gmail.com  Wed Apr 12 13:50:55 2017
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 12 Apr 2017 10:50:55 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Rename Buffer to PyBuffer
Message-ID: <58ee68ff.51512e0a.f61bc.8368@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91045:96ffa9bf2352
Date: 2017-04-12 18:06 +0100
http://bitbucket.org/pypy/pypy/changeset/96ffa9bf2352/

Log:	Rename Buffer to PyBuffer

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -6,7 +6,7 @@
 from pypy.interpreter.error import oefmt
 
 
-class Buffer(object):
+class PyBuffer(object):
     """Abstract base class for buffers."""
     _attrs_ = ['readonly']
     _immutable_ = True
@@ -186,7 +186,7 @@
         return space.newlist(items)
 
 
-class SimpleBuffer(Buffer):
+class SimpleBuffer(PyBuffer):
     _attrs_ = ['readonly', 'data']
     _immutable_ = True
 
diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -6,7 +6,7 @@
 from rpython.rtyper.lltypesystem import lltype, rffi
 from rpython.rtyper.lltypesystem.rstr import copy_string_to_raw
 
-from pypy.interpreter.buffer import Buffer, BinaryBuffer
+from pypy.interpreter.buffer import PyBuffer, BinaryBuffer
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.gateway import (
@@ -882,7 +882,7 @@
         return self.w_array._charbuf_start()
 
 
-class ArrayBuffer(Buffer):
+class ArrayBuffer(PyBuffer):
     _immutable_ = True
 
     def __init__(self, data, fmt, itemsize, readonly):
diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -19,7 +19,7 @@
 from pypy.module.cpyext.memoryobject import fill_Py_buffer
 from pypy.module.cpyext.state import State
 from pypy.module.cpyext import userslot
-from pypy.interpreter.buffer import Buffer
+from pypy.interpreter.buffer import PyBuffer
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.argument import Arguments
 from rpython.rlib.unroll import unrolling_iterable
@@ -313,7 +313,7 @@
         space.fromcache(State).check_and_raise_exception(always=True)
     return space.newint(res)
 
-class CPyBuffer(Buffer):
+class CPyBuffer(PyBuffer):
     # Similar to Py_buffer
     _immutable_ = True
 
diff --git a/pypy/module/micronumpy/concrete.py b/pypy/module/micronumpy/concrete.py
--- a/pypy/module/micronumpy/concrete.py
+++ b/pypy/module/micronumpy/concrete.py
@@ -1,4 +1,4 @@
-from pypy.interpreter.buffer import Buffer
+from pypy.interpreter.buffer import PyBuffer
 from pypy.interpreter.error import oefmt
 from rpython.rlib import jit, rgc
 from rpython.rlib.rarithmetic import ovfcheck
@@ -702,7 +702,7 @@
         free_raw_storage(self.storage)
 
 
-class ArrayBuffer(Buffer):
+class ArrayBuffer(PyBuffer):
     _immutable_ = True
 
     def __init__(self, impl, readonly):
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -1,11 +1,11 @@
 """
-Implementation of the 'buffer' and 'memoryview' types.
+Implementation of the 'memoryview' type.
 """
 import operator
 
 from rpython.rlib.objectmodel import compute_hash
 from pypy.interpreter.baseobjspace import W_Root
-from pypy.interpreter.buffer import Buffer, SubBuffer
+from pypy.interpreter.buffer import PyBuffer, SubBuffer
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.gateway import interp2app
 from pypy.interpreter.typedef import TypeDef, GetSetProperty,  make_weakref_descr
@@ -27,7 +27,7 @@
     """
 
     def __init__(self, buf):
-        assert isinstance(buf, Buffer)
+        assert isinstance(buf, PyBuffer)
         self.buf = buf
         self._hash = -1
         self.flags = 0
@@ -347,7 +347,7 @@
         return size
 
     def _zero_in_shape(self):
-        # this method could be moved to the class Buffer
+        # this method could be moved to the class PyBuffer
         buf = self.buf
         shape = buf.getshape()
         for i in range(buf.getndim()):
@@ -590,7 +590,7 @@
                 _IsFortranContiguous(ndim, shape, strides, itemsize))
     return 0
 
-class BufferSlice(Buffer):
+class BufferSlice(PyBuffer):
     _immutable_ = True
     _attrs_ = ['buf', 'readonly', 'shape', 'strides', 'offset', 'step']
     def __init__(self, buf, start, step, length):
@@ -650,7 +650,7 @@
         return self.buf.setitem_w(space, self.parent_index(idx), w_obj)
 
 
-class BufferViewBase(Buffer):
+class BufferViewBase(PyBuffer):
     _immutable_ = True
     _attrs_ = ['readonly', 'parent']
 
diff --git a/pypy/objspace/std/test/test_memoryobject.py b/pypy/objspace/std/test/test_memoryobject.py
--- a/pypy/objspace/std/test/test_memoryobject.py
+++ b/pypy/objspace/std/test/test_memoryobject.py
@@ -4,7 +4,7 @@
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.gateway import interp2app
 from pypy.interpreter.typedef import TypeDef
-from pypy.interpreter.buffer import Buffer
+from pypy.interpreter.buffer import PyBuffer
 from pypy.conftest import option
 
 class AppTestMemoryView:
@@ -292,7 +292,7 @@
         assert (m[0], m[1], m[2], m[3]) == expected
         a.free()
 
-class MockBuffer(Buffer):
+class MockBuffer(PyBuffer):
     def __init__(self, space, w_arr, w_dim, w_fmt, \
                  w_itemsize, w_strides, w_shape):
         self.space = space
diff --git a/pypy/objspace/std/unicodeobject.py b/pypy/objspace/std/unicodeobject.py
--- a/pypy/objspace/std/unicodeobject.py
+++ b/pypy/objspace/std/unicodeobject.py
@@ -12,7 +12,6 @@
 
 from pypy.interpreter import unicodehelper
 from pypy.interpreter.baseobjspace import W_Root
-from pypy.interpreter.buffer import StringBuffer
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.gateway import WrappedDefault, interp2app, unwrap_spec
 from pypy.interpreter.typedef import TypeDef

From pypy.commits at gmail.com  Wed Apr 12 14:54:09 2017
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 12 Apr 2017 11:54:09 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: fix translation
Message-ID: <58ee77d1.17542e0a.83b39.8de1@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91047:2a790c6d7613
Date: 2017-04-12 19:53 +0100
http://bitbucket.org/pypy/pypy/changeset/2a790c6d7613/

Log:	fix translation

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -284,6 +284,7 @@
         # May be overridden.  No bounds checks.
         return ''.join([self.getitem(i) for i in range(start, stop, step)])
 
+    @signature(types.any(), types.int(), types.int(), returns=types.str())
     def __getslice__(self, start, stop):
         return self.getslice(start, stop, 1, stop - start)
 
diff --git a/pypy/module/_cffi_backend/cbuffer.py b/pypy/module/_cffi_backend/cbuffer.py
--- a/pypy/module/_cffi_backend/cbuffer.py
+++ b/pypy/module/_cffi_backend/cbuffer.py
@@ -65,7 +65,7 @@
                                                       self.buffer.getlength())
         if step not in (0, 1):
             raise oefmt(space.w_NotImplementedError, "")
-        value = space.buffer_w(w_newstring, space.BUF_CONTIG_RO)
+        value = space.buffer_w(w_newstring, space.BUF_CONTIG_RO).as_binary()
         if value.getlength() != size:
             raise oefmt(space.w_ValueError,
                         "cannot modify size of memoryview object")
diff --git a/pypy/module/_cffi_backend/func.py b/pypy/module/_cffi_backend/func.py
--- a/pypy/module/_cffi_backend/func.py
+++ b/pypy/module/_cffi_backend/func.py
@@ -113,7 +113,7 @@
         if not e.match(space, space.w_TypeError):
             raise
         buf = space.buffer_w(w_x, space.BUF_SIMPLE)
-    return buf
+    return buf.as_binary()
 
 def _fetch_as_write_buffer(space, w_x):
     try:
@@ -122,7 +122,7 @@
         if not e.match(space, space.w_TypeError):
             raise
         buf = space.buffer_w(w_x, space.BUF_WRITABLE)
-    return buf
+    return buf.as_binary()
 
 @unwrap_spec(w_ctype=ctypeobj.W_CType)
 def from_buffer(space, w_ctype, w_x):
diff --git a/pypy/module/_io/interp_bufferedio.py b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -1,5 +1,8 @@
 from __future__ import with_statement
 
+from rpython.rlib.signature import signature
+from rpython.rlib import types
+
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.typedef import (
     TypeDef, GetSetProperty, generic_new_descr, interp_attrproperty_w)
@@ -285,6 +288,7 @@
 
     # ______________________________________________
 
+    @signature(types.any(), returns=types.int())
     def _readahead(self):
         if self.readable and self.read_end != -1:
             available = self.read_end - self.pos
@@ -325,7 +329,7 @@
                 else:
                     offset = pos
                 if -self.pos <= offset <= available:
-                    newpos = self.pos + offset
+                    newpos = self.pos + int(offset)
                     assert newpos >= 0
                     self.pos = newpos
                     return space.newint(current - available + offset)
diff --git a/pypy/module/_sre/interp_sre.py b/pypy/module/_sre/interp_sre.py
--- a/pypy/module/_sre/interp_sre.py
+++ b/pypy/module/_sre/interp_sre.py
@@ -164,7 +164,7 @@
             string = space.bytes_w(w_string)
             length = len(string)
         else:
-            buf = space.readbuf_w(w_string)
+            buf = space.readbuf_w(w_string).as_binary()
             length = buf.getlength()
             assert length >= 0
         return (length, unicodestr, string, buf)
@@ -523,7 +523,7 @@
         u = space.unicode_w(space.repr(w_s))
         if len(u) > 50:
             u = u[:50]
-        return space.newunicode(u'<_sre.SRE_Match object; span=(%d, %d), match=%s>' % 
+        return space.newunicode(u'<_sre.SRE_Match object; span=(%d, %d), match=%s>' %
                           (start, end, u))
 
     def cannot_copy_w(self):
diff --git a/pypy/module/fcntl/interp_fcntl.py b/pypy/module/fcntl/interp_fcntl.py
--- a/pypy/module/fcntl/interp_fcntl.py
+++ b/pypy/module/fcntl/interp_fcntl.py
@@ -209,7 +209,7 @@
     op = rffi.cast(rffi.INT, op)        # C long => C int
 
     try:
-        rwbuffer = space.writebuf_w(w_arg)
+        rwbuffer = space.writebuf_w(w_arg).as_binary()
     except OperationError as e:
         if not (e.match(space, space.w_TypeError) or
                 e.match(space, space.w_BufferError)):

From pypy.commits at gmail.com  Wed Apr 12 19:49:45 2017
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 12 Apr 2017 16:49:45 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: hg merge py3.5
Message-ID: <58eebd19.0163190a.81309.8d8e@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91048:2fbdc25dcb1b
Date: 2017-04-13 00:49 +0100
http://bitbucket.org/pypy/pypy/changeset/2fbdc25dcb1b/

Log:	hg merge py3.5

diff too long, truncating to 2000 out of 51546 lines

diff --git a/lib-python/3/distutils/ccompiler.py b/lib-python/3/distutils/ccompiler.py
--- a/lib-python/3/distutils/ccompiler.py
+++ b/lib-python/3/distutils/ccompiler.py
@@ -959,7 +959,9 @@
 # is assumed to be in the 'distutils' package.)
 compiler_class = { 'unix':    ('unixccompiler', 'UnixCCompiler',
                                "standard UNIX-style compiler"),
-                   'msvc':    ('_msvccompiler', 'MSVCCompiler',
+                   # PyPy change: On win32 PyPy is translated with the
+                   # "msvc9compiler", force the same here.
+                   'msvc':    ('msvc9compiler', 'MSVCCompiler',
                                "Microsoft Visual C++"),
                    'cygwin':  ('cygwinccompiler', 'CygwinCCompiler',
                                "Cygwin port of GNU C Compiler for Win32"),
diff --git a/lib-python/3/distutils/sysconfig_pypy.py b/lib-python/3/distutils/sysconfig_pypy.py
--- a/lib-python/3/distutils/sysconfig_pypy.py
+++ b/lib-python/3/distutils/sysconfig_pypy.py
@@ -66,12 +66,12 @@
     so_ext = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
 
     g = {}
-    g['CC'] = "gcc -pthread"
-    g['CXX'] = "g++ -pthread"
+    g['CC'] = "cc -pthread"
+    g['CXX'] = "c++ -pthread"
     g['OPT'] = "-DNDEBUG -O2"
     g['CFLAGS'] = "-DNDEBUG -O2"
     g['CCSHARED'] = "-fPIC"
-    g['LDSHARED'] = "gcc -pthread -shared"
+    g['LDSHARED'] = "cc -pthread -shared"
     g['EXT_SUFFIX'] = so_ext
     g['SHLIB_SUFFIX'] = so_ext
     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility
diff --git a/lib-python/3/pathlib.py b/lib-python/3/pathlib.py
--- a/lib-python/3/pathlib.py
+++ b/lib-python/3/pathlib.py
@@ -1209,23 +1209,19 @@
     def mkdir(self, mode=0o777, parents=False, exist_ok=False):
         if self._closed:
             self._raise_closed()
-        if not parents:
-            try:
-                self._accessor.mkdir(self, mode)
-            except FileExistsError:
-                if not exist_ok or not self.is_dir():
-                    raise
-        else:
-            try:
-                self._accessor.mkdir(self, mode)
-            except FileExistsError:
-                if not exist_ok or not self.is_dir():
-                    raise
-            except OSError as e:
-                if e.errno != ENOENT:
-                    raise
-                self.parent.mkdir(parents=True)
-                self._accessor.mkdir(self, mode)
+        # NOTE: version from CPython 3.7 plus fix at issue #29694
+        try:
+            self._accessor.mkdir(self, mode)
+        except FileNotFoundError:
+            if not parents or self.parent == self:
+                raise
+            self.parent.mkdir(parents=True, exist_ok=True)
+            self.mkdir(mode, parents=False, exist_ok=exist_ok)
+        except OSError:
+            # Cannot rely on checking for EEXIST, since the operating system
+            # could give priority to other errors like EACCES or EROFS
+            if not exist_ok or not self.is_dir():
+                raise
 
     def chmod(self, mode):
         """
diff --git a/lib-python/3/sre_compile.py b/lib-python/3/sre_compile.py
--- a/lib-python/3/sre_compile.py
+++ b/lib-python/3/sre_compile.py
@@ -378,7 +378,11 @@
 
 def _bytes_to_codes(b):
     # Convert block indices to word array
-    a = memoryview(b).cast('I')
+    if _sre.CODESIZE == 2:
+        code = 'H'
+    else:
+        code = 'I'
+    a = memoryview(b).cast(code)
     assert a.itemsize == _sre.CODESIZE
     assert len(a) * a.itemsize == len(b)
     return a.tolist()
diff --git a/lib-python/3/test/_test_multiprocessing.py b/lib-python/3/test/_test_multiprocessing.py
--- a/lib-python/3/test/_test_multiprocessing.py
+++ b/lib-python/3/test/_test_multiprocessing.py
@@ -2147,7 +2147,8 @@
 
         # Because we are using xmlrpclib for serialization instead of
         # pickle this will cause a serialization error.
-        self.assertRaises(Exception, queue.put, time.sleep)
+        # Changed on PyPy: passing functions to xmlrpc is broken
+        #self.assertRaises(Exception, queue.put, time.sleep)
 
         # Make queue finalizer run before the server is stopped
         del queue
diff --git a/lib-python/3/test/test_pathlib.py b/lib-python/3/test/test_pathlib.py
--- a/lib-python/3/test/test_pathlib.py
+++ b/lib-python/3/test/test_pathlib.py
@@ -8,6 +8,7 @@
 import stat
 import tempfile
 import unittest
+from unittest import mock
 
 from test import support
 TESTFN = support.TESTFN
@@ -1751,6 +1752,35 @@
             p.mkdir(exist_ok=True)
         self.assertEqual(cm.exception.errno, errno.EEXIST)
 
+    def test_mkdir_concurrent_parent_creation(self):
+        for pattern_num in range(32):
+            p = self.cls(BASE, 'dirCPC%d' % pattern_num)
+            self.assertFalse(p.exists())
+
+            def my_mkdir(path, mode=0o777):
+                path = str(path)
+                # Emulate another process that would create the directory
+                # just before we try to create it ourselves.  We do it
+                # in all possible pattern combinations, assuming that this
+                # function is called at most 5 times (dirCPC/dir1/dir2,
+                # dirCPC/dir1, dirCPC, dirCPC/dir1, cirCPC/dir1/dir2).
+                if pattern.pop():
+                    os.mkdir(path, mode)      # from another process
+                    concurrently_created.add(path)
+                os.mkdir(path, mode)          # our real call
+
+            pattern = [bool(pattern_num & (1 << n)) for n in range(5)]
+            concurrently_created = set()
+            p12 = p / 'dir1' / 'dir2'
+            try:
+                with mock.patch("pathlib._normal_accessor.mkdir", my_mkdir):
+                    p12.mkdir(parents=True, exist_ok=False)
+            except FileExistsError:
+                self.assertIn(str(p12), concurrently_created)
+            else:
+                self.assertNotIn(str(p12), concurrently_created)
+            self.assertTrue(p.exists())
+
     @with_symlinks
     def test_symlink_to(self):
         P = self.cls(BASE)
diff --git a/lib-python/3/test/test_xml_etree.py b/lib-python/3/test/test_xml_etree.py
--- a/lib-python/3/test/test_xml_etree.py
+++ b/lib-python/3/test/test_xml_etree.py
@@ -1878,6 +1878,17 @@
             with self.assertRaises(RuntimeError):
                 repr(e)  # Should not crash
 
+    def test_bad_find_returns_none(self):
+        # This behavior is the one we get historically when the C
+        # extension module is enabled.  With the Python version, it
+        # raised a TypeError instead.  There are projects out there
+        # that depend on the non-raising behavior, of course.
+        e = ET.Element('foo')
+        assert e.find('') is None
+        assert e.findall('') == []
+        assert e.findtext('') is None
+        assert e.findtext('', default="default.") == "default."
+
 class MutatingElementPath(str):
     def __new__(cls, elem, *args):
         self = str.__new__(cls, *args)
diff --git a/lib-python/3/xml/etree/ElementTree.py b/lib-python/3/xml/etree/ElementTree.py
--- a/lib-python/3/xml/etree/ElementTree.py
+++ b/lib-python/3/xml/etree/ElementTree.py
@@ -294,7 +294,14 @@
         Return the first matching element, or None if no element was found.
 
         """
-        return ElementPath.find(self, path, namespaces)
+        # Used to be:  return ElementPath.find(self, path, namespaces)
+        # but there are projects out there that rely on it getting None
+        # instead of an internal TypeError.  This is what the C version
+        # of this class does.
+        result = ElementPath.iterfind(self, path, namespaces)
+        if result is None:
+            return None
+        return next(result, None)
 
     def findtext(self, path, default=None, namespaces=None):
         """Find text for first matching element by tag name or path.
@@ -308,7 +315,17 @@
         content, the empty string is returned.
 
         """
-        return ElementPath.findtext(self, path, default, namespaces)
+        # Used to be:
+        #     return ElementPath.findtext(self, path, default, namespaces)
+        # See find().
+        result = ElementPath.iterfind(self, path, namespaces)
+        if result is None:
+            return default
+        try:
+            elem = next(result)
+            return elem.text or ""
+        except StopIteration:
+            return default
 
     def findall(self, path, namespaces=None):
         """Find all matching subelements by tag name or path.
@@ -319,7 +336,12 @@
         Returns list containing all matching elements in document order.
 
         """
-        return ElementPath.findall(self, path, namespaces)
+        # Used to be:  return ElementPath.findall(self, path, namespaces)
+        # See find().
+        result = ElementPath.iterfind(self, path, namespaces)
+        if result is None:
+            return []
+        return list(result)
 
     def iterfind(self, path, namespaces=None):
         """Find all matching subelements by tag name or path.
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -597,7 +597,7 @@
                     py.test.skip("%s module not included in %s" % (mod,
                                                                    execpath))
 
-            cmd = "%s %s %s" % (execpath, regrrun, fspath.purebasename)
+            cmd = "%s -m test -v %s" % (execpath, fspath.purebasename)
             # add watchdog for timing out
             cmd = "%s %s %s %s" % (python, watchdog_script, TIMEOUT, cmd)
         else:
diff --git a/lib_pypy/_audioop_build.py b/lib_pypy/_audioop_build.py
--- a/lib_pypy/_audioop_build.py
+++ b/lib_pypy/_audioop_build.py
@@ -656,4 +656,4 @@
 ffi.set_source("_audioop_cffi", C_SOURCE)
 
 if __name__ == "__main__":
-    ffi.compile()
+    ffi.compile(verbose=2)
diff --git a/lib_pypy/_decimal_build.py b/lib_pypy/_decimal_build.py
--- a/lib_pypy/_decimal_build.py
+++ b/lib_pypy/_decimal_build.py
@@ -226,6 +226,16 @@
 _libdir = os.path.join(os.path.dirname(__file__), '_libmpdec')
 ffi.set_source('_decimal_cffi',
     """
+#ifdef _MSC_VER
+  #if defined(_WIN64)
+    typedef __int64 LONG_PTR; 
+  #else
+    typedef long LONG_PTR;
+  #endif
+  typedef LONG_PTR ssize_t;
+#else
+  #define HAVE_STDINT_H
+#endif
 #include "mpdecimal.h"
 
 #define MPD_Float_operation MPD_Not_implemented
@@ -266,7 +276,6 @@
     include_dirs=[_libdir],
     extra_compile_args=[
         "-DANSI",
-        "-DHAVE_STDINT_H",
         "-DHAVE_INTTYPES_H",
         "-DCONFIG_64" if sys.maxsize > 1 << 32 else "-DCONFIG_32",
     ],
diff --git a/lib_pypy/_pypy_testcapi.py b/lib_pypy/_pypy_testcapi.py
--- a/lib_pypy/_pypy_testcapi.py
+++ b/lib_pypy/_pypy_testcapi.py
@@ -61,13 +61,12 @@
     # set link options
     output_filename = modulename + _get_c_extension_suffix()
     if sys.platform == 'win32':
-        # XXX pyconfig.h uses a pragma to link to the import library,
-        #     which is currently python3.lib
-        library = os.path.join(thisdir, '..', 'libs', 'python32')
+        libname = 'python{0[0]}{0[1]}'.format(sys.version_info)
+        library = os.path.join(thisdir, '..', 'lib', libname)
         if not os.path.exists(library + '.lib'):
             # For a local translation or nightly build
-            library = os.path.join(thisdir, '..', 'pypy', 'goal', 'python32')
-        assert os.path.exists(library + '.lib'),'Could not find import library "%s"' % library
+            library = os.path.join(thisdir, '..', 'pypy', 'goal', libname)
+        assert os.path.exists(library + '.lib'), 'Could not find import library "%s"' % library
         libraries = [library, 'oleaut32']
         extra_ldargs = ['/MANIFEST',  # needed for VC10
                         '/EXPORT:PyInit_' + modulename]
diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -32,10 +32,11 @@
 import threading
 
 try:
-    from __pypy__ import newlist_hint
+    from __pypy__ import newlist_hint, add_memory_pressure
 except ImportError:
     assert '__pypy__' not in sys.builtin_module_names
     newlist_hint = lambda sizehint: []
+    add_memory_pressure = lambda size: None
 
 if sys.version_info[0] >= 3:
     StandardError = Exception
@@ -152,6 +153,9 @@
                  check_same_thread=True, factory=None, cached_statements=100,
                  uri=0):
     factory = Connection if not factory else factory
+    # an sqlite3 db seems to be around 100 KiB at least (doesn't matter if
+    # backed by :memory: or a file)
+    add_memory_pressure(100 * 1024)
     return factory(database, timeout, detect_types, isolation_level,
                     check_same_thread, factory, cached_statements, uri)
 
diff --git a/lib_pypy/cffi/api.py b/lib_pypy/cffi/api.py
--- a/lib_pypy/cffi/api.py
+++ b/lib_pypy/cffi/api.py
@@ -563,7 +563,7 @@
             if sys.platform == "win32":
                 # we need 'libpypy-c.lib'.  Current distributions of
                 # pypy (>= 4.1) contain it as 'libs/python27.lib'.
-                pythonlib = "python27"
+                pythonlib = "python{0[0]}{0[1]}".format(sys.version_info)
                 if hasattr(sys, 'prefix'):
                     ensure('library_dirs', os.path.join(sys.prefix, 'libs'))
             else:
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -72,8 +72,6 @@
 
     if "cppyy" in working_modules:
         working_modules.remove("cppyy")  # not tested on win32
-    if "faulthandler" in working_modules:
-        working_modules.remove("faulthandler")  # missing details
 
     # The _locale module is needed by site.py on Windows
     default_modules.add("_locale")
diff --git a/pypy/doc/build.rst b/pypy/doc/build.rst
--- a/pypy/doc/build.rst
+++ b/pypy/doc/build.rst
@@ -79,6 +79,9 @@
 _ssl
     libssl
 
+_vmprof
+    libunwind (optional, loaded dynamically at runtime)
+
 Make sure to have these libraries (with development headers) installed
 before building PyPy, otherwise the resulting binary will not contain
 these modules.  Furthermore, the following libraries should be present
@@ -185,7 +188,7 @@
 ::
 
     cd pypy/tool/release
-    ./package.py pypy-VER-PLATFORM
+    ./package.py --archive-name=pypy-VER-PLATFORM
 
 This creates a clean and prepared hierarchy, as well as a ``.tar.bz2``
 with the same content; both are found by default in
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
@@ -364,6 +364,24 @@
 
 .. __: https://bitbucket.org/pypy/pypy/issue/1974/different-behaviour-for-collections-of
 
+Performance Differences
+-------------------------
+
+CPython has an optimization that can make repeated string concatenation not
+quadratic. For example, this kind of code runs in O(n) time::
+
+    s = ''
+    for string in mylist:
+        s += string
+
+In PyPy, this code will always have quadratic complexity. Note also, that the
+CPython optimization is brittle and can break by having slight variations in
+your code anyway. So you should anyway replace the code with::
+
+    parts = []
+    for string in mylist:
+        parts.append(string)
+    s = "".join(parts)
 
 Miscellaneous
 -------------
diff --git a/pypy/doc/install.rst b/pypy/doc/install.rst
--- a/pypy/doc/install.rst
+++ b/pypy/doc/install.rst
@@ -57,6 +57,7 @@
 .. code-block:: console
 
     $ ./pypy-xxx/bin/pypy -m ensurepip
+    $ ./pypy-xxx/bin/pip install -U pip wheel # to upgrade to the latest versions
     $ ./pypy-xxx/bin/pip install pygments  # for example
 
 Third party libraries will be installed in ``pypy-xxx/site-packages``, and
@@ -77,7 +78,17 @@
 	# from the mercurial checkout
 	$ virtualenv -p /path/to/pypy/pypy/translator/goal/pypy-c my-pypy-env
 
-Note that bin/python is now a symlink to bin/pypy.
+	# in any case activate it
+	$ source my-pypy-env/bin/activate
+
+Note that my-pypy-env/bin/python is now a symlink to my-pypy-env/bin/pypy
+so you should be able to run pypy simply by typing::
+
+    $ python
+
+You should still upgrade pip and wheel to the latest versions via::
+
+    $ my-pypy-env/bin/pip install -U pip wheel
 
 .. _pip: http://pypi.python.org/pypi/pip
 .. _ensurepip: https://docs.python.org/2.7/library/ensurepip.html
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -2,7 +2,22 @@
 What's new in PyPy2.7 5.8+
 ==========================
 
-.. this is a revision shortly after release-pypy2.7-v5.7
+.. this is a revision shortly after release-pypy2.7-v5.7.0
 .. startrev: 44f31f6dd39f
 
+Add cpyext interfaces for ``PyModule_New``
 
+Correctly handle `dict.pop`` where the ``pop``
+key is not the same type as the ``dict``'s and ``pop``
+is called with a default (will be part of release 5.7.1)
+
+.. branch: issue2522
+
+Fix missing tp_new on w_object called through multiple inheritance
+(will be part of release 5.7.1)
+
+.. branch: lstrip_to_empty_string
+
+.. branch: vmprof-native
+
+PyPy support to profile native frames in vmprof.
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -5,3 +5,16 @@
 .. this is the revision after release-pypy3.3-5.7.x was branched
 .. startrev: afbf09453369
 
+.. branch: mtest
+Use "<python> -m test" to run the CPython test suite, as documented by CPython,
+instead of our outdated regrverbose.py script.
+
+.. branch: win32-faulthandler
+
+Enable the 'faulthandler' module on Windows;
+this unblocks the Python test suite.
+
+.. branch: superjumbo
+
+Implement posix.posix_fallocate() and posix.posix_fadvise()
+
diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -13,6 +13,7 @@
 from pypy import pypydir
 from rpython.rlib import rthread
 from pypy.module.thread import os_thread
+from pypy.module.sys.version import CPYTHON_VERSION
 
 thisdir = py.path.local(__file__).dirpath()
 
@@ -285,7 +286,8 @@
         if sys.platform == 'win32':
             libdir = thisdir.join('..', '..', 'libs')
             libdir.ensure(dir=1)
-            config.translation.libname = str(libdir.join('python27.lib'))
+            pythonlib = "python{0[0]}{0[1]}.lib".format(CPYTHON_VERSION)
+            config.translation.libname = str(libdir.join(pythonlib))
 
         if config.translation.thread:
             config.objspace.usemodules.thread = True
diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
--- a/pypy/interpreter/error.py
+++ b/pypy/interpreter/error.py
@@ -9,6 +9,7 @@
 from rpython.rlib.objectmodel import we_are_translated, specialize
 from rpython.rlib.objectmodel import dont_inline
 from rpython.rlib import rstack, rstackovf
+from rpython.rlib import rwin32
 
 from pypy.interpreter import debug
 
@@ -568,33 +569,6 @@
     # 31: ANSI color code "red"
     ansi_print(text, esc="31", file=file, newline=newline)
 
-try:
-    WindowsError
-except NameError:
-    _WINDOWS = False
-else:
-    _WINDOWS = True
-
-    def wrap_windowserror(space, e, w_filename=None):
-        XXX    # WindowsError no longer exists in Py3.5
-               # instead, OSError has a kwarg winerror that overrides
-               # any errno supplied
-        from rpython.rlib import rwin32
-
-        winerror = e.winerror
-        try:
-            msg = rwin32.FormatError(winerror)
-        except ValueError:
-            msg = 'Windows Error %d' % winerror
-        exc = space.w_WindowsError
-        if w_filename is not None:
-            w_error = space.call_function(exc, space.newint(winerror),
-                                          space.newtext(msg), w_filename)
-        else:
-            w_error = space.call_function(exc, space.newint(winerror),
-                                          space.newtext(msg))
-        return OperationError(exc, w_error)
-
 @specialize.arg(3, 6)
 def wrap_oserror2(space, e, w_filename=None, exception_name='w_OSError',
                   w_exception_class=None, w_filename2=None, eintr_retry=False):
@@ -612,9 +586,6 @@
     """
     assert isinstance(e, OSError)
 
-    if _WINDOWS and isinstance(e, WindowsError):
-        return wrap_windowserror(space, e, w_filename)
-
     if w_exception_class is None:
         w_exc = getattr(space, exception_name)
     else:
@@ -631,28 +602,37 @@
 def _wrap_oserror2_impl(space, e, w_filename, w_filename2, w_exc, eintr_retry):
     # move the common logic in its own function, instead of having it
     # duplicated 4 times in all 4 specialized versions of wrap_oserror2()
-    errno = e.errno
 
-    if errno == EINTR:
-        space.getexecutioncontext().checksignals()
-        if eintr_retry:
-            return None
+    if rwin32.WIN32 and isinstance(e, WindowsError):
+        winerror = e.winerror
+        try:
+            msg = rwin32.FormatError(winerror)
+        except ValueError:
+            msg = 'Windows Error %d' % winerror
+        w_errno = space.w_None
+        w_winerror = space.newint(winerror)
+        w_msg = space.newtext(msg)
+    else:
+        errno = e.errno
+        if errno == EINTR:
+            space.getexecutioncontext().checksignals()
+            if eintr_retry:
+                return None
 
-    try:
-        msg = strerror(errno)
-    except ValueError:
-        msg = u'error %d' % errno
-    if w_filename is not None:
-        if w_filename2 is not None:
-            w_error = space.call_function(w_exc, space.newint(errno),
-                                          space.newunicode(msg), w_filename,
-                                          space.w_None, w_filename2)
-        else:
-            w_error = space.call_function(w_exc, space.newint(errno),
-                                          space.newunicode(msg), w_filename)
-    else:
-        w_error = space.call_function(w_exc, space.newint(errno),
-                                      space.newunicode(msg))
+        try:
+            msg = strerror(errno)
+        except ValueError:
+            msg = u'error %d' % errno
+        w_errno = space.newint(errno)
+        w_winerror = space.w_None
+        w_msg = space.newunicode(msg)
+
+    if w_filename is None:
+        w_filename = space.w_None
+    if w_filename2 is None:
+        w_filename2 = space.w_None
+    w_error = space.call_function(w_exc, w_errno, w_msg, w_filename,
+                                  w_winerror, w_filename2)
     operror = OperationError(w_exc, w_error)
     if eintr_retry:
         raise operror
diff --git a/pypy/interpreter/pyparser/future.py b/pypy/interpreter/pyparser/future.py
--- a/pypy/interpreter/pyparser/future.py
+++ b/pypy/interpreter/pyparser/future.py
@@ -80,6 +80,7 @@
     from pypy.interpreter.pyparser import pygram
     it = TokenIterator(tokens)
     result = 0
+    last_position = (0, 0)
     #
     # The only things that can precede a future statement are another
     # future statement and a doc string (only one).  This is a very
@@ -94,6 +95,11 @@
            it.skip_name("__future__") and
            it.skip_name("import")):
         it.skip(pygram.tokens.LPAR)    # optionally
+        # return in 'last_position' any line-column pair that points
+        # somewhere inside the last __future__ import statement
+        # (at the start would be fine too, but it's easier to grab a
+        # random position inside)
+        last_position = (it.tok[2], it.tok[3])
         result |= future_flags.get_compiler_feature(it.next_feature_name())
         while it.skip(pygram.tokens.COMMA):
             result |= future_flags.get_compiler_feature(it.next_feature_name())
@@ -104,5 +110,4 @@
     # remove the flags that were specified but are anyway mandatory
     result &= ~future_flags.mandatory_flags
 
-    position = (it.tok[2], it.tok[3])
-    return result, position
+    return result, last_position
diff --git a/pypy/interpreter/pyparser/test/test_future.py b/pypy/interpreter/pyparser/test/test_future.py
--- a/pypy/interpreter/pyparser/test/test_future.py
+++ b/pypy/interpreter/pyparser/test/test_future.py
@@ -2,10 +2,9 @@
 from pypy.interpreter.pyparser import future, pytokenizer
 from pypy.tool import stdlib___future__ as fut
 
-def run(s, expected_last_future=None):
+def run(s, expected_last_future=(0, 0)):
     source_lines = s.splitlines(True)
     tokens = pytokenizer.generate_tokens(source_lines, 0)
-    expected_last_future = expected_last_future or tokens[-1][2:4]
     #
     flags, last_future_import = future.add_future_flags(
         future.futureFlags_3_5, tokens)
@@ -14,7 +13,7 @@
 
 def test_docstring():
     s = '"Docstring\\" "\nfrom  __future__ import division\n'
-    f = run(s)
+    f = run(s, (2, 24))
     assert f == 0
 
 def test_comment():
@@ -45,152 +44,152 @@
 
 def test_from():
     s = 'from  __future__ import division\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_froms():
     s = 'from  __future__ import division, generators, with_statement\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_from_as():
     s = 'from  __future__ import division as b\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_froms_as():
     s = 'from  __future__ import division as b, generators as c\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_from_paren():
     s = 'from  __future__ import (division)\n'
-    f = run(s)
+    f = run(s, (1, 25))
     assert f == 0
 
 def test_froms_paren():
     s = 'from  __future__ import (division, generators)\n'
-    f = run(s)
+    f = run(s, (1, 25))
     assert f == 0
 
 def test_froms_paren_as():
     s = 'from  __future__ import (division as b, generators,)\n'
-    f = run(s)
+    f = run(s, (1, 25))
     assert f == 0
 
 def test_paren_with_newline():
     s = 'from __future__ import (division,\nabsolute_import)\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_paren_with_newline_2():
     s = 'from __future__ import (\ndivision,\nabsolute_import)\n'
-    f = run(s)
+    f = run(s, (2, 0))
     assert f == 0
 
 def test_multiline():
     s = '"abc" #def\n  #ghi\nfrom  __future__ import (division as b, generators,)\nfrom __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (4, 23))
     assert f == 0
 
 def test_windows_style_lineendings():
     s = '"abc" #def\r\n  #ghi\r\nfrom  __future__ import (division as b, generators,)\r\nfrom __future__ import with_statement\r\n'
-    f = run(s)
+    f = run(s, (4, 23))
     assert f == 0
 
 def test_mac_style_lineendings():
     s = '"abc" #def\r  #ghi\rfrom  __future__ import (division as b, generators,)\rfrom __future__ import with_statement\r'
-    f = run(s)
+    f = run(s, (4, 23))
     assert f == 0
 
 def test_semicolon():
     s = '"abc" #def\n  #ghi\nfrom  __future__ import (division as b, generators,);  from __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (3, 78))
     assert f == 0
 
 def test_semicolon_2():
     s = 'from  __future__ import division; from foo import bar'
-    f = run(s, expected_last_future=(1, 39))
+    f = run(s, expected_last_future=(1, 24))
     assert f == 0
 
 def test_full_chain():
     s = '"abc" #def\n  #ghi\nfrom  __future__ import (division as b, generators,);  from __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (3, 78))
     assert f == 0
 
 def test_intervening_code():
     s = 'from  __future__ import (division as b, generators,)\nfrom sys import modules\nfrom __future__ import with_statement\n'
-    f = run(s, expected_last_future=(2, 5))
+    f = run(s, expected_last_future=(1, 25))
     assert f == 0
 
 def test_nonexisting():
     s = 'from  __future__ import non_existing_feature\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_nonexisting_2():
     s = 'from  __future__ import non_existing_feature, with_statement\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_from_import_abs_import():
     s = 'from  __future__ import absolute_import\n'
-    f = run(s)
+    f = run(s, (1, 24))
     assert f == 0
 
 def test_raw_doc():
     s = 'r"Doc"\nfrom __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == 0
 
 def test_unicode_doc():
     s = 'u"Doc"\nfrom __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == 0
 
 def test_raw_unicode_doc():
     s = 'ru"Doc"\nfrom __future__ import with_statement\n'
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == 0
 
 def test_continuation_line():
     s = "\\\nfrom __future__ import with_statement\n"
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == 0
 
 def test_continuation_lines():
     s = "\\\n  \t\\\nfrom __future__ import with_statement\n"
-    f = run(s)
+    f = run(s, (3, 23))
     assert f == 0
 
 def test_lots_of_continuation_lines():
     s = "\\\n\\\n\\\n\\\n\\\n\\\n\nfrom __future__ import with_statement\n"
-    f = run(s)
+    f = run(s, (8, 23))
     assert f == 0
 
 def test_continuation_lines_raise():
     s = "   \\\n  \t\\\nfrom __future__ import with_statement\n"
-    f = run(s, expected_last_future=(1, 0))
+    f = run(s)
     assert f == 0     # because of the INDENT
 
 def test_continuation_lines_in_docstring_single_quoted():
     s = '"\\\n\\\n\\\n\\\n\\\n\\\n"\nfrom  __future__ import division\n'
-    f = run(s)
+    f = run(s, (8, 24))
     assert f == 0
 
 def test_continuation_lines_in_docstring_triple_quoted():
     s = '"""\\\n\\\n\\\n\\\n\\\n\\\n"""\nfrom  __future__ import division\n'
-    f = run(s)
+    f = run(s, (8, 24))
     assert f == 0
 
 def test_blank_lines():
     s = ('\n\t\n\nfrom __future__ import with_statement'
          '  \n  \n  \nfrom __future__ import division')
-    f = run(s)
+    f = run(s, (7, 23))
     assert f == 0
 
 def test_dummy_semicolons():
     s = ('from __future__ import division;\n'
          'from __future__ import with_statement;')
-    f = run(s)
+    f = run(s, (2, 23))
     assert f == 0
diff --git a/pypy/interpreter/test/test_syntax.py b/pypy/interpreter/test/test_syntax.py
--- a/pypy/interpreter/test/test_syntax.py
+++ b/pypy/interpreter/test/test_syntax.py
@@ -308,6 +308,15 @@
         assert isinstance(ns["c"], bytes)
         assert isinstance(ns["d"], bytes)
 
+    def test_both_futures_with_semicolon(self):
+        # Issue #2526: a corner case which crashes only if the file
+        # contains *nothing more* than two __future__ imports separated
+        # by a semicolon.
+        s = """
+from __future__ import unicode_literals; from __future__ import print_function
+"""
+        exec s in {}
+
 
 class AppTestComprehensions:
 
diff --git a/pypy/module/__pypy__/__init__.py b/pypy/module/__pypy__/__init__.py
--- a/pypy/module/__pypy__/__init__.py
+++ b/pypy/module/__pypy__/__init__.py
@@ -6,6 +6,8 @@
 
 
 class BuildersModule(MixedModule):
+    """ Module containing string and unicode builders """
+
     appleveldefs = {}
 
     interpleveldefs = {
@@ -34,6 +36,8 @@
 
 
 class IntOpModule(MixedModule):
+    """ Module for integer operations that have two-complement overflow
+    behaviour instead of overflowing to longs """
     appleveldefs = {}
     interpleveldefs = {
         'int_add':         'interp_intop.int_add',
@@ -55,6 +59,8 @@
 
 
 class Module(MixedModule):
+    """ PyPy specific "magic" functions. A lot of them are experimental and
+    subject to change, many are internal. """
     appleveldefs = {
     }
 
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
@@ -106,13 +106,15 @@
         raise wrap_oserror(space, e)
 
 @unwrap_spec(sizehint=int)
-def resizelist_hint(space, w_iterable, sizehint):
-    if not isinstance(w_iterable, W_ListObject):
+def resizelist_hint(space, w_list, sizehint):
+    """ Reallocate the underlying storage of the argument list to sizehint """
+    if not isinstance(w_list, W_ListObject):
         raise oefmt(space.w_TypeError, "arg 1 must be a 'list'")
-    w_iterable._resize_hint(sizehint)
+    w_list._resize_hint(sizehint)
 
 @unwrap_spec(sizehint=int)
 def newlist_hint(space, sizehint):
+    """ Create a new empty list that has an underlying storage of length sizehint """
     return space.newlist_hint(sizehint)
 
 @unwrap_spec(debug=int)
@@ -125,6 +127,9 @@
 
 @unwrap_spec(estimate=int)
 def add_memory_pressure(estimate):
+    """ Add memory pressure of estimate bytes. Useful when calling a C function
+    that internally allocates a big chunk of memory. This instructs the GC to
+    garbage collect sooner than it would otherwise."""
     rgc.add_memory_pressure(estimate)
 
 @unwrap_spec(w_frame=PyFrame)
diff --git a/pypy/module/_cffi_backend/test/test_recompiler.py b/pypy/module/_cffi_backend/test/test_recompiler.py
--- a/pypy/module/_cffi_backend/test/test_recompiler.py
+++ b/pypy/module/_cffi_backend/test/test_recompiler.py
@@ -1471,8 +1471,13 @@
         with self.StdErrCapture(fd=True) as f:
             res = lib.bar(4, 5)
         assert res == 0
-        assert f.getvalue() == (
+        assert f.getvalue() in (
+            # If the underlying cffi is <= 1.9
             "extern \"Python\": function bar() called, but no code was attached "
+            "to it yet with @ffi.def_extern().  Returning 0.\n",
+            # If the underlying cffi is >= 1.10
+            "extern \"Python\": function _CFFI_test_extern_python_1.bar() "
+            "called, but no code was attached "
             "to it yet with @ffi.def_extern().  Returning 0.\n")
 
         @ffi.def_extern("bar")
diff --git a/pypy/module/_multiprocessing/interp_win32.py b/pypy/module/_multiprocessing/interp_win32.py
--- a/pypy/module/_multiprocessing/interp_win32.py
+++ b/pypy/module/_multiprocessing/interp_win32.py
@@ -4,10 +4,9 @@
 from rpython.rtyper.tool import rffi_platform
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
 
-from pypy.interpreter.error import oefmt, wrap_windowserror
+from pypy.interpreter.error import oefmt, wrap_oserror
 from pypy.interpreter.function import StaticMethod
 from pypy.interpreter.gateway import interp2app, unwrap_spec
-from pypy.module._multiprocessing.interp_connection import w_handle
 
 CONSTANTS = """
     PIPE_ACCESS_INBOUND PIPE_ACCESS_DUPLEX
@@ -35,6 +34,9 @@
 def handle_w(space, w_handle):
     return rffi.cast(rwin32.HANDLE, space.int_w(w_handle))
 
+def w_handle(space, handle):
+    return space.newint(rffi.cast(rffi.INTPTR_T, handle))
+
 _CreateNamedPipe = rwin32.winexternal(
     'CreateNamedPipeA', [
         rwin32.LPCSTR,
@@ -106,7 +108,7 @@
 def CloseHandle(space, w_handle):
     handle = handle_w(space, w_handle)
     if not rwin32.CloseHandle(handle):
-        raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+        raise wrap_oserror(space, rwin32.lastSavedWindowsError())
 
 def GetLastError(space):
     return space.newint(rwin32.GetLastError_saved())
@@ -126,7 +128,7 @@
         outputsize, inputsize, timeout, rffi.NULL)
 
     if handle == rwin32.INVALID_HANDLE_VALUE:
-        raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+        raise wrap_oserror(space, rwin32.lastSavedWindowsError())
 
     return w_handle(space, handle)
 
@@ -136,7 +138,7 @@
     if overlapped:
         raise oefmt(space.w_NotImplementedError, "expected a NULL pointer")
     if not _ConnectNamedPipe(handle, rffi.NULL):
-        raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+        raise wrap_oserror(space, rwin32.lastSavedWindowsError())
 
 def SetNamedPipeHandleState(space, w_handle, w_pipemode, w_maxinstances,
                             w_timeout):
@@ -156,7 +158,7 @@
             statep[2] = rffi.ptradd(state, 2)
         if not _SetNamedPipeHandleState(handle, statep[0], statep[1],
                                         statep[2]):
-            raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+            raise wrap_oserror(space, rwin32.lastSavedWindowsError())
     finally:
         lltype.free(state, flavor='raw')
         lltype.free(statep, flavor='raw')
@@ -165,7 +167,7 @@
 def WaitNamedPipe(space, name, timeout):
     # Careful: zero means "default value specified by CreateNamedPipe()"
     if not _WaitNamedPipe(name, timeout):
-        raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+        raise wrap_oserror(space, rwin32.lastSavedWindowsError())
 
 @unwrap_spec(filename='fsencode', access=r_uint, share=r_uint,
              disposition=r_uint, flags=r_uint)
@@ -180,7 +182,7 @@
                          disposition, flags, rwin32.NULL_HANDLE)
 
     if handle == rwin32.INVALID_HANDLE_VALUE:
-        raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+        raise wrap_oserror(space, rwin32.lastSavedWindowsError())
 
     return w_handle(space, handle)
 
diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -50,8 +50,8 @@
     return OperationError(w_VMProfError, space.newtext(e.msg))
 
 
- at unwrap_spec(fileno=int, period=float)
-def enable(space, fileno, period):
+ at unwrap_spec(fileno=int, period=float, memory=int, lines=int, native=int)
+def enable(space, fileno, period, memory, lines, native):
     """Enable vmprof.  Writes go to the given 'fileno', a file descriptor
     opened for writing.  *The file descriptor must remain open at least
     until disable() is called.*
@@ -65,7 +65,7 @@
     #                             "with vmprof will crash"),
     #               space.w_RuntimeWarning)
     try:
-        rvmprof.enable(fileno, period)
+        rvmprof.enable(fileno, period, memory, native)
     except rvmprof.VMProfError as e:
         raise VMProfError(space, e)
 
diff --git a/pypy/module/_vmprof/test/test__vmprof.py b/pypy/module/_vmprof/test/test__vmprof.py
--- a/pypy/module/_vmprof/test/test__vmprof.py
+++ b/pypy/module/_vmprof/test/test__vmprof.py
@@ -24,10 +24,11 @@
             i += 5 * WORD # header
             assert s[i    ] == 5    # MARKER_HEADER
             assert s[i + 1] == 0    # 0
-            assert s[i + 2] == 2    # VERSION_THREAD_ID
-            assert s[i + 3] == 4    # len('pypy')
-            assert s[i + 4: i + 8] == b'pypy'
-            i += 8
+            assert s[i + 2] == 6    # VERSION_TIMESTAMP
+            assert s[i + 3] == 8    # PROFILE_RPYTHON
+            assert s[i + 4] == 4    # len('pypy')
+            assert s[i + 5: i + 9] == b'pypy'
+            i += 9
             while i < len(s):
                 if s[i] == 3:
                     break
@@ -41,6 +42,17 @@
                     _, size = struct.unpack("ll", s[i:i + 2 * WORD])
                     count += 1
                     i += 2 * WORD + size
+                elif s[i] == '\x06':
+                    print(s[i:i+24])
+                    i += 1+8+8+8
+                elif s[i] == '\x07':
+                    i += 1
+                    # skip string
+                    size, = struct.unpack("l", s[i:i + WORD])
+                    i += WORD+size
+                    # skip string
+                    size, = struct.unpack("l", s[i:i + WORD])
+                    i += WORD+size
                 else:
                     raise AssertionError(s[i])
             return count
@@ -48,7 +60,7 @@
         import _vmprof
         gc.collect()  # try to make the weakref list deterministic
         gc.collect()  # by freeing all dead code objects
-        _vmprof.enable(tmpfileno, 0.01)
+        _vmprof.enable(tmpfileno, 0.01, 0, 0, 0)
         _vmprof.disable()
         s = open(self.tmpfilename, 'rb').read()
         no_of_codes = count(s)
@@ -64,7 +76,7 @@
 
         gc.collect()
         gc.collect()
-        _vmprof.enable(tmpfileno2, 0.01)
+        _vmprof.enable(tmpfileno2, 0.01, 0, 0, 0)
 
         exec_("""def foo2():
             pass
@@ -79,9 +91,9 @@
 
     def test_enable_ovf(self):
         import _vmprof
-        raises(_vmprof.VMProfError, _vmprof.enable, 2, 0)
-        raises(_vmprof.VMProfError, _vmprof.enable, 2, -2.5)
-        raises(_vmprof.VMProfError, _vmprof.enable, 2, 1e300)
-        raises(_vmprof.VMProfError, _vmprof.enable, 2, 1e300 * 1e300)
+        raises(_vmprof.VMProfError, _vmprof.enable, 2, 0, 0, 0, 0)
+        raises(_vmprof.VMProfError, _vmprof.enable, 2, -2.5, 0, 0, 0)
+        raises(_vmprof.VMProfError, _vmprof.enable, 2, 1e300, 0, 0, 0)
+        raises(_vmprof.VMProfError, _vmprof.enable, 2, 1e300 * 1e300, 0, 0, 0)
         NaN = (1e300*1e300) / (1e300*1e300)
-        raises(_vmprof.VMProfError, _vmprof.enable, 2, NaN)
+        raises(_vmprof.VMProfError, _vmprof.enable, 2, NaN, 0, 0, 0)
diff --git a/pypy/module/_vmprof/test/test_direct.py b/pypy/module/_vmprof/test/test_direct.py
--- a/pypy/module/_vmprof/test/test_direct.py
+++ b/pypy/module/_vmprof/test/test_direct.py
@@ -43,7 +43,7 @@
 }
 
 
-""" + open(str(srcdir.join("vmprof_get_custom_offset.h"))).read(), include_dirs=[str(srcdir)])
+""" + open(str(srcdir.join("shared/vmprof_get_custom_offset.h"))).read(), include_dirs=[str(srcdir)])
 
 class TestDirect(object):
     def test_infrastructure(self):
diff --git a/pypy/module/_winreg/interp_winreg.py b/pypy/module/_winreg/interp_winreg.py
--- a/pypy/module/_winreg/interp_winreg.py
+++ b/pypy/module/_winreg/interp_winreg.py
@@ -2,7 +2,7 @@
 from pypy.interpreter.baseobjspace import W_Root, BufferInterfaceNotFound
 from pypy.interpreter.gateway import interp2app, unwrap_spec
 from pypy.interpreter.typedef import TypeDef, GetSetProperty
-from pypy.interpreter.error import OperationError, oefmt, wrap_windowserror
+from pypy.interpreter.error import OperationError, oefmt, wrap_oserror
 from rpython.rtyper.lltypesystem import rffi, lltype
 from rpython.rlib import rwinreg, rwin32
 from rpython.rlib.rarithmetic import r_uint, intmask
@@ -110,7 +110,7 @@
     elif isinstance(w_hkey, W_HKEY):
         return w_hkey.hkey
     elif space.isinstance_w(w_hkey, space.w_int):
-        if space.is_true(space.lt(w_hkey, space.wrap(0))):
+        if space.is_true(space.lt(w_hkey, space.newint(0))):
             return rffi.cast(rwinreg.HKEY, space.int_w(w_hkey))
         return rffi.cast(rwinreg.HKEY, space.uint_w(w_hkey))
     else:
@@ -702,7 +702,7 @@
     try:
         return space.newunicode(rwinreg.ExpandEnvironmentStrings(source))
     except WindowsError as e:
-        raise wrap_windowserror(space, e)
+        raise wrap_oserror(space, e)
 
 def DisableReflectionKey(space, w_key):
     """Disables registry reflection for 32-bit processes running on a 64-bit
diff --git a/pypy/module/cpyext/__init__.py b/pypy/module/cpyext/__init__.py
--- a/pypy/module/cpyext/__init__.py
+++ b/pypy/module/cpyext/__init__.py
@@ -4,7 +4,6 @@
 
 class Module(MixedModule):
     interpleveldefs = {
-        'load_module': 'api.load_extension_module',
     }
 
     appleveldefs = {
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@ -565,7 +565,7 @@
     'PyUnicode_FromFormat', 'PyUnicode_FromFormatV', 'PyUnicode_AsWideCharString',
     'PyUnicode_GetSize', 'PyUnicode_GetLength',
     'PyModule_AddObject', 'PyModule_AddIntConstant', 'PyModule_AddStringConstant',
-    'PyModule_GetDef',
+    'PyModule_GetDef', 'PyModuleDef_Init',
     'Py_BuildValue', 'Py_VaBuildValue', 'PyTuple_Pack',
     '_PyArg_Parse_SizeT', '_PyArg_ParseTuple_SizeT',
     '_PyArg_ParseTupleAndKeywords_SizeT', '_PyArg_VaParse_SizeT',
@@ -651,7 +651,7 @@
     global all_exceptions
     all_exceptions = list(exceptions.Module.interpleveldefs)
     for exc_name in all_exceptions:
-        if exc_name in ('EnvironmentError', 'IOError'):
+        if exc_name in ('EnvironmentError', 'IOError', 'WindowsError'):
             # FIXME: aliases of OSError cause a clash of names via
             # export_struct
             continue
@@ -1489,8 +1489,7 @@
     copy_header_files(cts, trunk_include, use_micronumpy)
 
 
- at unwrap_spec(path='fsencode', name='text')
-def load_extension_module(space, path, name):
+def create_extension_module(space, w_spec):
     # note: this is used both to load CPython-API-style C extension
     # modules (cpyext) and to load CFFI-style extension modules
     # (_cffi_backend).  Any of the two can be disabled at translation
@@ -1498,6 +1497,9 @@
     # order of things here.
     from rpython.rlib import rdynload
 
+    name = space.text_w(space.getattr(w_spec, space.newtext("name")))
+    path = space.text_w(space.getattr(w_spec, space.newtext("origin")))
+
     if os.sep not in path:
         path = os.curdir + os.sep + path      # force a '/' in the path
     basename = name.split('.')[-1]
@@ -1535,7 +1537,7 @@
         except KeyError:
             pass
         else:
-            return load_cpyext_module(space, name, path, dll, initptr)
+            return create_cpyext_module(space, w_spec, name, path, dll, initptr)
         if look_for is not None:
             look_for += ' or ' + also_look_for
         else:
@@ -1549,8 +1551,9 @@
 
 initfunctype = lltype.Ptr(lltype.FuncType([], PyObject))
 
-def load_cpyext_module(space, name, path, dll, initptr):
+def create_cpyext_module(space, w_spec, name, path, dll, initptr):
     from rpython.rlib import rdynload
+    from pypy.module.cpyext.pyobject import get_w_obj_and_decref
 
     space.getbuiltinmodule("cpyext")    # mandatory to init cpyext
     state = space.fromcache(State)
@@ -1562,25 +1565,54 @@
     state.package_context = name, path
     try:
         initfunc = rffi.cast(initfunctype, initptr)
-        w_mod = generic_cpy_call(space, initfunc)
+        initret = generic_cpy_call_dont_convert_result(space, initfunc)
         state.check_and_raise_exception()
+        if not initret.c_ob_type:
+            raise oefmt(space.w_SystemError,
+                        "init function of %s returned uninitialized object",
+                        name)
+        # This should probably compare by identity with PyModuleDef_Type from
+        # modsupport.c, but I didn't find a way to do that.
+        tp_name_nonconst = rffi.cast(rffi.CCHARP, initret.c_ob_type.c_tp_name)
+        if rffi.charp2str(tp_name_nonconst) == "moduledef":
+            from pypy.module.cpyext.modsupport import \
+                    create_module_from_def_and_spec
+            return create_module_from_def_and_spec(space, initret, w_spec,
+                                                   name)
     finally:
         state.package_context = old_context
+    w_mod = get_w_obj_and_decref(space, initret)
     state.fixup_extension(w_mod, name, path)
     return w_mod
 
+def exec_extension_module(space, w_mod):
+    from pypy.module.cpyext.modsupport import exec_def
+    if not space.config.objspace.usemodules.cpyext:
+        return
+    if not isinstance(w_mod, Module):
+        return
+    space.getbuiltinmodule("cpyext")
+    mod_as_pyobj = rawrefcount.from_obj(PyObject, w_mod)
+    if mod_as_pyobj:
+        return exec_def(space, w_mod, mod_as_pyobj)
+
 @specialize.ll()
 def generic_cpy_call(space, func, *args):
     FT = lltype.typeOf(func).TO
-    return make_generic_cpy_call(FT, False)(space, func, *args)
+    return make_generic_cpy_call(FT, False, True)(space, func, *args)
 
 @specialize.ll()
 def generic_cpy_call_expect_null(space, func, *args):
     FT = lltype.typeOf(func).TO
-    return make_generic_cpy_call(FT, True)(space, func, *args)
+    return make_generic_cpy_call(FT, True, True)(space, func, *args)
+
+ at specialize.ll()
+def generic_cpy_call_dont_convert_result(space, func, *args):
+    FT = lltype.typeOf(func).TO
+    return make_generic_cpy_call(FT, False, False)(space, func, *args)
 
 @specialize.memo()
-def make_generic_cpy_call(FT, expect_null):
+def make_generic_cpy_call(FT, expect_null, convert_result):
     from pypy.module.cpyext.pyobject import make_ref, from_ref
     from pypy.module.cpyext.pyobject import is_pyobj, as_pyobj
     from pypy.module.cpyext.pyobject import get_w_obj_and_decref
@@ -1634,8 +1666,9 @@
             keepalive_until_here(*keepalives)
 
         if is_PyObject(RESULT_TYPE):
-            if not is_pyobj(result):
+            if not convert_result or not is_pyobj(result):
                 ret = result
+                has_result = bool(ret)
             else:
                 # The object reference returned from a C function
                 # that is called from Python must be an owned reference
@@ -1644,10 +1677,10 @@
                     ret = get_w_obj_and_decref(space, result)
                 else:
                     ret = None
+                has_result = ret is not None
 
             # Check for exception consistency
             has_error = PyErr_Occurred(space) is not None
-            has_result = ret is not None
             if has_error and has_result:
                 raise oefmt(space.w_SystemError,
                             "An exception was set, but function returned a "
diff --git a/pypy/module/cpyext/include/modsupport.h b/pypy/module/cpyext/include/modsupport.h
--- a/pypy/module/cpyext/include/modsupport.h
+++ b/pypy/module/cpyext/include/modsupport.h
@@ -87,9 +87,9 @@
 #ifdef _WIN32
 /* explicitly export since PyAPI_FUNC is usually dllimport */
 #ifdef __cplusplus
-#define PyMODINIT_FUNC extern "C" __declspec(dllexport) void
+#define PyMODINIT_FUNC extern "C" __declspec(dllexport) PyObject*
 #else
-#define PyMODINIT_FUNC __declspec(dllexport) void
+#define PyMODINIT_FUNC __declspec(dllexport) PyObject*
 #endif
 #else
 #ifdef __cplusplus
diff --git a/pypy/module/cpyext/include/moduleobject.h b/pypy/module/cpyext/include/moduleobject.h
--- a/pypy/module/cpyext/include/moduleobject.h
+++ b/pypy/module/cpyext/include/moduleobject.h
@@ -8,6 +8,8 @@
 
 #include "cpyext_moduleobject.h"
 
+PyAPI_FUNC(PyObject *) PyModuleDef_Init(struct PyModuleDef*);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/pypy/module/cpyext/modsupport.py b/pypy/module/cpyext/modsupport.py
--- a/pypy/module/cpyext/modsupport.py
+++ b/pypy/module/cpyext/modsupport.py
@@ -1,7 +1,7 @@
 from rpython.rtyper.lltypesystem import rffi, lltype
 from pypy.module.cpyext.api import (
     cpython_api, METH_STATIC, METH_CLASS, METH_COEXIST, CANNOT_FAIL, cts,
-    parse_dir, bootstrap_function)
+    parse_dir, bootstrap_function, generic_cpy_call)
 from pypy.module.cpyext.pyobject import PyObject, as_pyobj, make_typedescr
 from pypy.interpreter.module import Module
 from pypy.module.cpyext.methodobject import (
@@ -14,6 +14,7 @@
 cts.parse_header(parse_dir / 'cpyext_moduleobject.h')
 PyModuleDef = cts.gettype('PyModuleDef *')
 PyModuleObject = cts.gettype('PyModuleObject *')
+PyModuleDef_Slot = cts.gettype('PyModuleDef_Slot')
 
 @bootstrap_function
 def init_moduleobject(space):
@@ -64,6 +65,89 @@
     return w_mod
 
 
+createfunctype = lltype.Ptr(lltype.FuncType([PyObject, PyModuleDef], PyObject))
+execfunctype = lltype.Ptr(lltype.FuncType([PyObject], rffi.INT_real))
+
+
+def create_module_from_def_and_spec(space, moddef, w_spec, name):
+    moddef = rffi.cast(PyModuleDef, moddef)
+    if moddef.c_m_size < 0:
+        raise oefmt(space.w_SystemError,
+                    "module %s: m_size may not be negative for multi-phase "
+                    "initialization", name)
+    createf = lltype.nullptr(rffi.VOIDP.TO)
+    has_execution_slots = False
+    cur_slot = rffi.cast(rffi.CArrayPtr(PyModuleDef_Slot), moddef.c_m_slots)
+    if cur_slot:
+        while True:
+            slot = rffi.cast(lltype.Signed, cur_slot[0].c_slot)
+            if slot == 0:
+                break
+            elif slot == 1:
+                if createf:
+                    raise oefmt(space.w_SystemError,
+                                "module %s has multiple create slots", name)
+                createf = cur_slot[0].c_value
+            elif slot < 0 or slot > 2:
+                raise oefmt(space.w_SystemError,
+                            "module %s uses unknown slot ID %d", name, slot)
+            else:
+                has_execution_slots = True
+            cur_slot = rffi.ptradd(cur_slot, 1)
+    if createf:
+        createf = rffi.cast(createfunctype, createf)
+        w_mod = generic_cpy_call(space, createf, w_spec, moddef)
+    else:
+        w_mod = Module(space, space.newtext(name))
+    if isinstance(w_mod, Module):
+        mod = rffi.cast(PyModuleObject, as_pyobj(space, w_mod))
+        #mod.c_md_state = None
+        mod.c_md_def = moddef
+    else:
+        if moddef.c_m_size > 0 or moddef.c_m_traverse or moddef.c_m_clear or \
+           moddef.c_m_free:
+            raise oefmt(space.w_SystemError,
+                        "module %s is not a module object, but requests "
+                        "module state", name)
+        if has_execution_slots:
+            raise oefmt(space.w_SystemError,
+                        "module %s specifies execution slots, but did not "
+                        "create a ModuleType instance", name)
+    dict_w = {}
+    convert_method_defs(space, dict_w, moddef.c_m_methods, None, w_mod, name)
+    for key, w_value in dict_w.items():
+        space.setattr(w_mod, space.newtext(key), w_value)
+    if moddef.c_m_doc:
+        doc = rffi.charp2str(rffi.cast(rffi.CCHARP, moddef.c_m_doc))
+        space.setattr(w_mod, space.newtext('__doc__'), space.newtext(doc))
+    return w_mod
+
+
+def exec_def(space, w_mod, mod_as_pyobj):
+    from pypy.module.cpyext.pyerrors import PyErr_Occurred
+    mod = rffi.cast(PyModuleObject, mod_as_pyobj)
+    moddef = mod.c_md_def
+    cur_slot = rffi.cast(rffi.CArrayPtr(PyModuleDef_Slot), moddef.c_m_slots)
+    while cur_slot and rffi.cast(lltype.Signed, cur_slot[0].c_slot):
+        if rffi.cast(lltype.Signed, cur_slot[0].c_slot) == 2:
+            execf = rffi.cast(execfunctype, cur_slot[0].c_value)
+            res = generic_cpy_call(space, execf, w_mod)
+            has_error = PyErr_Occurred(space) is not None
+            if rffi.cast(lltype.Signed, res):
+                if has_error:
+                    state = space.fromcache(State)
+                    state.check_and_raise_exception()
+                else:
+                    raise oefmt(space.w_SystemError,
+                                "execution of module %S failed without "
+                                "setting an exception", w_mod.w_name)
+            if has_error:
+                raise oefmt(space.w_SystemError,
+                            "execution of module %S raised unreported "
+                            "exception", w_mod.w_name)
+        cur_slot = rffi.ptradd(cur_slot, 1)
+
+
 def convert_method_defs(space, dict_w, methods, w_type, w_self=None, name=None):
     w_name = space.newtext_or_none(name)
     methods = rffi.cast(rffi.CArrayPtr(PyMethodDef), methods)
diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -4,10 +4,10 @@
 
 from rpython.rtyper.lltypesystem import rffi, lltype
 from rpython.rlib.rarithmetic import widen
-from rpython.rlib import rgc # Force registration of gc.collect
+from rpython.rlib import rgc  # Force registration of gc.collect
 from pypy.module.cpyext.api import (
     slot_function, generic_cpy_call, PyObject, Py_ssize_t,
-    pypy_decl, Py_buffer, Py_bufferP, PyTypeObjectPtr, cts)
+    Py_buffer, Py_bufferP, PyTypeObjectPtr, cts)
 from pypy.module.cpyext.typeobjectdefs import (
     unaryfunc, ternaryfunc, binaryfunc,
     getattrfunc, getattrofunc, setattrofunc, lenfunc, ssizeargfunc, inquiry,
@@ -794,6 +794,16 @@
         return 0
     return buff_w
 
+missing_wrappers = ['wrap_indexargfunc', 'wrap_del']
+for name in missing_wrappers:
+    assert name not in globals()
+    def missing_wrapper(space, w_self, w_args, func):
+        print "cpyext: missing slot wrapper " + name
+        raise NotImplementedError("Slot wrapper " + name)
+    missing_wrapper.__name__ = name
+    globals()[name] = missing_wrapper
+
+
 PyWrapperFlag_KEYWORDS = 1
 
 class TypeSlot:
@@ -811,7 +821,7 @@
     if WRAPPER is None:
         wrapper = None
     else:
-        wrapper = globals().get(WRAPPER, Ellipsis)
+        wrapper = globals()[WRAPPER]
 
     # irregular interface, because of tp_getattr/tp_getattro confusion
     if NAME == "__getattr__":
@@ -825,17 +835,9 @@
     function = getattr(userslot, FUNCTION or '!missing', None)
     assert FLAGS == 0 or FLAGS == PyWrapperFlag_KEYWORDS
     if FLAGS:
-        if wrapper is Ellipsis:
-            @func_renamer(WRAPPER)
-            def wrapper(space, w_self, w_args, func, w_kwds):
-                raise NotImplementedError("Wrapper for slot " + NAME)
         wrapper1 = None
         wrapper2 = wrapper
     else:
-        if wrapper is Ellipsis:
-            @func_renamer(WRAPPER)
-            def wrapper(space, w_self, w_args, func):
-                raise NotImplementedError("Wrapper for slot " + NAME)
         wrapper1 = wrapper
         wrapper2 = None
     return TypeSlot(NAME, SLOT, function, wrapper1, wrapper2, DOC)
diff --git a/pypy/module/cpyext/src/modsupport.c b/pypy/module/cpyext/src/modsupport.c
--- a/pypy/module/cpyext/src/modsupport.c
+++ b/pypy/module/cpyext/src/modsupport.c
@@ -602,3 +602,26 @@
     }
     return ((PyModuleObject *)m)->md_def;
 }
+
+PyTypeObject PyModuleDef_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "moduledef",                                /* tp_name */
+    sizeof(struct PyModuleDef),                 /* tp_size */
+    0,                                          /* tp_itemsize */
+};
+
+static Py_ssize_t max_module_number;
+
+PyObject*
+PyModuleDef_Init(struct PyModuleDef* def)
+{
+    if (PyType_Ready(&PyModuleDef_Type) < 0)
+         return NULL;
+    if (def->m_base.m_index == 0) {
+        max_module_number++;
+        Py_REFCNT(def) = 1;
+        Py_TYPE(def) = &PyModuleDef_Type;
+        def->m_base.m_index = max_module_number;
+    }
+    return (PyObject*)def;
+}
diff --git a/pypy/module/cpyext/test/buffer_test.c b/pypy/module/cpyext/test/buffer_test.c
--- a/pypy/module/cpyext/test/buffer_test.c
+++ b/pypy/module/cpyext/test/buffer_test.c
@@ -344,7 +344,6 @@
 #endif
     if (m == NULL)
         INITERROR;
-    PyMyArrayType.tp_new = PyType_GenericNew;
     if (PyType_Ready(&PyMyArrayType) < 0)
         INITERROR;
     Py_INCREF(&PyMyArrayType);
diff --git a/pypy/module/cpyext/test/comparisons.c b/pypy/module/cpyext/test/comparisons.c
--- a/pypy/module/cpyext/test/comparisons.c
+++ b/pypy/module/cpyext/test/comparisons.c
@@ -68,7 +68,7 @@
     0,                                              /* tp_dictoffset */
     0,                                              /* tp_init */
     0,                                              /* tp_alloc */
-    0,                                              /* tp_new */
+    PyType_GenericNew,                              /* tp_new */
     0                                               /* tp_free */
 };
 
@@ -87,7 +87,6 @@
 {
     PyObject *m, *d;
 
-    CmpType.tp_new = PyType_GenericNew;
     if (PyType_Ready(&CmpType) < 0)
         return NULL;
     m = PyModule_Create(&moduledef);
diff --git a/pypy/module/cpyext/test/foo.c b/pypy/module/cpyext/test/foo.c
--- a/pypy/module/cpyext/test/foo.c
+++ b/pypy/module/cpyext/test/foo.c
@@ -36,14 +36,14 @@
     Py_ssize_t foo_ssizet;
 } fooobject;
 
-static PyTypeObject footype;
+static PyTypeObject fooType;
 
 static fooobject *
 newfooobject(void)
 {
     fooobject *foop;
 
-    foop = PyObject_New(fooobject, &footype);
+    foop = PyObject_New(fooobject, &fooType);
     if (foop == NULL)
         return NULL;
 
@@ -160,6 +160,28 @@
     return PyObject_GenericSetAttr((PyObject *)self, name, value);
 }
 
+static PyObject *
+new_fooType(PyTypeObject * t, PyObject *args, PyObject *kwds)
+{
+    PyObject * o;
+    /* copied from numpy scalartypes.c for inherited classes */
+    if (t->tp_bases && (PyTuple_GET_SIZE(t->tp_bases) > 1))
+    {
+        PyTypeObject *sup; 
+        /* We are inheriting from a Python type as well so 
+           give it first dibs on conversion */
+        sup = (PyTypeObject *)PyTuple_GET_ITEM(t->tp_bases, 1);
+        /* Prevent recursion */ 
+        if (new_fooType != sup->tp_new) 
+        {
+            o = sup->tp_new(t, args, kwds);
+            return o;
+        }
+    }
+    o = t->tp_alloc(t, 0);
+    return o;   
+};
+
 static PyMemberDef foo_members[] = {
     {"int_member", T_INT, offsetof(fooobject, foo), 0,
      "A helpful docstring."},
@@ -194,7 +216,7 @@
 
 PyDoc_STRVAR(foo_doc, "foo is for testing.");
 
-static PyTypeObject footype = {
+static PyTypeObject fooType = {
     PyVarObject_HEAD_INIT(NULL, 0)
     "foo.foo",               /*tp_name*/
     sizeof(fooobject),       /*tp_size*/
@@ -592,7 +614,7 @@
 
     0,          /*tp_init*/
     0,          /*tp_alloc  will be set to PyType_GenericAlloc in module init*/
-    0,          /*tp_new*/
+    PyType_GenericNew, /*tp_new*/
     0,          /*tp_free  Low-level free-memory routine */
     0,          /*tp_is_gc For PyObject_IS_GC */
     0,          /*tp_bases*/
@@ -648,6 +670,37 @@
     return PyInt_FromLong(tf);
 }
 
+static PyTypeObject GetType1 = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "foo.GetType1",          /*tp_name*/
+    sizeof(PyObject),        /*tp_size*/
+};
+static PyTypeObject GetType2 = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "foo.GetType2",          /*tp_name*/
+    sizeof(PyObject),        /*tp_size*/
+};
+static PyObject *gettype1, *gettype2;
+
+static PyObject *gettype1_getattr(PyObject *self, char *name)
+{
+    char buf[200];
+    strcpy(buf, "getattr:");
+    strcat(buf, name);
+    return PyBytes_FromString(buf);
+}
+static PyObject *gettype2_getattro(PyObject *self, PyObject *name)
+{
+    char buf[200];
+    PyObject* temp;
+    temp = PyUnicode_AsASCIIString(name);
+    if (temp == NULL) return NULL;
+    strcpy(buf, "getattro:");
+    strcat(buf, PyBytes_AS_STRING(temp));
+    return PyBytes_FromString(buf);
+}
+
+
 /* List of functions exported by this module */
 
 static PyMethodDef foo_functions[] = {
@@ -706,13 +759,14 @@
     if (module == NULL)
         INITERROR;
 
-    footype.tp_new = PyType_GenericNew;
-
     UnicodeSubtype.tp_base = &PyUnicode_Type;
     UnicodeSubtype2.tp_base = &UnicodeSubtype;
     MetaType.tp_base = &PyType_Type;
 
-    if (PyType_Ready(&footype) < 0)
+    fooType.tp_new = &new_fooType;
+    InitErrType.tp_new = PyType_GenericNew;
+
+    if (PyType_Ready(&fooType) < 0)
         INITERROR;
     if (PyType_Ready(&UnicodeSubtype) < 0)
         INITERROR;
@@ -725,8 +779,6 @@
     if (PyType_Ready(&SimplePropertyType) < 0)
         INITERROR;
 
-    SimplePropertyType.tp_new = PyType_GenericNew;
-    InitErrType.tp_new = PyType_GenericNew;
 
     Py_TYPE(&CustomType) = &MetaType;
     if (PyType_Ready(&CustomType) < 0)
@@ -744,11 +796,23 @@
     if (PyType_Ready(&TupleLike) < 0)
         INITERROR;
 
+    GetType1.tp_flags = Py_TPFLAGS_DEFAULT;
+    GetType1.tp_getattr = &gettype1_getattr;
+    if (PyType_Ready(&GetType1) < 0)
+        INITERROR;
+    gettype1 = PyObject_New(PyObject, &GetType1);
+
+    GetType2.tp_flags = Py_TPFLAGS_DEFAULT;
+    GetType2.tp_getattro = &gettype2_getattro;
+    if (PyType_Ready(&GetType2) < 0)
+        INITERROR;
+    gettype2 = PyObject_New(PyObject, &GetType2);
+
 
     d = PyModule_GetDict(module);
     if (d == NULL)
         INITERROR;
-    if (PyDict_SetItemString(d, "fooType", (PyObject *)&footype) < 0)
+    if (PyDict_SetItemString(d, "fooType", (PyObject *)&fooType) < 0)
         INITERROR;
     if (PyDict_SetItemString(d, "UnicodeSubtype", (PyObject *) &UnicodeSubtype) < 0)
         INITERROR;
@@ -766,6 +830,10 @@
         INITERROR;
     if (PyDict_SetItemString(d, "TupleLike", (PyObject *) &TupleLike) < 0)
         INITERROR;
+    if (PyDict_SetItemString(d, "gettype1", gettype1) < 0)
+        INITERROR;
+    if (PyDict_SetItemString(d, "gettype2", gettype2) < 0)
+        INITERROR;
 #if PY_MAJOR_VERSION >=3
     return module;
 #endif
diff --git a/pypy/module/cpyext/test/multiphase.c b/pypy/module/cpyext/test/multiphase.c
new file mode 100644
--- /dev/null
+++ b/pypy/module/cpyext/test/multiphase.c
@@ -0,0 +1,28 @@
+#include "Python.h"
+
+static struct PyModuleDef multiphase_def;
+
+static PyObject *check_getdef_same(PyObject *self, PyObject *args) {
+    return PyBool_FromLong(PyModule_GetDef(self) == &multiphase_def);
+}
+
+static PyMethodDef methods[] = {
+    {"check_getdef_same", check_getdef_same, METH_NOARGS},
+    {NULL}
+};
+
+static PyModuleDef multiphase_def = {
+    PyModuleDef_HEAD_INIT, /* m_base */
+    "multiphase",          /* m_name */
+    "example docstring",   /* m_doc */
+    0,                     /* m_size */
+    methods,               /* m_methods */
+    NULL,                  /* m_slots */
+    NULL,                  /* m_traverse */
+    NULL,                  /* m_clear */
+    NULL,                  /* m_free */
+};
+
+PyMODINIT_FUNC PyInit_multiphase(void) {
+    return PyModuleDef_Init(&multiphase_def);
+}
diff --git a/pypy/module/cpyext/test/test_classobject.py b/pypy/module/cpyext/test/test_classobject.py
--- a/pypy/module/cpyext/test/test_classobject.py
+++ b/pypy/module/cpyext/test/test_classobject.py
@@ -27,15 +27,3 @@
         InstanceMethod.testmethod.attribute = "test"
         assert testfunction.attribute == "test"
         raises(AttributeError, setattr, inst.testmethod, "attribute", "test")
-
-    def test_pyclass_new_no_bases(self):
-        module = self.import_extension('foo', [
-            ("new_foo", "METH_O",
-             """
-                 return PyClass_New(NULL, PyDict_New(), args);
-             """)])
-        FooClass = module.new_foo("FooClass")
-        class Cls1:
-            pass
-        assert type(FooClass) is type(Cls1)
-        assert FooClass.__bases__ == Cls1.__bases__
diff --git a/pypy/module/cpyext/test/test_cpyext.py b/pypy/module/cpyext/test/test_cpyext.py
--- a/pypy/module/cpyext/test/test_cpyext.py
+++ b/pypy/module/cpyext/test/test_cpyext.py
@@ -40,9 +40,11 @@
 
     def load_module(self, mod, name):
         space = self.space
-        api.load_extension_module(space, mod, name)
-        return space.getitem(
-            space.sys.get('modules'), space.wrap(name))
+        w_path = space.newtext(mod)
+        w_name = space.newtext(name)
+        return space.appexec([w_name, w_path], '''(name, path):
+            import imp
+            return imp.load_dynamic(name, path)''')
 
 
 def get_cpyext_info(space):
diff --git a/pypy/module/cpyext/test/test_memoryobject.py b/pypy/module/cpyext/test/test_memoryobject.py
--- a/pypy/module/cpyext/test/test_memoryobject.py
+++ b/pypy/module/cpyext/test/test_memoryobject.py
@@ -187,6 +187,10 @@
                           " on too long format string"
         finally:
             warnings.resetwarnings()
+        # calling get_buffer_info on x creates a memory leak,
+        # which is detected as an error at test teardown:
+        # Exception TypeError: "'NoneType' object is not callable"
+        #         in <bound method ConcreteArray.__del__ ...> ignored
 
     def test_releasebuffer(self):
         if not self.runappdirect:
diff --git a/pypy/module/cpyext/test/test_module.py b/pypy/module/cpyext/test/test_module.py
--- a/pypy/module/cpyext/test/test_module.py
+++ b/pypy/module/cpyext/test/test_module.py
@@ -25,12 +25,85 @@
         module = self.import_extension('foo', [
             ("check_getdef_same", "METH_NOARGS",
              """
-                 return PyBool_FromLong(PyModule_GetDef(mod_global) == &moduledef);
+                 return PyBool_FromLong(PyModule_GetDef(self) == &moduledef);
              """
             )], prologue="""
             static struct PyModuleDef moduledef;
-            static PyObject *mod_global;
-            """, more_init="""
-               mod_global = mod;
             """)
         assert module.check_getdef_same()
+
+
+class AppTestMultiPhase(AppTestCpythonExtensionBase):
+    def test_basic(self):
+        from types import ModuleType
+        module = self.import_module(name='multiphase')
+        assert isinstance(module, ModuleType)
+        assert module.__name__ == 'multiphase'
+        assert module.__doc__ == "example docstring"
+
+    def test_getdef(self):
+        from types import ModuleType
+        module = self.import_module(name='multiphase')
+        assert module.check_getdef_same()
+
+    def test_slots(self):
+        from types import ModuleType
+        body = """
+        static PyModuleDef multiphase_def;
+
+        static PyObject* multiphase_create(PyObject *spec, PyModuleDef *def) {
+            PyObject *module = PyModule_New("altname");
+            PyObject_SetAttrString(module, "create_spec", spec);
+            PyObject_SetAttrString(module, "create_def_eq",
+                                   PyBool_FromLong(def == &multiphase_def));
+            return module;
+        }
+
+        static int multiphase_exec(PyObject* module) {
+            Py_INCREF(Py_True);
+            PyObject_SetAttrString(module, "exec_called", Py_True);
+            return 0;
+        }
+
+        static PyModuleDef_Slot multiphase_slots[] = {
+            {Py_mod_create, multiphase_create},
+            {Py_mod_exec, multiphase_exec},
+            {0, NULL}
+        };
+
+        static PyModuleDef multiphase_def = {
+            PyModuleDef_HEAD_INIT,                      /* m_base */
+            "multiphase",                               /* m_name */
+            "example docstring",                        /* m_doc */
+            0,                                          /* m_size */
+            NULL,                                       /* m_methods */
+            multiphase_slots,                           /* m_slots */
+            NULL,                                       /* m_traverse */
+            NULL,                                       /* m_clear */
+            NULL,                                       /* m_free */
+        };
+        """
+        init = """
+        return PyModuleDef_Init(&multiphase_def);
+        """
+        module = self.import_module(name='multiphase', body=body, init=init)
+        assert module.create_spec
+        assert module.create_spec is module.__spec__
+        assert module.create_def_eq
+        assert module.exec_called
+
+    def test_forget_init(self):
+        from types import ModuleType
+        body = """
+        static PyModuleDef multiphase_def = {
+            PyModuleDef_HEAD_INIT,                      /* m_base */
+            "multiphase",                               /* m_name */
+            "example docstring",                        /* m_doc */
+            0,                                          /* m_size */
+        };
+        """
+        init = """
+        return (PyObject *) &multiphase_def;
+        """
+        raises(SystemError, self.import_module, name='multiphase', body=body,
+               init=init)
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -16,12 +16,12 @@
         assert 'foo' in sys.modules
         assert "copy" in dir(module.fooType)
         obj = module.new()
-        print(obj.foo)
+        #print(obj.foo)
         assert obj.foo == 42
-        print("Obj has type", type(obj))
+        #print("Obj has type", type(obj))
         assert type(obj) is module.fooType
-        print("type of obj has type", type(type(obj)))
-        print("type of type of obj has type", type(type(type(obj))))
+        #print("type of obj has type", type(type(obj)))
+        #print("type of type of obj has type", type(type(type(obj))))
         assert module.fooType.__doc__ == "foo is for testing."
 
     def test_typeobject_method_descriptor(self):
@@ -949,6 +949,8 @@
             pass
         class foo(f2, f1):
             pass
+
+        x = foo()
         assert bar.__base__ is f2
         # On cpython, the size changes.
         if '__pypy__' in sys.builtin_module_names:
@@ -1159,8 +1161,8 @@
                   ((PyHeapTypeObject*)Base2)->ht_name = dummyname;
                   ((PyHeapTypeObject*)Base12)->ht_name = dummyname;
                 }
-                #endif 
-                #endif 
+                #endif
+                #endif
                 Base1->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
                 Base2->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
                 Base12->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HEAPTYPE;
@@ -1198,24 +1200,13 @@
         bases = module.foo(C)
         assert bases == (A, B)
 
-    def test_multiple_inheritance_old_style_base(self):
-        module = self.import_extension('foo', [
-           ("foo", "METH_O",
-            '''
-                PyTypeObject *tp;
-                tp = (PyTypeObject*)args;
-                Py_INCREF(tp->tp_bases);
-                return tp->tp_bases;
-            '''
-            )])
-        # used to segfault after some iterations
-        for i in range(11):
-            print i
-            class A(object):
-                pass
-            class B:
-                pass
-            class C(A, B):
-                pass
-            bases = module.foo(C)
-            assert bases == (A, B)
+    def test_getattr_getattro(self):
+        module = self.import_module(name='foo')
+        assert module.gettype2.dcba == b'getattro:dcba'
+        assert (type(module.gettype2).__getattribute__(module.gettype2, 'dcBA')
+            == b'getattro:dcBA')
+        assert module.gettype1.abcd == b'getattr:abcd'
+        # GetType1 objects have a __getattribute__ method, but this
+        # doesn't call tp_getattr at all, also on CPython
+        raises(AttributeError, type(module.gettype1).__getattribute__,
+                               module.gettype1, 'dcBA')
diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py
--- a/pypy/module/cpyext/typeobject.py
+++ b/pypy/module/cpyext/typeobject.py
@@ -682,10 +682,6 @@
         if pto.c_tp_itemsize < pto.c_tp_base.c_tp_itemsize:
             pto.c_tp_itemsize = pto.c_tp_base.c_tp_itemsize
 
-    if space.is_w(w_type, space.w_object):
-        # will be filled later on with the correct value
-        # may not be 0
-        pto.c_tp_new = cts.cast('newfunc', 1)
     update_all_slots(space, w_type, pto)
     if not pto.c_tp_new:
         base_object_pyo = make_ref(space, space.w_object)
diff --git a/pypy/module/exceptions/__init__.py b/pypy/module/exceptions/__init__.py

From pypy.commits at gmail.com  Wed Apr 12 20:32:36 2017
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 12 Apr 2017 17:32:36 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: fix W_StringBufferObject.buffer_w()
Message-ID: <58eec724.58cb190a.2483f.f0b3@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91049:61490339e1fe
Date: 2017-04-13 01:09 +0100
http://bitbucket.org/pypy/pypy/changeset/61490339e1fe/

Log:	fix W_StringBufferObject.buffer_w()

diff --git a/pypy/objspace/std/strbufobject.py b/pypy/objspace/std/strbufobject.py
--- a/pypy/objspace/std/strbufobject.py
+++ b/pypy/objspace/std/strbufobject.py
@@ -2,9 +2,9 @@
 
 import py
 
-from pypy.objspace.std.bytesobject import (W_AbstractBytesObject,
-    W_BytesObject, StringBuffer)
+from pypy.objspace.std.bytesobject import W_AbstractBytesObject, W_BytesObject
 from pypy.interpreter.gateway import interp2app, unwrap_spec
+from pypy.interpreter.buffer import SimpleBuffer, StringBuffer
 from pypy.interpreter.error import OperationError
 from rpython.rlib.rstring import StringBuilder
 
@@ -38,7 +38,7 @@
         return self.force()
 
     def buffer_w(self, space, flags):
-        return StringBuffer(self.force())
+        return SimpleBuffer(StringBuffer(self.force()))
 
     def descr_len(self, space):
         return space.newint(self.length)

From pypy.commits at gmail.com  Wed Apr 12 20:32:39 2017
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 12 Apr 2017 17:32:39 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Fix BufferSlice.parent_index()
Message-ID: <58eec727.db002e0a.e6f83.970e@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91050:6e4f2ef8a6bf
Date: 2017-04-13 01:31 +0100
http://bitbucket.org/pypy/pypy/changeset/6e4f2ef8a6bf/

Log:	Fix BufferSlice.parent_index()

diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -598,7 +598,7 @@
         self.readonly = self.buf.readonly
         self.strides = buf.getstrides()[:]
         itemsize = buf.getitemsize()
-        self.offset = start * itemsize
+        self.start = start
         self.step = step
         self.strides[0] *= step
         self.shape = buf.getshape()[:]
@@ -611,19 +611,20 @@
         if start == stop:
             return ''     # otherwise, adding self.offset might make them
                           # out of bounds
-        return self.buf.getbytes(self.offset + start, self.offset + stop,
-                                    step, size)
+        offset = self.start * self.getitemsize()
+        return self.buf.getbytes(offset + start, offset + stop, step, size)
 
     def setbytes(self, start, string):
         if len(string) == 0:
             return        # otherwise, adding self.offset might make 'start'
                           # out of bounds
-        self.buf.setbytes(self.offset + start, string)
+        offset = self.start * self.getitemsize()
+        self.buf.setbytes(offset + start, string)
 
     def get_raw_address(self):
         from rpython.rtyper.lltypesystem import rffi
         ptr = self.buf.get_raw_address()
-        return rffi.ptradd(ptr, self.offset)
+        return rffi.ptradd(ptr, self.start * self.getitemsize())
 
     def getformat(self):
         return self.buf.getformat()
@@ -641,7 +642,7 @@
         return self.strides
 
     def parent_index(self, idx):
-        return self.offset + self.step * idx
+        return self.start + self.step * idx
 
     def w_getitem(self, space, idx):
         return self.buf.w_getitem(space, self.parent_index(idx))

From pypy.commits at gmail.com  Wed Apr 12 23:36:51 2017
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 12 Apr 2017 20:36:51 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Add .value_from_bytes() and
 .bytes_from_value() to PyBuffer
Message-ID: <58eef253.41452e0a.e5390.9532@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91051:4c5c68bbefa0
Date: 2017-04-13 04:36 +0100
http://bitbucket.org/pypy/pypy/changeset/4c5c68bbefa0/

Log:	Add .value_from_bytes() and .bytes_from_value() to PyBuffer

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -50,6 +50,25 @@
     def releasebuffer(self):
         pass
 
+    def value_from_bytes(self, space, s):
+        from pypy.module.struct.formatiterator import UnpackFormatIterator
+        buf = StringBuffer(s)
+        fmtiter = UnpackFormatIterator(space, buf)
+        fmtiter.interpret(self.getformat())
+        return fmtiter.result_w[0]
+
+    def bytes_from_value(self, space, w_val):
+        from pypy.module.struct.formatiterator import PackFormatIterator
+        itemsize = self.getitemsize()
+        fmtiter = PackFormatIterator(space, [w_val], itemsize)
+        try:
+            fmtiter.interpret(self.getformat())
+        except StructError as e:
+            raise oefmt(space.w_TypeError,
+                        "memoryview: invalid type for format '%s'",
+                        self.getformat())
+        return fmtiter.result.build()
+
     def _copy_buffer(self):
         if self.getndim() == 0:
             itemsize = self.getitemsize()
@@ -102,37 +121,18 @@
 
 
     def w_getitem(self, space, idx):
-        from pypy.module.struct.formatiterator import UnpackFormatIterator
         offset = self.get_offset(space, 0, idx)
         itemsize = self.getitemsize()
-        if itemsize == 1:
-            ch = self.as_binary()[offset]
-            return space.newint(ord(ch))
-        else:
-            # TODO: this probably isn't very fast
-            buf = SubBuffer(self.as_binary(), offset, itemsize)
-            fmtiter = UnpackFormatIterator(space, buf)
-            fmtiter.length = buf.getlength()
-            fmtiter.interpret(self.getformat())
-            return fmtiter.result_w[0]
+        # TODO: this probably isn't very fast
+        data = self.getbytes(offset, offset + itemsize, 1, itemsize)
+        return self.value_from_bytes(space, data)
 
     def setitem_w(self, space, idx, w_obj):
-        from pypy.module.struct.formatiterator import PackFormatIterator
         offset = self.get_offset(space, 0, idx)
         itemsize = self.getitemsize()
-        if itemsize == 1:
-            self.as_binary()[offset] = space.byte_w(w_obj)
-        else:
-            # TODO: this probably isn't very fast
-            fmtiter = PackFormatIterator(space, [w_obj], itemsize)
-            try:
-                fmtiter.interpret(self.getformat())
-            except StructError as e:
-                raise oefmt(space.w_TypeError,
-                            "memoryview: invalid type for format '%s'",
-                            self.getformat())
-            byteval = fmtiter.result.build()
-            self.setbytes(offset, byteval)
+        # TODO: this probably isn't very fast
+        byteval = self.bytes_from_value(space, w_obj)
+        self.setbytes(offset, byteval)
 
     def w_tolist(self, space):
         dim = self.getndim()
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -9,7 +9,7 @@
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.gateway import interp2app
 from pypy.interpreter.typedef import TypeDef, GetSetProperty,  make_weakref_descr
-from pypy.module.struct.formatiterator import UnpackFormatIterator, PackFormatIterator
+from pypy.module.struct.formatiterator import UnpackFormatIterator
 from rpython.rlib.unroll import unrolling_iterable
 from rpython.rlib.objectmodel import always_inline
 
diff --git a/pypy/objspace/std/test/test_memoryobject.py b/pypy/objspace/std/test/test_memoryobject.py
--- a/pypy/objspace/std/test/test_memoryobject.py
+++ b/pypy/objspace/std/test/test_memoryobject.py
@@ -331,8 +331,8 @@
     def getformat(self):
         return self.format
 
-    def getitem(self, index):
-        return self.data[index:index+1]
+    def getbytes(self, start, stop, step, size):
+        return self.data[start:stop]
 
     def getlength(self):
         return len(self.data)
@@ -408,11 +408,6 @@
         empty = self.MockArray([], dim=1, fmt='i', size=4, strides=[1], shape=[1])
         view = memoryview(empty)
         raises(TypeError, "view.cast('l')")
-        try:
-            view.cast('l')
-            assert False, "i -> l not possible. buffer must be byte format"
-        except TypeError:
-            pass
 
     def test_cast_empty(self):
         empty = self.MockArray([], dim=1, fmt='b', size=1, strides=[1], shape=[1])

From pypy.commits at gmail.com  Thu Apr 13 01:59:33 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 12 Apr 2017 22:59:33 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Change _cffi_src/openssl/callbacks.py to
 stop relying on the CPython C
Message-ID: <58ef13c5.020f2e0a.b493d.a2f4@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r91052:198dc138680f
Date: 2017-04-13 07:58 +0200
http://bitbucket.org/pypy/pypy/changeset/198dc138680f/

Log:	Change _cffi_src/openssl/callbacks.py to stop relying on the CPython
	C API.

diff --git a/lib_pypy/_cffi_ssl/README.md b/lib_pypy/_cffi_ssl/README.md
--- a/lib_pypy/_cffi_ssl/README.md
+++ b/lib_pypy/_cffi_ssl/README.md
@@ -5,16 +5,22 @@
 it renames the compiled shared object to _pypy_openssl.so (which means
 that cryptography can ship their own cffi backend)
 
+NOTE: currently, we have changed ``_cffi_src/openssl/callbacks.py`` to
+not rely on the CPython C API.
+
 # Tests?
 
 Currently this module is tested using CPython's standard library test suite.
 
 # Install it into PyPy's source tree
 
-Copy over all the sources into the folder `lib_pypy/_cffi_ssl/*`. Updating the cffi backend can be simply done by the following command:
+Copy over all the sources into the folder `lib_pypy/_cffi_ssl/*`. Updating the cffi backend can be simply done by the following command::
 
     $ cp -r <cloned cryptography folder>/src/_cffi_src/* .
 
+NOTE: you need to keep our version of ``_cffi_src/openssl/callbacks.py``
+for now!
+
 # Crpytography version
 
 Copied over release version `1.7.2`
diff --git a/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py b/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
--- a/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
+++ b/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
@@ -13,8 +13,6 @@
 #include <openssl/x509.h>
 #include <openssl/x509_vfy.h>
 #include <openssl/crypto.h>
-
-#include <pythread.h>
 """
 
 TYPES = """
@@ -64,8 +62,44 @@
    Copyright 2001-2016 Python Software Foundation; All Rights Reserved.
 */
 
+#ifdef _WIN32
+#include <Windows.h>
+typedef CRITICAL_SECTION mutex1_t;
+static inline void mutex1_init(mutex1_t *mutex) {
+    InitializeCriticalSection(mutex);
+}
+static inline void mutex1_lock(mutex1_t *mutex) {
+    EnterCriticalSection(mutex);
+}
+static inline void mutex1_unlock(mutex1_t *mutex) {
+    LeaveCriticalSection(mutex);
+}
+#else
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+typedef pthread_mutex_t mutex1_t;
+#define ASSERT_STATUS(call)                             \
+    if (call != 0) {                                    \
+        perror("Fatal error in _cffi_ssl: " #call);     \
+        abort();                                        \
+    }
+static inline void mutex1_init(mutex1_t *mutex) {
+#if !defined(pthread_mutexattr_default)
+#  define pthread_mutexattr_default ((pthread_mutexattr_t *)NULL)
+#endif
+    ASSERT_STATUS(pthread_mutex_init(mutex, pthread_mutexattr_default));
+}
+static inline void mutex1_lock(mutex1_t *mutex) {
+    ASSERT_STATUS(pthread_mutex_lock(mutex));
+}
+static inline void mutex1_unlock(mutex1_t *mutex) {
+    ASSERT_STATUS(pthread_mutex_unlock(mutex));
+}
+#endif
+
 static unsigned int _ssl_locks_count = 0;
-static PyThread_type_lock *_ssl_locks = NULL;
+static mutex1_t *_ssl_locks = NULL;
 
 static void _ssl_thread_locking_function(int mode, int n, const char *file,
                                          int line) {
@@ -89,35 +123,32 @@
     }
 
     if (mode & CRYPTO_LOCK) {
-        PyThread_acquire_lock(_ssl_locks[n], 1);
+        mutex1_lock(_ssl_locks + n);
     } else {
-        PyThread_release_lock(_ssl_locks[n]);
+        mutex1_unlock(_ssl_locks + n);
+    }
+}
+
+static void init_mutexes(void)
+{
+    int i;
+    for (i = 0;  i < _ssl_locks_count;  i++) {
+        mutex1_init(_ssl_locks + i);
     }
 }
 
 int _setup_ssl_threads(void) {
-    unsigned int i;
-
     if (_ssl_locks == NULL) {
         _ssl_locks_count = CRYPTO_num_locks();
-        _ssl_locks = PyMem_New(PyThread_type_lock, _ssl_locks_count);
+        _ssl_locks = malloc(sizeof(mutex1_t) * _ssl_locks_count);
         if (_ssl_locks == NULL) {
-            PyErr_NoMemory();
             return 0;
         }
-        memset(_ssl_locks, 0, sizeof(PyThread_type_lock) * _ssl_locks_count);
-        for (i = 0;  i < _ssl_locks_count;  i++) {
-            _ssl_locks[i] = PyThread_allocate_lock();
-            if (_ssl_locks[i] == NULL) {
-                unsigned int j;
-                for (j = 0;  j < i;  j++) {
-                    PyThread_free_lock(_ssl_locks[j]);
-                }
-                PyMem_Free(_ssl_locks);
-                return 0;
-            }
-        }
+        init_mutexes();
         CRYPTO_set_locking_callback(_ssl_thread_locking_function);
+#ifndef _WIN32
+        pthread_atfork(NULL, NULL, &init_mutexes);
+#endif
     }
     return 1;
 }

From pypy.commits at gmail.com  Thu Apr 13 04:09:43 2017
From: pypy.commits at gmail.com (tobweber)
Date: Thu, 13 Apr 2017 01:09:43 -0700 (PDT)
Subject: [pypy-commit] stmgc c8-long-transactions: Define large nursery mark
 in a more straight forward way and make single thread mode transactions
 inevitable
Message-ID: <58ef3247.5e532e0a.58ceb.93d0@mx.google.com>

Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-long-transactions
Changeset: r2042:df52953567cb
Date: 2017-04-13 10:09 +0200
http://bitbucket.org/pypy/stmgc/changeset/df52953567cb/

Log:	Define large nursery mark in a more straight forward way and make
	single thread mode transactions inevitable

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -1170,6 +1170,7 @@
                 segments_in_use));
         if (segments_in_use <= single_thread_mode_segments_in_use_limit) {
             start_single_thread_mode();
+            _stm_become_inevitable("execute_in_single_thread_mode");
         } else if (stm_single_thread_mode_active) {
             end_single_thread_mode();
         }
diff --git a/c8/stm/nursery.c b/c8/stm/nursery.c
--- a/c8/stm/nursery.c
+++ b/c8/stm/nursery.c
@@ -15,7 +15,7 @@
 
 static bool stm_single_thread_mode_active = false;
 
-#define SINGLE_THREAD_MODE_FILL_MARK_NURSERY_BYTES  (NURSERY_SIZE * 500000)
+#define SINGLE_THREAD_MODE_FILL_MARK_NURSERY_BYTES  (0x3000000000000000L)
 #define DEFAULT_FILL_MARK_NURSERY_BYTES             (NURSERY_SIZE / 4)
 
 uintptr_t stm_fill_mark_nursery_bytes = DEFAULT_FILL_MARK_NURSERY_BYTES;

From pypy.commits at gmail.com  Thu Apr 13 06:19:29 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 13 Apr 2017 03:19:29 -0700 (PDT)
Subject: [pypy-commit] pypy default: Semi-blind fix for issue #2533. Did not
 manage to extract a simple
Message-ID: <58ef50b1.0d152e0a.73480.947c@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91053:d75b6c67c8e3
Date: 2017-04-13 12:18 +0200
http://bitbucket.org/pypy/pypy/changeset/d75b6c67c8e3/

Log:	Semi-blind fix for issue #2533. Did not manage to extract a simple
	test (but admittedly, gave up after 15 minutes)

diff --git a/lib_pypy/_ctypes/array.py b/lib_pypy/_ctypes/array.py
--- a/lib_pypy/_ctypes/array.py
+++ b/lib_pypy/_ctypes/array.py
@@ -85,8 +85,9 @@
         res = self.__new__(self)
         ffiarray = self._ffiarray.fromaddress(resarray.buffer, self._length_)
         res._buffer = ffiarray
-        res._base = base
-        res._index = index
+        if base is not None:
+            res._base = base
+            res._index = index
         return res
 
     def _CData_retval(self, resbuffer):
diff --git a/lib_pypy/_ctypes/basics.py b/lib_pypy/_ctypes/basics.py
--- a/lib_pypy/_ctypes/basics.py
+++ b/lib_pypy/_ctypes/basics.py
@@ -64,8 +64,9 @@
         res = object.__new__(self)
         res.__class__ = self
         res.__dict__['_buffer'] = resbuffer
-        res.__dict__['_base'] = base
-        res.__dict__['_index'] = index
+        if base is not None:
+            res.__dict__['_base'] = base
+            res.__dict__['_index'] = index
         return res
 
     def _CData_retval(self, resbuffer):

From pypy.commits at gmail.com  Thu Apr 13 06:50:55 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 13 Apr 2017 03:50:55 -0700 (PDT)
Subject: [pypy-commit] pypy default: Managed to write a test for
 d75b6c67c8e3.
Message-ID: <58ef580f.0a87df0a.83718.adc2@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91054:da1964eea7ad
Date: 2017-04-13 12:50 +0200
http://bitbucket.org/pypy/pypy/changeset/da1964eea7ad/

Log:	Managed to write a test for d75b6c67c8e3.

diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py b/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
@@ -596,3 +596,37 @@
 
         get_data.errcheck = ret_list_p(1)
         assert get_data('testing!') == [-1, -2, -3, -4]
+
+    def test_issue2533(self):
+        import cffi
+        ffi = cffi.FFI()
+        ffi.cdef("int **fetchme(void);")
+        ffi.set_source("_x_cffi", """
+            int **fetchme(void)
+            {
+                static int a = 42;
+                static int *pa = &a;
+                return &pa;
+            }
+        """)
+        from rpython.tool.udir import udir
+        ffi.compile(verbose=True, tmpdir=str(udir))
+
+        import sys
+        sys.path.insert(0, str(udir))
+        try:
+            from _x_cffi import ffi, lib
+        finally:
+            sys.path.pop(0)
+        fetchme = ffi.addressof(lib, 'fetchme')
+        fetchme = int(ffi.cast("intptr_t", fetchme))
+
+        FN = CFUNCTYPE(POINTER(POINTER(c_int)))
+        ff = cast(fetchme, FN)
+
+        g = ff()
+        assert g.contents.contents.value == 42
+
+        h = c_int(43)
+        g[0] = pointer(h)     # used to crash here
+        assert g.contents.contents.value == 43

From pypy.commits at gmail.com  Fri Apr 14 03:15:26 2017
From: pypy.commits at gmail.com (arigo)
Date: Fri, 14 Apr 2017 00:15:26 -0700 (PDT)
Subject: [pypy-commit] pypy.org extradoc: update the values
Message-ID: <58f0770e.8c091c0a.2b5a7.dd61@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r880:3ab96624f0d2
Date: 2017-04-14 09:15 +0200
http://bitbucket.org/pypy/pypy.org/changeset/3ab96624f0d2/

Log:	update the values

diff --git a/don1.html b/don1.html
--- a/don1.html
+++ b/don1.html
@@ -9,13 +9,13 @@
 <script>
   $(function() {
     $("#progressbar").progressbar({
-      value: 63.5
+      value: 63.6
    });
   });
 </script>
 
    <!-- Income:PyPy:Donations:Py3k / 0.95 -->
-   $66677 of $105000 (63.5%)
+   $66793 of $105000 (63.6%)
    <div id="progressbar">
    </div>
 
@@ -23,7 +23,7 @@
   <li>
   <span id="donate_text">This donation goes towards supporting Python 3 in PyPy.
   Current status:
-    we have $2495 left
+    we have $2601 left
   in the account.</br> <a href="py3donate.html">Read proposal</a></span>
   </li>
   <li>

From pypy.commits at gmail.com  Fri Apr 14 10:06:20 2017
From: pypy.commits at gmail.com (arigo)
Date: Fri, 14 Apr 2017 07:06:20 -0700 (PDT)
Subject: [pypy-commit] pypy default: Call fflush() after writing an
 end-of-section to the log file.
Message-ID: <58f0d75c.ee86df0a.ecd94.c328@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91055:b13b7c8e4fe7
Date: 2017-04-14 16:05 +0200
http://bitbucket.org/pypy/pypy/changeset/b13b7c8e4fe7/

Log:	Call fflush() after writing an end-of-section to the log file.
	Hopefully, this should remove the constant problem that log files
	are truncated when we track JIT bugs.

diff --git a/rpython/translator/c/src/debug_print.c b/rpython/translator/c/src/debug_print.c
--- a/rpython/translator/c/src/debug_print.c
+++ b/rpython/translator/c/src/debug_print.c
@@ -235,7 +235,10 @@
 void pypy_debug_stop(const char *category)
 {
   if (debug_profile | (pypy_have_debug_prints & 1))
-    display_startstop("", "}", category, debug_start_colors_2);
+    {
+      display_startstop("", "}", category, debug_start_colors_2);
+      fflush(pypy_debug_file);
+    }
   pypy_have_debug_prints >>= 1;
 }
 

From pypy.commits at gmail.com  Fri Apr 14 10:56:26 2017
From: pypy.commits at gmail.com (arigo)
Date: Fri, 14 Apr 2017 07:56:26 -0700 (PDT)
Subject: [pypy-commit] pypy default: Fix for untranslated tests
Message-ID: <58f0e31a.16acdf0a.a0c1d.e137@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91056:f0ba81de1e4f
Date: 2017-04-14 16:55 +0200
http://bitbucket.org/pypy/pypy/changeset/f0ba81de1e4f/

Log:	Fix for untranslated tests

diff --git a/rpython/jit/backend/x86/codebuf.py b/rpython/jit/backend/x86/codebuf.py
--- a/rpython/jit/backend/x86/codebuf.py
+++ b/rpython/jit/backend/x86/codebuf.py
@@ -7,6 +7,7 @@
 from rpython.jit.backend.x86.rx86 import X86_32_CodeBuilder, X86_64_CodeBuilder
 from rpython.jit.backend.x86.regloc import LocationCodeBuilder
 from rpython.jit.backend.x86.arch import IS_X86_32, IS_X86_64, WORD
+from rpython.jit.backend.x86.arch import DEFAULT_FRAME_BYTES
 from rpython.jit.backend.x86 import rx86, valgrind
 
 # XXX: Seems nasty to change the superclass of MachineCodeBlockWrapper
@@ -85,11 +86,13 @@
 
 class SlowPath(object):
     def __init__(self, mc, condition):
+        assert mc._frame_size == DEFAULT_FRAME_BYTES
         mc.J_il(condition, 0xfffff)     # patched later
         self.cond_jump_addr = mc.get_relative_pos(break_basic_block=False)
         self.saved_scratch_value_1 = mc.get_scratch_register_known_value()
 
     def set_continue_addr(self, mc):
+        assert mc._frame_size == DEFAULT_FRAME_BYTES
         self.continue_addr = mc.get_relative_pos(break_basic_block=False)
         self.saved_scratch_value_2 = mc.get_scratch_register_known_value()
 
@@ -100,6 +103,7 @@
         mc.overwrite32(self.cond_jump_addr-4, offset)
         # restore the knowledge of the scratch register value
         # (this does not emit any code)
+        mc.force_frame_size(DEFAULT_FRAME_BYTES)
         mc.restore_scratch_register_known_value(self.saved_scratch_value_1)
         # generate the body of the slow-path
         self.generate_body(assembler, mc)

From pypy.commits at gmail.com  Fri Apr 14 13:52:35 2017
From: pypy.commits at gmail.com (antocuni)
Date: Fri, 14 Apr 2017 10:52:35 -0700 (PDT)
Subject: [pypy-commit] extradoc extradoc: my ep2017 proposal
Message-ID: <58f10c63.56541c0a.e85eb.c19d@mx.google.com>

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: extradoc
Changeset: r5802:c812f32e4682
Date: 2017-04-14 19:52 +0200
http://bitbucket.org/pypy/extradoc/changeset/c812f32e4682/

Log:	my ep2017 proposal

diff --git a/talk/ep2017/the-joy-of-pypy-jit.txt b/talk/ep2017/the-joy-of-pypy-jit.txt
new file mode 100644
--- /dev/null
+++ b/talk/ep2017/the-joy-of-pypy-jit.txt
@@ -0,0 +1,17 @@
+The joy of PyPy JIT: abstractions for free
+-------------------------------------------
+
+The PyPy JIT is a powerful piece of technology which makes Python program
+running faster: in this talk, we will see how it helps us to write our
+programs better without sacrificing performance.
+
+One of the key to write complex software systems of good quality is to make a
+good usage of abstractions, to clearly separate the various layers and
+components.  However, often each layer of abstraction adds some cost in terms
+of runtime performance, so we need to struggle finding the best trade-off
+between maintainability and speed.
+
+Because of the way it works, the PyPy JIT naturally removes the cost of most
+abstractions: we will look at real-life examples of how this is possible,
+showing what the JIT can and can't do. We will also show how this compares to
+other popular systems of optimizing Python code, such as Cython.

From pypy.commits at gmail.com  Sat Apr 15 11:58:26 2017
From: pypy.commits at gmail.com (arigo)
Date: Sat, 15 Apr 2017 08:58:26 -0700 (PDT)
Subject: [pypy-commit] pypy default: Complain clearly when we rtype
 ``_immutable_fields_=['foo[*]']''
Message-ID: <58f24322.5886df0a.2ff88.3fb2@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91057:1cbb46d0ce7a
Date: 2017-04-15 16:52 +0200
http://bitbucket.org/pypy/pypy/changeset/1cbb46d0ce7a/

Log:	Complain clearly when we rtype ``_immutable_fields_=['foo[*]']'' and
	``.foo'' is not actually a list

diff --git a/rpython/rtyper/rclass.py b/rpython/rtyper/rclass.py
--- a/rpython/rtyper/rclass.py
+++ b/rpython/rtyper/rclass.py
@@ -621,7 +621,8 @@
 
     def _parse_field_list(self, fields, accessor, hints):
         ranking = {}
-        for name in fields:
+        for fullname in fields:
+            name = fullname
             quasi = False
             if name.endswith('?[*]'):   # a quasi-immutable field pointing to
                 name = name[:-4]        # an immutable array
@@ -644,6 +645,12 @@
                 raise TyperError(
                     "can't have _immutable_ = True and a quasi-immutable field "
                     "%s in class %s" % (name, self.classdef))
+            if rank in (IR_QUASIIMMUTABLE_ARRAY, IR_IMMUTABLE_ARRAY):
+                from rpython.rtyper.rlist import AbstractBaseListRepr
+                if not isinstance(r, AbstractBaseListRepr):
+                    raise TyperError(
+                        "_immutable_fields_ = [%r] in %r, but %r is not a list "
+                        "(got %r)" % (fullname, self, name, r))
             ranking[mangled_name] = rank
         accessor.initialize(self.object_type, ranking)
         return ranking
diff --git a/rpython/rtyper/test/test_rclass.py b/rpython/rtyper/test/test_rclass.py
--- a/rpython/rtyper/test/test_rclass.py
+++ b/rpython/rtyper/test/test_rclass.py
@@ -963,6 +963,41 @@
                 found.append(op.args[1].value)
         assert found == ['mutate_c']
 
+    def test_bad_type_for_immutable_field_1(self):
+        class A:
+            _immutable_fields_ = ['lst[*]']
+        def f(n):
+            a = A()
+            a.lst = n
+            return a.lst
+
+        with py.test.raises(TyperError):
+            self.gengraph(f, [int])
+
+    def test_bad_type_for_immutable_field_2(self):
+        from rpython.rtyper.lltypesystem import lltype
+        class A:
+            _immutable_fields_ = ['lst[*]']
+        ARRAY = lltype.GcArray(lltype.Signed)
+        def f(n):
+            a = A()
+            a.lst = lltype.malloc(ARRAY, n)
+            return a.lst
+
+        with py.test.raises(TyperError):
+            self.gengraph(f, [int])
+
+    def test_bad_type_for_immutable_field_3(self):
+        class A:
+            _immutable_fields_ = ['lst?[*]']
+        def f(n):
+            a = A()
+            a.lst = n
+            return a.lst
+
+        with py.test.raises(TyperError):
+            self.gengraph(f, [int])
+
     def test_calling_object_init(self):
         class A(object):
             pass

From pypy.commits at gmail.com  Sat Apr 15 11:58:28 2017
From: pypy.commits at gmail.com (arigo)
Date: Sat, 15 Apr 2017 08:58:28 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Temporary performance fix for turning a
 memoryview to bytes
Message-ID: <58f24324.c4b1df0a.a6a75.3d04@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r91058:1e60d5cc28f1
Date: 2017-04-15 17:12 +0200
http://bitbucket.org/pypy/pypy/changeset/1e60d5cc28f1/

Log:	Temporary performance fix for turning a memoryview to bytes

diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -143,6 +143,14 @@
         strides = self.getstrides()
         itemsize = self.getitemsize()
         bytesize = self.getlength()
+        # optimization only: if the loop below would enumerate all
+        # bytes without any gap, then grab them all at once
+        # XXX review the whole thing (I suspect it's being done in a branch)
+        if itemsize == strides[0]:
+            bytecount = min(bytesize - off, step * itemsize)
+            bytes = self.buf.getslice(off, off+bytecount, 1, bytecount)
+            data.append(bytes)
+            return
         copiedbytes = 0
         for i in range(step):
             bytes = self.buf.getslice(off, off+itemsize, 1, itemsize)

From pypy.commits at gmail.com  Sat Apr 15 13:40:45 2017
From: pypy.commits at gmail.com (arigo)
Date: Sat, 15 Apr 2017 10:40:45 -0700 (PDT)
Subject: [pypy-commit] extradoc extradoc: "PyPy meets Python 3 and Numpy"
Message-ID: <58f25b1d.d4b81c0a.a6a75.0d76@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r5803:28fd6b48d40c
Date: 2017-04-15 19:40 +0200
http://bitbucket.org/pypy/extradoc/changeset/28fd6b48d40c/

Log:	"PyPy meets Python 3 and Numpy"

diff --git a/talk/ep2017/pypy-whats-new.txt b/talk/ep2017/pypy-whats-new.txt
new file mode 100644
--- /dev/null
+++ b/talk/ep2017/pypy-whats-new.txt
@@ -0,0 +1,40 @@
+=============================
+PyPy meets Python 3 and Numpy
+=============================
+
+
+Abstract
+========
+
+PyPy is an alternative Python implementation whose JIT often gives
+seriously better performance than CPython.  Now PyPy supports, in beta
+version, two major new application domains: Python 3.x, and Numpy and
+the rest of the scientific stack.  These are each an important milestone
+for a subset of the Python community.
+
+This talk is about what's new in PyPy in the last couple of years,
+including these two topics.
+
+
+
+Long version
+============
+
+PyPy is an alternative Python implementation whose JIT often gives
+seriously better performance than CPython. Now PyPy supports, in beta
+version, two major new application domains: Python 3.x, and Numpy and
+the rest of the scientific stack. These are each an important milestone
+for a subset of the Python community.
+
+- Thanks to a grant by Mozilla, "PyPy3" now largely supports Python 3.5
+  with one or two extensions from Python 3.6. Full support should be
+  very close. (Note that PyPy2 will not disappear, if only because PyPy
+  itself is written in Python 2.7.)
+
+- Numpy and the major packages of the scientific stack are now starting
+  to work well with PyPy (PyPy2 mostly, but also PyPy3). This is thanks
+  to progress in "cpyext" emulating the CPython C API, as well as fixes
+  to the packages in collaboration with the upstream developers.
+
+This talk is about what's new in PyPy in the last couple of years,
+including these two topics.

From pypy.commits at gmail.com  Sat Apr 15 13:44:44 2017
From: pypy.commits at gmail.com (arigo)
Date: Sat, 15 Apr 2017 10:44:44 -0700 (PDT)
Subject: [pypy-commit] extradoc extradoc: fix last para
Message-ID: <58f25c0c.1a9ddf0a.5646a.5ec2@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r5804:a251a14c1a6f
Date: 2017-04-15 19:44 +0200
http://bitbucket.org/pypy/extradoc/changeset/a251a14c1a6f/

Log:	fix last para

diff --git a/talk/ep2017/pypy-whats-new.txt b/talk/ep2017/pypy-whats-new.txt
--- a/talk/ep2017/pypy-whats-new.txt
+++ b/talk/ep2017/pypy-whats-new.txt
@@ -36,5 +36,5 @@
   to progress in "cpyext" emulating the CPython C API, as well as fixes
   to the packages in collaboration with the upstream developers.
 
-This talk is about what's new in PyPy in the last couple of years,
-including these two topics.
+- We will also mention some more "what's new in PyPy" topics from the
+  last couple of years.

From pypy.commits at gmail.com  Sat Apr 15 14:15:35 2017
From: pypy.commits at gmail.com (arigo)
Date: Sat, 15 Apr 2017 11:15:35 -0700 (PDT)
Subject: [pypy-commit] pypy default: Fix for f0ba81de1e4f: there is one
 caller using SlowPath with
Message-ID: <58f26347.c2d21c0a.dbbce.169a@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91059:9fca81f13918
Date: 2017-04-15 20:08 +0200
http://bitbucket.org/pypy/pypy/changeset/9fca81f13918/

Log:	Fix for f0ba81de1e4f: there is one caller using SlowPath with
	mc._frame_size != DEFAULT_FRAME_BYTES

diff --git a/rpython/jit/backend/x86/codebuf.py b/rpython/jit/backend/x86/codebuf.py
--- a/rpython/jit/backend/x86/codebuf.py
+++ b/rpython/jit/backend/x86/codebuf.py
@@ -7,7 +7,6 @@
 from rpython.jit.backend.x86.rx86 import X86_32_CodeBuilder, X86_64_CodeBuilder
 from rpython.jit.backend.x86.regloc import LocationCodeBuilder
 from rpython.jit.backend.x86.arch import IS_X86_32, IS_X86_64, WORD
-from rpython.jit.backend.x86.arch import DEFAULT_FRAME_BYTES
 from rpython.jit.backend.x86 import rx86, valgrind
 
 # XXX: Seems nasty to change the superclass of MachineCodeBlockWrapper
@@ -86,15 +85,15 @@
 
 class SlowPath(object):
     def __init__(self, mc, condition):
-        assert mc._frame_size == DEFAULT_FRAME_BYTES
         mc.J_il(condition, 0xfffff)     # patched later
         self.cond_jump_addr = mc.get_relative_pos(break_basic_block=False)
         self.saved_scratch_value_1 = mc.get_scratch_register_known_value()
+        self.frame_size = mc._frame_size
 
     def set_continue_addr(self, mc):
-        assert mc._frame_size == DEFAULT_FRAME_BYTES
         self.continue_addr = mc.get_relative_pos(break_basic_block=False)
         self.saved_scratch_value_2 = mc.get_scratch_register_known_value()
+        assert self.frame_size == mc._frame_size
 
     def generate(self, assembler, mc):
         # no alignment here, prefer compactness for these slow-paths.
@@ -103,7 +102,7 @@
         mc.overwrite32(self.cond_jump_addr-4, offset)
         # restore the knowledge of the scratch register value
         # (this does not emit any code)
-        mc.force_frame_size(DEFAULT_FRAME_BYTES)
+        mc.force_frame_size(self.frame_size)
         mc.restore_scratch_register_known_value(self.saved_scratch_value_1)
         # generate the body of the slow-path
         self.generate_body(assembler, mc)

From pypy.commits at gmail.com  Sun Apr 16 10:10:00 2017
From: pypy.commits at gmail.com (mattip)
Date: Sun, 16 Apr 2017 07:10:00 -0700 (PDT)
Subject: [pypy-commit] pypy cpyext-obj-stealing: assert recount of linked
 objects is REFCNT_FROM_PYPY which fails for listobjects
Message-ID: <58f37b38.4b87df0a.bee6c.c21d@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-obj-stealing
Changeset: r91060:95c7e6ee21b6
Date: 2017-04-16 08:30 +0300
http://bitbucket.org/pypy/pypy/changeset/95c7e6ee21b6/

Log:	assert recount of linked objects is REFCNT_FROM_PYPY which fails for
	listobjects

diff --git a/pypy/module/cpyext/pyobject.py b/pypy/module/cpyext/pyobject.py
--- a/pypy/module/cpyext/pyobject.py
+++ b/pypy/module/cpyext/pyobject.py
@@ -30,8 +30,7 @@
         return subtype_dealloc.api_func
 
     def allocate(self, space, w_type, itemcount=0):
-        # similar to PyType_GenericAlloc?
-        # except that it's not related to any pypy object.
+        # typically called from PyType_GenericAlloc via typedescr.allocate
         # this returns a PyObject with ob_refcnt == 1.
 
         pytype = as_pyobj(space, w_type)
@@ -315,6 +314,7 @@
         obj = rffi.cast(PyObject, obj)
         if obj:
             assert obj.c_ob_refcnt > 0
+            assert obj.c_ob_pypy_link == 0 or obj.c_ob_refcnt > rawrefcount.REFCNT_FROM_PYPY
             obj.c_ob_refcnt -= 1
             if obj.c_ob_refcnt == 0:
                 _Py_Dealloc(space, obj)

From pypy.commits at gmail.com  Sun Apr 16 10:10:02 2017
From: pypy.commits at gmail.com (mattip)
Date: Sun, 16 Apr 2017 07:10:02 -0700 (PDT)
Subject: [pypy-commit] pypy cpyext-obj-stealing: comment out excessive
 Py_DecRef
Message-ID: <58f37b3a.10941c0a.989d3.df3c@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-obj-stealing
Changeset: r91061:ab207c2b540b
Date: 2017-04-16 12:50 +0300
http://bitbucket.org/pypy/pypy/changeset/ab207c2b540b/

Log:	comment out excessive Py_DecRef

diff --git a/pypy/module/cpyext/listobject.py b/pypy/module/cpyext/listobject.py
--- a/pypy/module/cpyext/listobject.py
+++ b/pypy/module/cpyext/listobject.py
@@ -48,11 +48,11 @@
     This function "steals" a reference to item and discards a reference to
     an item already in the list at the affected position.
     """
-    Py_DecRef(space, w_item)
     if not isinstance(w_list, W_ListObject):
         PyErr_BadInternalCall(space)
     if index < 0 or index >= w_list.length():
         raise oefmt(space.w_IndexError, "list assignment index out of range")
+    #Py_DecRef(space, w_item)
     w_list.setitem(index, w_item)
     return 0
 
diff --git a/pypy/module/cpyext/pyobject.py b/pypy/module/cpyext/pyobject.py
--- a/pypy/module/cpyext/pyobject.py
+++ b/pypy/module/cpyext/pyobject.py
@@ -318,6 +318,10 @@
             obj.c_ob_refcnt -= 1
             if obj.c_ob_refcnt == 0:
                 _Py_Dealloc(space, obj)
+            #else:
+            #    w_obj = rawrefcount.to_obj(W_Root, ref)
+            #    if w_obj is not None:
+            #        assert obj.c_ob_refcnt >= rawrefcount.REFCNT_FROM_PYPY
     else:
         get_w_obj_and_decref(space, obj)
 

From pypy.commits at gmail.com  Mon Apr 17 10:53:26 2017
From: pypy.commits at gmail.com (rlamy)
Date: Mon, 17 Apr 2017 07:53:26 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Use .value_from_bytes() in
 ._getitem_tuple_indexed()
Message-ID: <58f4d6e6.cf0d1c0a.7692b.6787@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91062:3f7d3c653bf9
Date: 2017-04-17 15:52 +0100
http://bitbucket.org/pypy/pypy/changeset/3f7d3c653bf9/

Log:	Use .value_from_bytes() in ._getitem_tuple_indexed()

diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -9,7 +9,6 @@
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.gateway import interp2app
 from pypy.interpreter.typedef import TypeDef, GetSetProperty,  make_weakref_descr
-from pypy.module.struct.formatiterator import UnpackFormatIterator
 from rpython.rlib.unroll import unrolling_iterable
 from rpython.rlib.objectmodel import always_inline
 
@@ -131,11 +130,9 @@
                     length, ndim)
 
         start = self._start_from_tuple(space, w_index)
-
-        buf = SubBuffer(self.buf.as_binary(), start, view.getitemsize())
-        fmtiter = UnpackFormatIterator(space, buf)
-        fmtiter.interpret(fmt)
-        return fmtiter.result_w[0]
+        itemsize = self.getitemsize()
+        data = view.getbytes(start, start + itemsize, 1, itemsize)
+        return view.value_from_bytes(space, data)
 
     def _decode_index(self, space, w_index, is_slice):
         shape = self.getshape()

From pypy.commits at gmail.com  Mon Apr 17 11:03:40 2017
From: pypy.commits at gmail.com (rlamy)
Date: Mon, 17 Apr 2017 08:03:40 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Avoid skipping most tests in this file
 when running on CPython with -A
Message-ID: <58f4d94c.7896df0a.9154b.c644@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91063:8252315ff919
Date: 2017-04-17 16:03 +0100
http://bitbucket.org/pypy/pypy/changeset/8252315ff919/

Log:	Avoid skipping most tests in this file when running on CPython with
	-A

diff --git a/pypy/objspace/std/test/test_memoryobject.py b/pypy/objspace/std/test/test_memoryobject.py
--- a/pypy/objspace/std/test/test_memoryobject.py
+++ b/pypy/objspace/std/test/test_memoryobject.py
@@ -7,8 +7,8 @@
 from pypy.interpreter.buffer import PyBuffer
 from pypy.conftest import option
 
-class AppTestMemoryView:
-    spaceconfig = dict(usemodules=['array', 'sys', '_rawffi'])
+class AppTestMemoryView(object):
+    spaceconfig = dict(usemodules=['array', 'sys'])
 
     def test_basic(self):
         v = memoryview(b"abc")
@@ -195,6 +195,9 @@
         assert m[2] == 1
 
     def test_pypy_raw_address_base(self):
+        import sys
+        if '__pypy__' not in sys.modules:
+            skip('PyPy-only test')
         a = memoryview(b"foobar")._pypy_raw_address()
         assert a != 0
         b = memoryview(bytearray(b"foobar"))._pypy_raw_address()
@@ -282,6 +285,9 @@
         assert m2.itemsize == m1.itemsize
         assert m2.shape == m1.shape
 
+class AppTestCtypes(object):
+    spaceconfig = dict(usemodules=['sys', '_rawffi'])
+
     def test_cast_ctypes(self):
         import _rawffi, sys
         a = _rawffi.Array('i')(1)

From pypy.commits at gmail.com  Mon Apr 17 12:57:08 2017
From: pypy.commits at gmail.com (rlamy)
Date: Mon, 17 Apr 2017 09:57:08 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: fix .tolist() on slices
Message-ID: <58f4f3e4.4e0f1c0a.fb055.bde8@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91064:30be5c409ea0
Date: 2017-04-17 17:56 +0100
http://bitbucket.org/pypy/pypy/changeset/30be5c409ea0/

Log:	fix .tolist() on slices

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -144,22 +144,9 @@
             values_w = [self.w_getitem(space, i) for i in range(n)]
             return space.newlist(values_w)
         else:
-            return self._tolist_rec(space, self.as_binary(), 0, 0, fmt)
+            return self._tolist_rec(space, 0, 0)
 
-    def _tolist(self, space, buf, bytecount, itemsize, fmt, strides=None):
-        from pypy.module.struct.formatiterator import UnpackFormatIterator
-        # TODO: this probably isn't very fast
-        count = bytecount // itemsize
-        fmtiter = UnpackFormatIterator(space, buf)
-        # patch the length, necessary buffer might have offset
-        # which leads to wrong length calculation if e.g. the
-        # memoryview is reversed
-        fmtiter.length = bytecount
-        fmtiter.strides = strides
-        fmtiter.interpret(fmt * count)
-        return space.newlist(fmtiter.result_w)
-
-    def _tolist_rec(self, space, buf, start, idim, fmt):
+    def _tolist_rec(self, space, start, idim):
         strides = self.getstrides()
         shape = self.getshape()
         #
@@ -170,13 +157,15 @@
         #
         if dim >= self.getndim():
             bytecount = (stride * dimshape)
-            return self._tolist(space, buf, bytecount, itemsize, fmt, [stride])
+            values_w = [
+                self.value_from_bytes(
+                    space, self.getbytes(pos, pos + itemsize, 1, itemsize))
+                for pos in range(start, start + bytecount, stride)]
+            return space.newlist(values_w)
+
         items = [None] * dimshape
-
-        orig_buf = buf
         for i in range(dimshape):
-            buf = SubBuffer(orig_buf, start, stride)
-            item = self._tolist_rec(space, buf, start, idim + 1, fmt)
+            item = self._tolist_rec(space, start, idim + 1)
             items[i] = item
             start += stride
 
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -608,20 +608,20 @@
         if start == stop:
             return ''     # otherwise, adding self.offset might make them
                           # out of bounds
-        offset = self.start * self.getitemsize()
+        offset = self.start * self.buf.getstrides()[0]
         return self.buf.getbytes(offset + start, offset + stop, step, size)
 
     def setbytes(self, start, string):
         if len(string) == 0:
             return        # otherwise, adding self.offset might make 'start'
                           # out of bounds
-        offset = self.start * self.getitemsize()
+        offset = self.start * self.buf.getstrides()[0]
         self.buf.setbytes(offset + start, string)
 
     def get_raw_address(self):
         from rpython.rtyper.lltypesystem import rffi
-        ptr = self.buf.get_raw_address()
-        return rffi.ptradd(ptr, self.start * self.getitemsize())
+        offset = self.start * self.buf.getstrides()[0]
+        return rffi.ptradd(self.buf.get_raw_address(), offset)
 
     def getformat(self):
         return self.buf.getformat()

From pypy.commits at gmail.com  Mon Apr 17 13:26:39 2017
From: pypy.commits at gmail.com (rlamy)
Date: Mon, 17 Apr 2017 10:26:39 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: simplify and document
 PyBuffer.getbytes()
Message-ID: <58f4facf.582d1c0a.8c480.9032@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91065:b87693784bb0
Date: 2017-04-17 18:17 +0100
http://bitbucket.org/pypy/pypy/changeset/b87693784bb0/

Log:	simplify and document PyBuffer.getbytes()

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -19,7 +19,14 @@
         "Returns an interp-level string with the whole content of the buffer."
         return ''.join(self._copy_buffer())
 
-    def getbytes(self, start, stop, step, size):
+    def getbytes(self, start, size):
+        """Return `size` bytes starting at byte offset `start`.
+
+        This is a low-level operation, it is up to the caller to ensure that
+        the data requested actually correspond to items accessible from the
+        PyBuffer.
+        Note that `start` may be negative, e.g. if the buffer is reversed.
+        """
         raise NotImplementedError
 
     def setbytes(self, start, string):
@@ -72,7 +79,7 @@
     def _copy_buffer(self):
         if self.getndim() == 0:
             itemsize = self.getitemsize()
-            return [self.getbytes(0, itemsize, 1, itemsize)]
+            return [self.getbytes(0, itemsize)]
         data = []
         self._copy_rec(0, data, 0)
         return data
@@ -98,7 +105,7 @@
         bytesize = self.getlength()
         copiedbytes = 0
         for i in range(step):
-            bytes = self.getbytes(off, off+itemsize, 1, itemsize)
+            bytes = self.getbytes(off, itemsize)
             data.append(bytes)
             copiedbytes += len(bytes)
             off += strides[0]
@@ -124,7 +131,7 @@
         offset = self.get_offset(space, 0, idx)
         itemsize = self.getitemsize()
         # TODO: this probably isn't very fast
-        data = self.getbytes(offset, offset + itemsize, 1, itemsize)
+        data = self.getbytes(offset, itemsize)
         return self.value_from_bytes(space, data)
 
     def setitem_w(self, space, idx, w_obj):
@@ -158,9 +165,8 @@
         if dim >= self.getndim():
             bytecount = (stride * dimshape)
             values_w = [
-                self.value_from_bytes(
-                    space, self.getbytes(pos, pos + itemsize, 1, itemsize))
-                for pos in range(start, start + bytecount, stride)]
+                self.value_from_bytes(space, self.getbytes(pos, itemsize))
+                    for pos in range(start, start + bytecount, stride)]
             return space.newlist(values_w)
 
         items = [None] * dimshape
@@ -186,9 +192,8 @@
     def as_str(self):
         return self.data.as_str()
 
-    def getbytes(self, start, stop, step, size):
-        assert step == 1
-        return self.data[start:stop]
+    def getbytes(self, start, size):
+        return self.data[start:start + size]
 
     def setbytes(self, offset, s):
         self.data.setslice(offset, s)
diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -897,8 +897,8 @@
     def as_str(self):
         return self.data.as_str()
 
-    def getbytes(self, start, stop, step, size):
-        return self.data.getslice(start, stop, step, size)
+    def getbytes(self, start, size):
+        return self.data[start:start + size]
 
     def setbytes(self, offset, s):
         return self.data.setslice(offset, s)
diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -380,8 +380,8 @@
     def getlength(self):
         return self.size
 
-    def getbytes(self, start, stop, step, size):
-        return ''.join([self.ptr[i] for i in range(start, stop, step)])
+    def getbytes(self, start, size):
+        return ''.join([self.ptr[i] for i in range(start, start + size)])
 
     def setbytes(self, start, string):
         # absolutely no safety checks, what could go wrong?
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -131,7 +131,7 @@
 
         start = self._start_from_tuple(space, w_index)
         itemsize = self.getitemsize()
-        data = view.getbytes(start, start + itemsize, 1, itemsize)
+        data = view.getbytes(start, itemsize)
         return view.value_from_bytes(space, data)
 
     def _decode_index(self, space, w_index, is_slice):
@@ -223,7 +223,7 @@
             src_shape0 = slicelength
             src_stride0 = src.getstrides()[0]
             for i in range(src_shape0):
-                data.append(src.getbytes(off,off+itemsize,1,itemsize))
+                data.append(src.getbytes(off, itemsize))
                 off += src_stride0
             off = 0
             dst_stride0 = self.getstrides()[0] * step
@@ -589,7 +589,7 @@
 
 class BufferSlice(PyBuffer):
     _immutable_ = True
-    _attrs_ = ['buf', 'readonly', 'shape', 'strides', 'offset', 'step']
+    _attrs_ = ['buf', 'readonly', 'shape', 'strides', 'start', 'step']
     def __init__(self, buf, start, step, length):
         self.buf = buf
         self.readonly = self.buf.readonly
@@ -604,12 +604,9 @@
     def getlength(self):
         return self.shape[0] * self.getitemsize()
 
-    def getbytes(self, start, stop, step, size):
-        if start == stop:
-            return ''     # otherwise, adding self.offset might make them
-                          # out of bounds
+    def getbytes(self, start, size):
         offset = self.start * self.buf.getstrides()[0]
-        return self.buf.getbytes(offset + start, offset + stop, step, size)
+        return self.buf.getbytes(offset + start, size)
 
     def setbytes(self, start, string):
         if len(string) == 0:
@@ -661,8 +658,8 @@
     def as_str_and_offset_maybe(self):
         return self.parent.as_str_and_offset_maybe()
 
-    def getbytes(self, start, stop, step, size):
-        return self.parent.getbytes(start, stop, step, size)
+    def getbytes(self, start, size):
+        return self.parent.getbytes(start, size)
 
     def setbytes(self, start, string):
         self.parent.setbytes(start, string)
diff --git a/pypy/objspace/std/test/test_memoryobject.py b/pypy/objspace/std/test/test_memoryobject.py
--- a/pypy/objspace/std/test/test_memoryobject.py
+++ b/pypy/objspace/std/test/test_memoryobject.py
@@ -337,8 +337,8 @@
     def getformat(self):
         return self.format
 
-    def getbytes(self, start, stop, step, size):
-        return self.data[start:stop]
+    def getbytes(self, start, size):
+        return self.data[start:start + size]
 
     def getlength(self):
         return len(self.data)

From pypy.commits at gmail.com  Mon Apr 17 15:16:51 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Mon, 17 Apr 2017 12:16:51 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Avoid importing the full locale module
 during _io initialization.
Message-ID: <58f514a3.10a3df0a.c2a3a.f62c@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91066:db0c73821d75
Date: 2017-04-17 11:35 +0200
http://bitbucket.org/pypy/pypy/changeset/db0c73821d75/

Log:	Avoid importing the full locale module during _io initialization.
	CPython change fbbf8b160e8d

diff --git a/pypy/module/_io/interp_textio.py b/pypy/module/_io/interp_textio.py
--- a/pypy/module/_io/interp_textio.py
+++ b/pypy/module/_io/interp_textio.py
@@ -290,7 +290,7 @@
 
     try:
         w_locale = space.call_method(space.builtin, '__import__',
-                                     space.newtext('locale'))
+                                     space.newtext('_bootlocale'))
         w_encoding = space.call_method(w_locale, 'getpreferredencoding',
                                        space.w_False)
     except OperationError as e:

From pypy.commits at gmail.com  Mon Apr 17 15:16:53 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Mon, 17 Apr 2017 12:16:53 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Move SimpleNamespace to lib_pypy,
 this avoids freezing the 'types' module, 
Message-ID: <58f514a5.8b121c0a.a58e3.9f71@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91067:34a763246fde
Date: 2017-04-17 15:27 +0200
http://bitbucket.org/pypy/pypy/changeset/34a763246fde/

Log:	Move SimpleNamespace to lib_pypy, this avoids freezing the 'types'
	module, and also 'functools', 'collections', 'weakref'...

diff --git a/lib_pypy/_structseq.py b/lib_pypy/_structseq.py
--- a/lib_pypy/_structseq.py
+++ b/lib_pypy/_structseq.py
@@ -129,3 +129,38 @@
     parts = ["%s=%r" % (fields[index].__name__, value)
             for index, value in enumerate(self[:visible_count])]
     return "%s(%s)" % (self._name, ", ".join(parts))
+
+
+class SimpleNamespace:
+    """A simple attribute-based namespace.
+
+SimpleNamespace(**kwargs)"""
+
+    def __init__(self, **kwargs):
+        self.__dict__.update(kwargs)
+
+    def __repr__(self):
+        ident = id(self)
+        if ident in sns_recurse:
+            return "namespace(...)"
+        sns_recurse.add(ident)
+        try:
+            pairs = ('%s=%r' % item for item in sorted(self.__dict__.items()))
+            return "namespace(%s)" % ', '.join(pairs)
+        finally:
+            sns_recurse.discard(ident)
+
+    def __eq__(self, other):
+        if issubclass(type(other), SimpleNamespace):
+            return self.__dict__ == other.__dict__
+        return NotImplemented
+
+    def __ne__(self, other):
+        if issubclass(type(other), SimpleNamespace):
+            return self.__dict__ != other.__dict__
+        return NotImplemented
+
+sns_recurse = set()
+
+# This class is not exposed in sys, but by the types module.
+SimpleNamespace.__module__ = 'types'
diff --git a/pypy/module/sys/app.py b/pypy/module/sys/app.py
--- a/pypy/module/sys/app.py
+++ b/pypy/module/sys/app.py
@@ -3,7 +3,7 @@
 The 'sys' module.
 """
 
-from _structseq import structseqtype, structseqfield
+from _structseq import structseqtype, structseqfield, SimpleNamespace
 import sys
 import _imp
 
@@ -111,41 +111,6 @@
 null__xoptions = {}
 
 
-class SimpleNamespace:
-    """A simple attribute-based namespace.
-
-SimpleNamespace(**kwargs)"""
-
-    def __init__(self, **kwargs):
-        self.__dict__.update(kwargs)
-
-    def __repr__(self):
-        ident = id(self)
-        if ident in sns_recurse:
-            return "namespace(...)"
-        sns_recurse.add(ident)
-        try:
-            pairs = ('%s=%r' % item for item in sorted(self.__dict__.items()))
-            return "namespace(%s)" % ', '.join(pairs)
-        finally:
-            sns_recurse.discard(ident)
-
-    def __eq__(self, other):
-        if issubclass(type(other), SimpleNamespace):
-            return self.__dict__ == other.__dict__
-        return NotImplemented
-
-    def __ne__(self, other):
-        if issubclass(type(other), SimpleNamespace):
-            return self.__dict__ != other.__dict__
-        return NotImplemented
-
-sns_recurse = set()
-
-# This class is not exposed in sys, but by the types module.
-SimpleNamespace.__module__ = 'types'
-
-
 implementation = SimpleNamespace(
     name='pypy',
     version=sys.version_info,
diff --git a/pypy/module/time/app_time.py b/pypy/module/time/app_time.py
--- a/pypy/module/time/app_time.py
+++ b/pypy/module/time/app_time.py
@@ -1,7 +1,6 @@
 # NOT_RPYTHON
 
-from _structseq import structseqtype, structseqfield
-from types import SimpleNamespace
+from _structseq import structseqtype, structseqfield, SimpleNamespace
 import time
 
 class struct_time(metaclass=structseqtype):

From pypy.commits at gmail.com  Mon Apr 17 15:16:55 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Mon, 17 Apr 2017 12:16:55 -0700 (PDT)
Subject: [pypy-commit] pypy default: Move to ObjSpace the management of the
 thread-local set of 'currently_in_repr' objects.
Message-ID: <58f514a7.d298df0a.61632.fb82@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r91068:994394c09421
Date: 2017-04-17 17:18 +0200
http://bitbucket.org/pypy/pypy/changeset/994394c09421/

Log:	Move to ObjSpace the management of the thread-local set of
	'currently_in_repr' objects. It will be easier to expose it to
	applevel, and use it in our OrderedDict.

diff --git a/pypy/module/_collections/interp_deque.py b/pypy/module/_collections/interp_deque.py
--- a/pypy/module/_collections/interp_deque.py
+++ b/pypy/module/_collections/interp_deque.py
@@ -311,11 +311,7 @@
 
     def repr(self):
         space = self.space
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return dequerepr(space, w_currently_in_repr, self)
+        return dequerepr(space, space.get_objects_in_repr(), self)
 
     @specialize.arg(2)
     def compare(self, w_other, op):
@@ -428,16 +424,15 @@
 app = gateway.applevel("""
     def dequerepr(currently_in_repr, d):
         'The app-level part of repr().'
-        deque_id = id(d)
-        if deque_id in currently_in_repr:
+        if d in currently_in_repr:
             listrepr = '[...]'
         else:
-            currently_in_repr[deque_id] = 1
+            currently_in_repr[d] = 1
             try:
                 listrepr = "[" + ", ".join([repr(x) for x in d]) + ']'
             finally:
                 try:
-                    del currently_in_repr[deque_id]
+                    del currently_in_repr[d]
                 except:
                     pass
         if d.maxlen is None:
diff --git a/pypy/objspace/std/dictmultiobject.py b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -139,11 +139,7 @@
         init_or_update(space, self, __args__, 'dict')
 
     def descr_repr(self, space):
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return dictrepr(space, w_currently_in_repr, self)
+        return dictrepr(space, space.get_objects_in_repr(), self)
 
     def descr_eq(self, space, w_other):
         if space.is_w(self, w_other):
@@ -468,10 +464,9 @@
     def dictrepr(currently_in_repr, d):
         if len(d) == 0:
             return "{}"
-        dict_id = id(d)
-        if dict_id in currently_in_repr:
+        if d in currently_in_repr:
             return '{...}'
-        currently_in_repr[dict_id] = 1
+        currently_in_repr[d] = 1
         try:
             items = []
             # XXX for now, we cannot use iteritems() at app-level because
@@ -482,7 +477,7 @@
             return "{" +  ', '.join(items) + "}"
         finally:
             try:
-                del currently_in_repr[dict_id]
+                del currently_in_repr[d]
             except:
                 pass
 ''', filename=__file__)
diff --git a/pypy/objspace/std/listobject.py b/pypy/objspace/std/listobject.py
--- a/pypy/objspace/std/listobject.py
+++ b/pypy/objspace/std/listobject.py
@@ -440,11 +440,7 @@
     def descr_repr(self, space):
         if self.length() == 0:
             return space.newtext('[]')
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return listrepr(space, w_currently_in_repr, self)
+        return listrepr(space, space.get_objects_in_repr(), self)
 
     def descr_eq(self, space, w_other):
         if not isinstance(w_other, W_ListObject):
@@ -2036,15 +2032,14 @@
 app = applevel("""
     def listrepr(currently_in_repr, l):
         'The app-level part of repr().'
-        list_id = id(l)
-        if list_id in currently_in_repr:
+        if l in currently_in_repr:
             return '[...]'
-        currently_in_repr[list_id] = 1
+        currently_in_repr[l] = 1
         try:
             return "[" + ", ".join([repr(x) for x in l]) + ']'
         finally:
             try:
-                del currently_in_repr[list_id]
+                del currently_in_repr[l]
             except:
                 pass
 """, filename=__file__)
diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objspace/std/objspace.py
@@ -127,6 +127,14 @@
         ec._py_repr = None
         return ec
 
+    def get_objects_in_repr(self):
+        from pypy.module.__pypy__.interp_identitydict import W_IdentityDict
+        ec = self.getexecutioncontext()
+        w_currently_in_repr = ec._py_repr
+        if w_currently_in_repr is None:
+            w_currently_in_repr = ec._py_repr = W_IdentityDict(self)
+        return w_currently_in_repr
+
     def gettypefor(self, cls):
         return self.gettypeobject(cls.typedef)
 
diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py
--- a/pypy/objspace/std/setobject.py
+++ b/pypy/objspace/std/setobject.py
@@ -165,11 +165,7 @@
         _initialize_set(space, self, w_iterable)
 
     def descr_repr(self, space):
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return setrepr(space, w_currently_in_repr, self)
+        return setrepr(space, space.get_objects_in_repr(), self)
 
     def descr_cmp(self, space, w_other):
         if space.is_w(space.type(self), space.type(w_other)):
@@ -1706,15 +1702,14 @@
 app = gateway.applevel("""
     def setrepr(currently_in_repr, s):
         'The app-level part of repr().'
-        set_id = id(s)
-        if set_id in currently_in_repr:
+        if s in currently_in_repr:
             return '%s(...)' % (s.__class__.__name__,)
-        currently_in_repr[set_id] = 1
+        currently_in_repr[s] = 1
         try:
             return '%s(%s)' % (s.__class__.__name__, [x for x in s])
         finally:
             try:
-                del currently_in_repr[set_id]
+                del currently_in_repr[s]
             except:
                 pass
 """, filename=__file__)

From pypy.commits at gmail.com  Mon Apr 17 15:16:58 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Mon, 17 Apr 2017 12:16:58 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: hg merge default
Message-ID: <58f514aa.84931c0a.8d280.ad6f@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91069:8059c5eb1ca8
Date: 2017-04-17 17:28 +0200
http://bitbucket.org/pypy/pypy/changeset/8059c5eb1ca8/

Log:	hg merge default

diff too long, truncating to 2000 out of 18946 lines

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -86,3 +86,5 @@
 ^\.cache$
 
 pypy/module/cppyy/.+/*\.pcm
+
+
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -36,3 +36,5 @@
 aff251e543859ce4508159dd9f1a82a2f553de00 release-pypy2.7-v5.6.0
 fa3249d55d15b9829e1be69cdf45b5a44cec902d release-pypy2.7-v5.7.0
 b16a4363e930f6401bceb499b9520955504c6cb0 release-pypy3.5-v5.7.0
+1aa2d8e03cdfab54b7121e93fda7e98ea88a30bf release-pypy2.7-v5.7.1
+2875f328eae2216a87f3d6f335092832eb031f56 release-pypy3.5-v5.7.1
diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py b/lib-python/2.7/distutils/sysconfig_pypy.py
--- a/lib-python/2.7/distutils/sysconfig_pypy.py
+++ b/lib-python/2.7/distutils/sysconfig_pypy.py
@@ -61,12 +61,12 @@
 def _init_posix():
     """Initialize the module as appropriate for POSIX systems."""
     g = {}
-    g['CC'] = "gcc -pthread"
-    g['CXX'] = "g++ -pthread"
+    g['CC'] = "cc -pthread"
+    g['CXX'] = "c++ -pthread"
     g['OPT'] = "-DNDEBUG -O2"
     g['CFLAGS'] = "-DNDEBUG -O2"
     g['CCSHARED'] = "-fPIC"
-    g['LDSHARED'] = "gcc -pthread -shared"
+    g['LDSHARED'] = "cc -pthread -shared"
     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
     g['AR'] = "ar"
     g['ARFLAGS'] = "rc"
diff --git a/lib_pypy/_ctypes/array.py b/lib_pypy/_ctypes/array.py
--- a/lib_pypy/_ctypes/array.py
+++ b/lib_pypy/_ctypes/array.py
@@ -83,8 +83,9 @@
         res = self.__new__(self)
         ffiarray = self._ffiarray.fromaddress(resarray.buffer, self._length_)
         res._buffer = ffiarray
-        res._base = base
-        res._index = index
+        if base is not None:
+            res._base = base
+            res._index = index
         return res
 
     def _CData_retval(self, resbuffer):
diff --git a/lib_pypy/_ctypes/basics.py b/lib_pypy/_ctypes/basics.py
--- a/lib_pypy/_ctypes/basics.py
+++ b/lib_pypy/_ctypes/basics.py
@@ -64,8 +64,9 @@
         res = object.__new__(self)
         res.__class__ = self
         res.__dict__['_buffer'] = resbuffer
-        res.__dict__['_base'] = base
-        res.__dict__['_index'] = index
+        if base is not None:
+            res.__dict__['_base'] = base
+            res.__dict__['_index'] = index
         return res
 
     def _CData_retval(self, resbuffer):
diff --git a/pypy/doc/index-of-release-notes.rst b/pypy/doc/index-of-release-notes.rst
--- a/pypy/doc/index-of-release-notes.rst
+++ b/pypy/doc/index-of-release-notes.rst
@@ -6,6 +6,7 @@
 
 .. toctree::
 
+   release-v5.7.1.rst
    release-v5.7.0.rst
    release-pypy2.7-v5.6.0.rst
    release-pypy2.7-v5.4.1.rst
@@ -59,6 +60,7 @@
 
 .. toctree::
 
+   release-v5.7.1.rst
    release-v5.7.0.rst
 
 CPython 3.3 compatible versions
diff --git a/pypy/doc/install.rst b/pypy/doc/install.rst
--- a/pypy/doc/install.rst
+++ b/pypy/doc/install.rst
@@ -32,10 +32,10 @@
 
 .. code-block:: console
 
-    $ tar xf pypy-2.1.tar.bz2
-    $ ./pypy-2.1/bin/pypy
-    Python 2.7.3 (480845e6b1dd, Jul 31 2013, 11:05:31)
-    [PyPy 2.1.0 with GCC 4.4.3] on linux2
+    $ tar xf pypy-x.y.z.tar.bz2
+    $ ./pypy-x.y.z/bin/pypy
+    Python 2.7.x (xxxxxxxxxxxx, Date, Time)
+    [PyPy x.y.z with GCC x.y.z] on linux2
     Type "help", "copyright", "credits" or "license" for more information.
     And now for something completely different: ``PyPy is an exciting technology
     that lets you to write fast, portable, multi-platform interpreters with less
diff --git a/pypy/doc/release-v5.7.0.rst b/pypy/doc/release-v5.7.0.rst
--- a/pypy/doc/release-v5.7.0.rst
+++ b/pypy/doc/release-v5.7.0.rst
@@ -99,7 +99,7 @@
     tp_dealloc
   * refactor and clean up poor handling of unicode exposed in work on py3.5
   * builtin module cppyy_ supports C++ 11, 14, etc. via cling (reflex has been removed)
-  * adapt ``weakref`` according to CPython issue #19542_, will be in CPython 2.7.14
+  * adapt ``weakref`` according to CPython issue 19542_, will be in CPython 2.7.14
   * support translations with cpyext and the Boehm GC (for special cases like
     RevDB_
   * implement ``StringBuffer.get_raw_address`` for the buffer protocol, it is
@@ -125,18 +125,18 @@
   * disable ``clock_gettime()`` on OS/X, since we support 10.11 and it was only
     added in 10.12
   * support ``HAVE_FSTATVFS`` which was unintentionally always false
-  * fix user-created C-API heaptype, issue #2434_
+  * fix user-created C-API heaptype, issue 2434_
   * fix ``PyDict_Update`` is not actually the same as ``dict.update``
   * assign ``tp_doc`` on ``PyTypeObject`` and tie it to the app-level ``__doc__`` attribute
-    issue #2446_
+    issue 2446_
   * clean up memory leaks around ``PyObject_GetBuffer``, ``PyMemoryView_GET_BUFFER``,
     ``PyMemoryView_FromBuffer``, and ``PyBuffer_Release``
   * improve support for creating C-extension objects from app-level classes,
     filling more slots, especially ``tp_new`` and ``tp_dealloc``
-  * fix for ``ctypes.c_bool`` returning ``bool`` restype, issue #2475_
+  * fix for ``ctypes.c_bool`` returning ``bool`` restype, issue 2475_
   * fix in corner cases with the GIL and C-API functions
-  * allow overriding thread.local.__init__ in a subclass, issue #2501_
-  * allow ``PyClass_New`` to be called with NULL as the first arguemnt, issue #2504_
+  * allow overriding thread.local.__init__ in a subclass, issue 2501_
+  * allow ``PyClass_New`` to be called with NULL as the first arguemnt, issue 2504_
 
 
 * Performance improvements:
diff --git a/pypy/doc/release-v5.7.1.rst b/pypy/doc/release-v5.7.1.rst
new file mode 100644
--- /dev/null
+++ b/pypy/doc/release-v5.7.1.rst
@@ -0,0 +1,50 @@
+==========
+PyPy 5.7.1
+==========
+
+We have released a bugfix PyPy2.7-v5.7.1 and PyPy3.5-v5.7.1 beta (Linux 64bit),
+due to the following issues:
+
+  * correctly handle an edge case in dict.pop (issue 2508_)
+
+  * fix a regression to correctly handle multiple inheritance in a C-API type
+    where the second base is an app-level class with a ``__new__`` function
+
+  * fix a regression to fill a C-API type's ``tp_getattr`` slot from a
+    ``__getattr__`` method (issue 2523_)
+
+Thanks to those who reported the issues.
+
+.. _2508: https://bitbucket.org/pypy/pypy/issues/2508
+.. _2523: https://bitbucket.org/pypy/pypy/issues/2523
+
+What is PyPy?
+=============
+
+PyPy is a very compliant Python interpreter, almost a drop-in replacement for
+CPython 2.7 and CPython 3.5. 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.
+
+The PyPy 2.7 release supports: 
+
+  * **x86** machines on most common operating systems
+    (Linux 32/64 bits, Mac OS X 64 bits, Windows 32 bits, OpenBSD, FreeBSD)
+  
+  * newer **ARM** hardware (ARMv6 or ARMv7, with VFPv3) running Linux,
+  
+  * big- and little-endian variants of **PPC64** running Linux,
+
+  * **s390x** running Linux
+
+.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
+.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+
+Please update, and continue to help us make PyPy better.
+
+Cheers
+
+The PyPy Team
+
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -21,3 +21,10 @@
 .. branch: vmprof-native
 
 PyPy support to profile native frames in vmprof.
+
+.. branch: reusing-r11
+.. branch: branch-prediction
+
+Performance tweaks in the x86 JIT-generated machine code: rarely taken
+blocks are moved off-line.  Also, the temporary register used to contain
+large constants is reused across instructions.
diff --git a/pypy/interpreter/astcompiler/assemble.py b/pypy/interpreter/astcompiler/assemble.py
--- a/pypy/interpreter/astcompiler/assemble.py
+++ b/pypy/interpreter/astcompiler/assemble.py
@@ -7,6 +7,7 @@
 from pypy.interpreter.astcompiler import ast, consts, misc, symtable
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.pycode import PyCode
+from pypy.interpreter.miscutils import string_sort
 from pypy.tool import stdlib_opcode as ops
 
 
@@ -138,9 +139,12 @@
 
 
 def _make_index_dict_filter(syms, flag1, flag2):
+    names = syms.keys()
+    string_sort(names)   # return cell vars in alphabetical order
     i = 0
     result = {}
-    for name, scope in syms.iteritems():
+    for name in names:
+        scope = syms[name]
         if scope in (flag1, flag2):
             result[name] = i
             i += 1
@@ -172,6 +176,7 @@
         self.cell_vars = _make_index_dict_filter(scope.symbols,
                                                  symtable.SCOPE_CELL,
                                                  symtable.SCOPE_CELL_CLASS)
+        string_sort(scope.free_vars)    # return free vars in alphabetical order
         self.free_vars = _iter_to_dict(scope.free_vars, len(self.cell_vars))
         self.w_consts = space.newdict()
         self.argcount = 0
diff --git a/pypy/interpreter/astcompiler/symtable.py b/pypy/interpreter/astcompiler/symtable.py
--- a/pypy/interpreter/astcompiler/symtable.py
+++ b/pypy/interpreter/astcompiler/symtable.py
@@ -38,7 +38,7 @@
         self.roles = {}
         self.varnames = []
         self.children = []
-        self.free_vars = {}
+        self.free_vars = []    # a bag of names: the order doesn't matter here
         self.temp_name_counter = 1
         self.has_free = False
         self.child_has_free = False
diff --git a/pypy/interpreter/miscutils.py b/pypy/interpreter/miscutils.py
--- a/pypy/interpreter/miscutils.py
+++ b/pypy/interpreter/miscutils.py
@@ -2,6 +2,9 @@
 Miscellaneous utilities.
 """
 
+from rpython.rlib.listsort import make_timsort_class
+
+
 class ThreadLocals:
     """Pseudo thread-local storage, for 'space.threadlocals'.
     This is not really thread-local at all; the intention is that the PyPy
@@ -53,3 +56,15 @@
             def set(self, key, value):
                 self._dict[key] = value
         return FakeWeakValueDict()
+
+
+_StringBaseTimSort = make_timsort_class()
+
+class StringSort(_StringBaseTimSort):
+    def lt(self, a, b):
+        return a < b
+
+def string_sort(lst):
+    """Sort a (resizable) list of strings."""
+    sorter = StringSort(lst, len(lst))
+    sorter.sort()
diff --git a/pypy/interpreter/test/test_compiler.py b/pypy/interpreter/test/test_compiler.py
--- a/pypy/interpreter/test/test_compiler.py
+++ b/pypy/interpreter/test/test_compiler.py
@@ -1035,6 +1035,32 @@
         else:
             assert l1 == l2 == l3 == l4 == [1, 3, 2, 4]
 
+    def test_freevars_order(self):
+        # co_cellvars and co_freevars are guaranteed to appear in
+        # alphabetical order.  See CPython Issue #15368 (which does
+        # not come with tests).
+        source = """if 1:
+        def f1(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15):
+            def g1():
+                return (x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15)
+            return g1
+        def f2(x15,x14,x13,x12,x11,x10,x9,x8,x7,x6,x5,x4,x3,x2,x1):
+            def g2():
+                return (x15,x14,x13,x12,x11,x10,x9,x8,x7,x6,x5,x4,x3,x2,x1)
+            return g2
+        c1 = f1(*range(15)).__code__.co_freevars
+        c2 = f2(*range(15)).__code__.co_freevars
+        r1 = f1.__code__.co_cellvars
+        r2 = f2.__code__.co_cellvars
+        """
+        d = {}
+        exec(source, d)
+        assert d['c1'] == d['c2']
+        # the test above is important for a few bytecode hacks,
+        # but actually we get them in alphabetical order, so check that:
+        assert d['c1'] == tuple(sorted(d['c1']))
+        assert d['r1'] == d['r2'] == d['c1']
+
     def test_ast_equality(self):
         import _ast
         sample_code = [
diff --git a/pypy/module/_collections/interp_deque.py b/pypy/module/_collections/interp_deque.py
--- a/pypy/module/_collections/interp_deque.py
+++ b/pypy/module/_collections/interp_deque.py
@@ -406,11 +406,7 @@
 
     def repr(self):
         space = self.space
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return dequerepr(space, w_currently_in_repr, self)
+        return dequerepr(space, space.get_objects_in_repr(), self)
 
     @specialize.arg(2)
     def compare(self, w_other, op):
@@ -523,18 +519,17 @@
 app = gateway.applevel("""
     def dequerepr(currently_in_repr, d):
         'The app-level part of repr().'
-        deque_id = id(d)
-        if deque_id in currently_in_repr:
+        if d in currently_in_repr:
             return '[...]'   # strange because it's a deque and this
                              # strongly suggests it's a list instead,
                              # but confirmed behavior from python-dev
         else:
-            currently_in_repr[deque_id] = 1
+            currently_in_repr[d] = 1
             try:
                 listrepr = "[" + ", ".join([repr(x) for x in d]) + ']'
             finally:
                 try:
-                    del currently_in_repr[deque_id]
+                    del currently_in_repr[d]
                 except:
                     pass
         if d.maxlen is None:
diff --git a/pypy/module/_vmprof/test/test_direct.py b/pypy/module/_vmprof/test/test_direct.py
--- a/pypy/module/_vmprof/test/test_direct.py
+++ b/pypy/module/_vmprof/test/test_direct.py
@@ -1,4 +1,4 @@
-
+import sys
 import py
 try:
     import cffi
@@ -7,6 +7,7 @@
 
 from rpython.rlib import rvmprof
 srcdir = py.path.local(rvmprof.__file__).join("..", "src")
+shareddir = srcdir.join('shared')
 
 ffi = cffi.FFI()
 ffi.cdef("""
@@ -43,7 +44,7 @@
 }
 
 
-""" + open(str(srcdir.join("shared/vmprof_get_custom_offset.h"))).read(), include_dirs=[str(srcdir)])
+""" + open(str(srcdir.join("shared/vmprof_get_custom_offset.h"))).read(), include_dirs=[str(srcdir), str(shareddir)])
 
 class TestDirect(object):
     def test_infrastructure(self):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py b/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
@@ -596,3 +596,37 @@
 
         get_data.errcheck = ret_list_p(1)
         assert get_data('testing!') == [-1, -2, -3, -4]
+
+    def test_issue2533(self):
+        import cffi
+        ffi = cffi.FFI()
+        ffi.cdef("int **fetchme(void);")
+        ffi.set_source("_x_cffi", """
+            int **fetchme(void)
+            {
+                static int a = 42;
+                static int *pa = &a;
+                return &pa;
+            }
+        """)
+        from rpython.tool.udir import udir
+        ffi.compile(verbose=True, tmpdir=str(udir))
+
+        import sys
+        sys.path.insert(0, str(udir))
+        try:
+            from _x_cffi import ffi, lib
+        finally:
+            sys.path.pop(0)
+        fetchme = ffi.addressof(lib, 'fetchme')
+        fetchme = int(ffi.cast("intptr_t", fetchme))
+
+        FN = CFUNCTYPE(POINTER(POINTER(c_int)))
+        ff = cast(fetchme, FN)
+
+        g = ff()
+        assert g.contents.contents.value == 42
+
+        h = c_int(43)
+        g[0] = pointer(h)     # used to crash here
+        assert g.contents.contents.value == 43
diff --git a/pypy/objspace/std/dictmultiobject.py b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -143,11 +143,7 @@
         init_or_update(space, self, __args__, 'dict')
 
     def descr_repr(self, space):
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return dictrepr(space, w_currently_in_repr, self)
+        return dictrepr(space, space.get_objects_in_repr(), self)
 
     def descr_eq(self, space, w_other):
         if space.is_w(self, w_other):
@@ -404,10 +400,9 @@
     def dictrepr(currently_in_repr, d):
         if len(d) == 0:
             return "{}"
-        dict_id = id(d)
-        if dict_id in currently_in_repr:
+        if d in currently_in_repr:
             return '{...}'
-        currently_in_repr[dict_id] = 1
+        currently_in_repr[d] = 1
         try:
             items = []
             # XXX for now, we cannot use items() without list at
@@ -419,7 +414,7 @@
             return "{" +  ', '.join(items) + "}"
         finally:
             try:
-                del currently_in_repr[dict_id]
+                del currently_in_repr[d]
             except:
                 pass
 ''', filename=__file__)
diff --git a/pypy/objspace/std/listobject.py b/pypy/objspace/std/listobject.py
--- a/pypy/objspace/std/listobject.py
+++ b/pypy/objspace/std/listobject.py
@@ -23,6 +23,7 @@
     WrappedDefault, applevel, interp2app, unwrap_spec)
 from pypy.interpreter.signature import Signature
 from pypy.interpreter.typedef import TypeDef
+from pypy.interpreter.miscutils import StringSort
 from pypy.objspace.std.bytesobject import W_BytesObject
 from pypy.objspace.std.floatobject import W_FloatObject
 from pypy.objspace.std.intobject import W_IntObject
@@ -438,11 +439,7 @@
     def descr_repr(self, space):
         if self.length() == 0:
             return space.newtext('[]')
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return listrepr(space, w_currently_in_repr, self)
+        return listrepr(space, space.get_objects_in_repr(), self)
 
     def descr_eq(self, space, w_other):
         if not isinstance(w_other, W_ListObject):
@@ -2014,15 +2011,14 @@
 app = applevel("""
     def listrepr(currently_in_repr, l):
         'The app-level part of repr().'
-        list_id = id(l)
-        if list_id in currently_in_repr:
+        if l in currently_in_repr:
             return '[...]'
-        currently_in_repr[list_id] = 1
+        currently_in_repr[l] = 1
         try:
             return "[" + ", ".join([repr(x) for x in l]) + ']'
         finally:
             try:
-                del currently_in_repr[list_id]
+                del currently_in_repr[l]
             except:
                 pass
 """, filename=__file__)
@@ -2039,7 +2035,6 @@
 IntBaseTimSort = make_timsort_class()
 FloatBaseTimSort = make_timsort_class()
 IntOrFloatBaseTimSort = make_timsort_class()
-StringBaseTimSort = make_timsort_class()
 UnicodeBaseTimSort = make_timsort_class()
 
 
@@ -2076,11 +2071,6 @@
         return fa < fb
 
 
-class StringSort(StringBaseTimSort):
-    def lt(self, a, b):
-        return a < b
-
-
 class UnicodeSort(UnicodeBaseTimSort):
     def lt(self, a, b):
         return a < b
diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objspace/std/objspace.py
@@ -126,6 +126,14 @@
         ec._py_repr = None
         return ec
 
+    def get_objects_in_repr(self):
+        from pypy.module.__pypy__.interp_identitydict import W_IdentityDict
+        ec = self.getexecutioncontext()
+        w_currently_in_repr = ec._py_repr
+        if w_currently_in_repr is None:
+            w_currently_in_repr = ec._py_repr = W_IdentityDict(self)
+        return w_currently_in_repr
+
     def gettypefor(self, cls):
         return self.gettypeobject(cls.typedef)
 
diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py
--- a/pypy/objspace/std/setobject.py
+++ b/pypy/objspace/std/setobject.py
@@ -165,11 +165,7 @@
         _initialize_set(space, self, w_iterable)
 
     def descr_repr(self, space):
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return setrepr(space, w_currently_in_repr, self)
+        return setrepr(space, space.get_objects_in_repr(), self)
 
     def descr_eq(self, space, w_other):
         if isinstance(w_other, W_BaseSetObject):
@@ -1700,10 +1696,9 @@
 app = gateway.applevel("""
     def setrepr(currently_in_repr, s):
         'The app-level part of repr().'
-        set_id = id(s)
-        if set_id in currently_in_repr:
+        if s in currently_in_repr:
             return '%s(...)' % (s.__class__.__name__,)
-        currently_in_repr[set_id] = 1
+        currently_in_repr[s] = 1
         try:
             if not s:
                 return '%s()' % (s.__class__.__name__,)
@@ -1714,7 +1709,7 @@
                 return '%s({%s})' % (s.__class__.__name__, listrepr[1:-1])
         finally:
             try:
-                del currently_in_repr[set_id]
+                del currently_in_repr[s]
             except:
                 pass
 """, filename=__file__)
diff --git a/pypy/objspace/std/typeobject.py b/pypy/objspace/std/typeobject.py
--- a/pypy/objspace/std/typeobject.py
+++ b/pypy/objspace/std/typeobject.py
@@ -1087,7 +1087,7 @@
     return w_name.text_w(space)
 
 def create_all_slots(w_self, hasoldstylebase, w_bestbase, force_new_layout):
-    from pypy.objspace.std.listobject import StringSort
+    from pypy.interpreter.miscutils import string_sort
 
     base_layout = w_bestbase.layout
     index_next_extra_slot = base_layout.nslots
@@ -1120,8 +1120,7 @@
             else:
                 newslotnames.append(slot_name)
         # Sort the list of names collected so far
-        sorter = StringSort(newslotnames, len(newslotnames))
-        sorter.sort()
+        string_sort(newslotnames)
         # Try to create all slots in order.  The creation of some of
         # them might silently fail; then we delete the name from the
         # list.  At the end, 'index_next_extra_slot' has been advanced
diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -241,12 +241,14 @@
             zf.close()
         else:
             archive = str(builddir.join(name + '.tar.bz2'))
-            if sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
+            if sys.platform == 'darwin':
                 print >>sys.stderr, """Warning: tar on current platform does not suport overriding the uid and gid
 for its contents. The tarball will contain your uid and gid. If you are
 building the actual release for the PyPy website, you may want to be
 using another platform..."""
                 e = os.system('tar --numeric-owner -cvjf ' + archive + " " + name)
+            elif sys.platform.startswith('freebsd'):
+                e = os.system('tar --uname=root --gname=wheel -cvjf ' + archive + " " + name)
             elif sys.platform == 'cygwin':
                 e = os.system('tar --owner=Administrator --group=Administrators --numeric-owner -cvjf ' + archive + " " + name)
             else:
diff --git a/rpython/jit/backend/llsupport/asmmemmgr.py b/rpython/jit/backend/llsupport/asmmemmgr.py
--- a/rpython/jit/backend/llsupport/asmmemmgr.py
+++ b/rpython/jit/backend/llsupport/asmmemmgr.py
@@ -250,7 +250,7 @@
         return self.rawstart
 
     def overwrite(self, index, char):
-        assert 0 <= index < self.get_relative_pos()
+        assert 0 <= index < self.get_relative_pos(break_basic_block=False)
         block = self._cursubblock
         index -= self._baserelpos
         while index < 0:
@@ -264,7 +264,8 @@
         self.overwrite(index + 2, chr((val >> 16) & 0xff))
         self.overwrite(index + 3, chr((val >> 24) & 0xff))
 
-    def get_relative_pos(self):
+    def get_relative_pos(self, break_basic_block=True):
+        # 'break_basic_block' is only used in x86
         return self._baserelpos + self._cursubindex
 
     def copy_to_raw_memory(self, addr):
@@ -288,7 +289,7 @@
         HEX = '0123456789ABCDEF'
         dump = []
         src = rffi.cast(rffi.CCHARP, addr)
-        end = self.get_relative_pos()
+        end = self.get_relative_pos(break_basic_block=False)
         if count != -1:
             end = offset + count
         for p in range(offset, end):
@@ -336,17 +337,20 @@
 
     def _become_a_plain_block_builder(self):
         # hack purely for speed of tests
-        self._data = []
-        self.writechar = self._data.append
-        self.overwrite = self._data.__setitem__
-        self.get_relative_pos = self._data.__len__
+        self._data = _data = []
+        self.writechar = _data.append
+        self.overwrite = _data.__setitem__
+        def get_relative_pos(break_basic_block=True):
+            return len(_data)
+        self.get_relative_pos = get_relative_pos
         def plain_copy_to_raw_memory(addr):
             dst = rffi.cast(rffi.CCHARP, addr)
-            for i, c in enumerate(self._data):
+            for i, c in enumerate(_data):
                 dst[i] = c
         self._copy_to_raw_memory = plain_copy_to_raw_memory
 
     def insert_gcroot_marker(self, mark):
         if self.gcroot_markers is None:
             self.gcroot_markers = []
-        self.gcroot_markers.append((self.get_relative_pos(), mark))
+        self.gcroot_markers.append(
+            (self.get_relative_pos(break_basic_block=False), mark))
diff --git a/rpython/jit/backend/llsupport/assembler.py b/rpython/jit/backend/llsupport/assembler.py
--- a/rpython/jit/backend/llsupport/assembler.py
+++ b/rpython/jit/backend/llsupport/assembler.py
@@ -265,14 +265,16 @@
 
     def enter_portal_frame(self, op):
         if self.cpu.HAS_CODEMAP:
+            pos = self.mc.get_relative_pos(break_basic_block=False)
             self.codemap_builder.enter_portal_frame(op.getarg(0).getint(),
                                                     op.getarg(1).getint(),
-                                                    self.mc.get_relative_pos())
+                                                    pos)
 
     def leave_portal_frame(self, op):
         if self.cpu.HAS_CODEMAP:
+            pos = self.mc.get_relative_pos(break_basic_block=False)
             self.codemap_builder.leave_portal_frame(op.getarg(0).getint(),
-                                                    self.mc.get_relative_pos())
+                                                    pos)
 
     def call_assembler(self, op, argloc, vloc, result_loc, tmploc):
         """
diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -76,6 +76,7 @@
         BaseAssembler.setup(self, looptoken)
         assert self.memcpy_addr != 0, "setup_once() not called?"
         self.current_clt = looptoken.compiled_loop_token
+        self.pending_slowpaths = []
         self.pending_guard_tokens = []
         if WORD == 8:
             self.pending_memoryerror_trampoline_from = []
@@ -95,6 +96,7 @@
             self.pending_memoryerror_trampoline_from = None
         self.mc = None
         self.current_clt = None
+        self.frame_depth_to_patch = None
 
     def _build_float_constants(self):
         # 0x80000000000000008000000000000000
@@ -181,6 +183,7 @@
         """ This builds a general call slowpath, for whatever call happens to
         come.
         """
+        self.pending_slowpaths = []
         mc = codebuf.MachineCodeBlockWrapper()
         # copy registers to the frame, with the exception of the
         # 'cond_call_register_arguments' and eax, because these have already
@@ -211,6 +214,7 @@
         self.pop_gcmap(mc)   # cancel the push_gcmap(store=True) in the caller
         self._pop_all_regs_from_frame(mc, [eax], supports_floats, callee_only)
         mc.RET()
+        self.flush_pending_slowpaths(mc)
         return mc.materialize(self.cpu, [])
 
     def _build_malloc_slowpath(self, kind):
@@ -227,6 +231,7 @@
         This function must preserve all registers apart from ecx and edx.
         """
         assert kind in ['fixed', 'str', 'unicode', 'var']
+        self.pending_slowpaths = []
         mc = codebuf.MachineCodeBlockWrapper()
         self._push_all_regs_to_frame(mc, [ecx, edx], self.cpu.supports_floats)
         # the caller already did push_gcmap(store=True)
@@ -276,13 +281,13 @@
         self.set_extra_stack_depth(mc, 0)
         #
         mc.TEST_rr(eax.value, eax.value)
+        # common case: not taken
         mc.J_il(rx86.Conditions['Z'], 0xfffff) # patched later
-        jz_location = mc.get_relative_pos()
+        jz_location = mc.get_relative_pos(break_basic_block=False)
         mc.MOV_rr(ecx.value, eax.value)
         #
         nursery_free_adr = self.cpu.gc_ll_descr.get_nursery_free_addr()
         self._pop_all_regs_from_frame(mc, [ecx, edx], self.cpu.supports_floats)
-        mc.MOV(edx, heap(nursery_free_adr))   # load this in EDX
         self.pop_gcmap(mc)   # push_gcmap(store=True) done by the caller
         mc.RET()
         #
@@ -298,6 +303,7 @@
         mc.force_frame_size(DEFAULT_FRAME_BYTES + WORD)
         mc.ADD_ri(esp.value, WORD)
         mc.JMP(imm(self.propagate_exception_path))
+        self.flush_pending_slowpaths(mc)
         #
         rawstart = mc.materialize(self.cpu, [])
         return rawstart
@@ -718,6 +724,7 @@
         if rx86.fits_in_32bits(offset):
             mc.JMP_l(offset)
         else:
+            # mc.forget_scratch_register() not needed here
             mc.MOV_ri(X86_64_SCRATCH_REG.value, adr_new_target)
             mc.JMP_r(X86_64_SCRATCH_REG.value)
         mc.copy_to_raw_memory(adr_jump_offset)
@@ -755,7 +762,17 @@
         gcreftracers.append(tracer)    # keepalive
         self.teardown_gcrefs_list()
 
+    def flush_pending_slowpaths(self, mc):
+        # for each pending slowpath, generate it now.  Note that this
+        # may occasionally add an extra guard_token in
+        # pending_guard_tokens, so it must be done before the
+        # following loop in write_pending_failure_recoveries().
+        for sp in self.pending_slowpaths:
+            sp.generate(self, mc)
+        self.pending_slowpaths = None
+
     def write_pending_failure_recoveries(self, regalloc):
+        self.flush_pending_slowpaths(self.mc)
         # for each pending guard, generate the code of the recovery stub
         # at the end of self.mc.
         for tok in self.pending_guard_tokens:
@@ -821,6 +838,14 @@
         for ofs in self.frame_depth_to_patch:
             self._patch_frame_depth(ofs + rawstart, framedepth)
 
+    class IncreaseStackSlowPath(codebuf.SlowPath):
+        def generate_body(self, assembler, mc):
+            mc.MOV_si(WORD, 0xffffff)     # force writing 32 bit
+            ofs2 = mc.get_relative_pos(break_basic_block=False) - 4
+            assembler.frame_depth_to_patch.append(ofs2)
+            assembler.push_gcmap(mc, self.gcmap, store=True)
+            mc.CALL(imm(assembler._frame_realloc_slowpath))
+
     def _check_frame_depth(self, mc, gcmap):
         """ check if the frame is of enough depth to follow this bridge.
         Otherwise reallocate the frame in a helper.
@@ -830,16 +855,12 @@
         descrs = self.cpu.gc_ll_descr.getframedescrs(self.cpu)
         ofs = self.cpu.unpack_fielddescr(descrs.arraydescr.lendescr)
         mc.CMP_bi(ofs, 0xffffff)     # force writing 32 bit
-        stack_check_cmp_ofs = mc.get_relative_pos() - 4
-        jg_location = mc.emit_forward_jump('GE')
-        mc.MOV_si(WORD, 0xffffff)     # force writing 32 bit
-        ofs2 = mc.get_relative_pos() - 4
-        self.push_gcmap(mc, gcmap, store=True)
-        mc.CALL(imm(self._frame_realloc_slowpath))
-        # patch the JG above
-        mc.patch_forward_jump(jg_location)
+        stack_check_cmp_ofs = mc.get_relative_pos(break_basic_block=False) - 4
         self.frame_depth_to_patch.append(stack_check_cmp_ofs)
-        self.frame_depth_to_patch.append(ofs2)
+        sp = self.IncreaseStackSlowPath(mc, rx86.Conditions['L'])
+        sp.gcmap = gcmap
+        sp.set_continue_addr(mc)
+        self.pending_slowpaths.append(sp)
 
     def _check_frame_depth_debug(self, mc):
         """ double check the depth size. It prints the error (and potentially
@@ -850,11 +871,11 @@
         descrs = self.cpu.gc_ll_descr.getframedescrs(self.cpu)
         ofs = self.cpu.unpack_fielddescr(descrs.arraydescr.lendescr)
         mc.CMP_bi(ofs, 0xffffff)
-        stack_check_cmp_ofs = mc.get_relative_pos() - 4
+        stack_check_cmp_ofs = mc.get_relative_pos(break_basic_block=False) - 4
         jg_location = mc.emit_forward_jump('GE')
         mc.MOV_rr(edi.value, ebp.value)
         mc.MOV_ri(esi.value, 0xffffff)
-        ofs2 = mc.get_relative_pos() - 4
+        ofs2 = mc.get_relative_pos(break_basic_block=False) - 4
         mc.CALL(imm(self.cpu.realloc_frame_crash))
         # patch the JG above
         mc.patch_forward_jump(jg_location)
@@ -895,6 +916,7 @@
             # "mov r11, addr; jmp r11" is up to 13 bytes, which fits in there
             # because we always write "mov r11, imm-as-8-bytes; call *r11" in
             # the first place.
+            # mc.forget_scratch_register() not needed here
             mc.MOV_ri(X86_64_SCRATCH_REG.value, adr_new_target)
             mc.JMP_r(X86_64_SCRATCH_REG.value)
             p = rffi.cast(rffi.INTP, adr_jump_offset)
@@ -939,7 +961,7 @@
             # would be used to pass arguments #3 and #4 (even though, so
             # far, the assembler only receives two arguments).
             tloc = esi
-            old = r11
+            old = r10
         # eax = address in the stack of a 3-words struct vmprof_stack_s
         self.mc.LEA_rs(eax.value, (FRAME_FIXED_SIZE - 4) * WORD)
         # old = current value of vmprof_tl_stack
@@ -984,6 +1006,10 @@
         if gcrootmap and gcrootmap.is_shadow_stack:
             self._call_header_shadowstack(gcrootmap)
 
+    class StackCheckSlowPath(codebuf.SlowPath):
+        def generate_body(self, assembler, mc):
+            mc.CALL(imm(assembler.stack_check_slowpath))
+
     def _call_header_with_stack_check(self):
         self._call_header()
         if self.stack_check_slowpath == 0:
@@ -993,11 +1019,9 @@
             self.mc.MOV(eax, heap(endaddr))             # MOV eax, [start]
             self.mc.SUB(eax, esp)                       # SUB eax, current
             self.mc.CMP(eax, heap(lengthaddr))          # CMP eax, [length]
-            jb_location = self.mc.emit_forward_jump('BE')#JBE .skip
-            self.mc.CALL(imm(self.stack_check_slowpath))# CALL slowpath
-            # patch the JB above                        # .skip:
-            self.mc.patch_forward_jump(jb_location)
-            #
+            sp = self.StackCheckSlowPath(self.mc, rx86.Conditions['A'])
+            sp.set_continue_addr(self.mc)
+            self.pending_slowpaths.append(sp)
 
     def _call_footer(self):
         # the return value is the jitframe
@@ -1023,27 +1047,14 @@
         fit in 32 bits, it will be loaded in r11.
         """
         rst = gcrootmap.get_root_stack_top_addr()
-        if rx86.fits_in_32bits(rst):
-            mc.MOV_rj(ebx.value, rst)            # MOV ebx, [rootstacktop]
-        else:
-            mc.MOV_ri(X86_64_SCRATCH_REG.value, rst) # MOV r11, rootstacktop
-            mc.MOV_rm(ebx.value, (X86_64_SCRATCH_REG.value, 0))
-            # MOV ebx, [r11]
-        #
+        mc.MOV(ebx, heap(rst))                  # maybe via loading r11
         return rst
 
     def _call_header_shadowstack(self, gcrootmap):
         rst = self._load_shadowstack_top_in_ebx(self.mc, gcrootmap)
         self.mc.MOV_mr((ebx.value, 0), ebp.value)      # MOV [ebx], ebp
         self.mc.ADD_ri(ebx.value, WORD)
-        if rx86.fits_in_32bits(rst):
-            self.mc.MOV_jr(rst, ebx.value)            # MOV [rootstacktop], ebx
-        else:
-            # The integer 'rst' doesn't fit in 32 bits, so we know that
-            # _load_shadowstack_top_in_ebx() above loaded it in r11.
-            # Reuse it.  Be careful not to overwrite r11 in the middle!
-            self.mc.MOV_mr((X86_64_SCRATCH_REG.value, 0),
-                           ebx.value) # MOV [r11], ebx
+        self.mc.MOV(heap(rst), ebx)                   # MOV [rootstacktop], ebx
 
     def _call_footer_shadowstack(self, gcrootmap):
         rst = gcrootmap.get_root_stack_top_addr()
@@ -1166,9 +1177,9 @@
                                                     faillocs, frame_depth)
         genop_guard_list[guard_opnum](self, guard_op, guard_token,
                                       arglocs, resloc)
-        if not we_are_translated():
-            # must be added by the genop_guard_list[]()
-            assert guard_token is self.pending_guard_tokens[-1]
+        # this must usually have added guard_token as last element
+        # of self.pending_guard_tokens, but not always (see
+        # genop_guard_guard_no_exception)
 
     def load_effective_addr(self, sizereg, baseofs, scale, result, frm=imm0):
         self.mc.LEA(result, addr_add(frm, sizereg, baseofs, scale))
@@ -1449,7 +1460,7 @@
         # has been emitted.  64-bit mode only.
         assert IS_X86_64
         address_in_buffer = index * WORD   # at the start of the buffer
-        p_location = self.mc.get_relative_pos()
+        p_location = self.mc.get_relative_pos(break_basic_block=False)
         offset = address_in_buffer - p_location
         self.mc.overwrite32(p_location-4, offset)
 
@@ -1547,11 +1558,13 @@
         reg = arglocs[0]
         self.mc.TEST(reg, reg)
         if WORD == 4:
+            # common case: not taken
             self.mc.J_il(rx86.Conditions['Z'], self.propagate_exception_path)
             self.mc.add_pending_relocation()
         elif WORD == 8:
+            # common case: not taken
             self.mc.J_il(rx86.Conditions['Z'], 0)
-            pos = self.mc.get_relative_pos()
+            pos = self.mc.get_relative_pos(break_basic_block=False)
             self.pending_memoryerror_trampoline_from.append(pos)
 
     # ----------
@@ -1706,23 +1719,29 @@
     genop_guard_guard_isnull = genop_guard_guard_false
 
     def genop_guard_guard_no_exception(self, guard_op, guard_token, locs, ign):
+        # If the previous operation was a COND_CALL, don't emit
+        # anything now.  Instead, we'll emit the GUARD_NO_EXCEPTION at
+        # the end of the slowpath in CondCallSlowPath.
+        if self._find_nearby_operation(-1).getopnum() in (
+                rop.COND_CALL, rop.COND_CALL_VALUE_I, rop.COND_CALL_VALUE_R):
+            sp = self.pending_slowpaths[-1]
+            assert isinstance(sp, self.CondCallSlowPath)
+            sp.guard_token_no_exception = guard_token
+        else:
+            self.generate_guard_no_exception(guard_token)
+
+    def generate_guard_no_exception(self, guard_token):
         self.mc.CMP(heap(self.cpu.pos_exception()), imm0)
         self.guard_success_cc = rx86.Conditions['Z']
         self.implement_guard(guard_token)
-        # If the previous operation was a COND_CALL, overwrite its conditional
-        # jump to jump over this GUARD_NO_EXCEPTION as well, if we can
-        if self._find_nearby_operation(-1).getopnum() in (
-                rop.COND_CALL, rop.COND_CALL_VALUE_I, rop.COND_CALL_VALUE_R):
-            j_location = self.previous_cond_call_jcond
-            try:
-                self.mc.patch_forward_jump(j_location)
-            except codebuf.ShortJumpTooFar:
-                pass    # ignore this case
 
     def genop_guard_guard_not_invalidated(self, guard_op, guard_token,
                                           locs, ign):
-        pos = self.mc.get_relative_pos() + 1 # after potential jmp
+        pos = self.mc.get_relative_pos(break_basic_block=False)
+        pos += 1   # after potential jmp
         guard_token.pos_jump_offset = pos
+        saved = self.mc.get_scratch_register_known_value()
+        guard_token.known_scratch_value = saved
         self.pending_guard_tokens.append(guard_token)
 
     def genop_guard_guard_exception(self, guard_op, guard_token, locs, resloc):
@@ -1918,6 +1937,8 @@
         """
         self.mc.force_frame_size(DEFAULT_FRAME_BYTES)
         startpos = self.mc.get_relative_pos()
+        self.mc.restore_scratch_register_known_value(
+                                         guardtok.known_scratch_value)
         #
         self._update_at_exit(guardtok.fail_locs, guardtok.failargs,
                              guardtok.faildescr, regalloc)
@@ -2075,9 +2096,13 @@
     def implement_guard(self, guard_token):
         # These jumps are patched later.
         assert self.guard_success_cc >= 0
+        # common case: not taken
         self.mc.J_il(rx86.invert_condition(self.guard_success_cc), 0)
         self.guard_success_cc = rx86.cond_none
-        guard_token.pos_jump_offset = self.mc.get_relative_pos() - 4
+        pos = self.mc.get_relative_pos(break_basic_block=False)
+        guard_token.pos_jump_offset = pos - 4
+        saved = self.mc.get_scratch_register_known_value()
+        guard_token.known_scratch_value = saved
         self.pending_guard_tokens.append(guard_token)
 
     def _genop_real_call(self, op, arglocs, resloc):
@@ -2125,6 +2150,7 @@
 
         faildescrindex = self.get_gcref_from_faildescr(faildescr)
         if IS_X86_64:
+            self.mc.forget_scratch_register()
             self.mc.MOV_rp(X86_64_SCRATCH_REG.value, 0)
             self._patch_load_from_gc_table(faildescrindex)
             self.mc.MOV(raw_stack(ofs), X86_64_SCRATCH_REG)
@@ -2238,6 +2264,84 @@
 
     # ------------------- END CALL ASSEMBLER -----------------------
 
+    class WriteBarrierSlowPath(codebuf.SlowPath):
+        def generate_body(self, assembler, mc):
+            mc.force_frame_size(DEFAULT_FRAME_BYTES)
+            # for cond_call_gc_wb_array, also add another fast path:
+            # if GCFLAG_CARDS_SET, then we can just set one bit and be done
+            card_marking = (self.loc_index is not None)
+            if card_marking:
+                # GCFLAG_CARDS_SET is in this byte at 0x80, so this fact can
+                # been checked by the sign flags of the previous TEST8
+                js_location = mc.emit_forward_jump('S')   # patched later
+            else:
+                js_location = 0
+
+            # Write only a CALL to the helper prepared in advance, passing it as
+            # argument the address of the structure we are writing into
+            # (the first argument to COND_CALL_GC_WB).
+            helper_num = self.helper_num
+            is_frame = (helper_num == 4)
+            descr = self.descr
+            loc_base = self.loc_base
+            #
+            if not is_frame:
+                mc.PUSH(loc_base)
+            mc.CALL(imm(assembler.wb_slowpath[helper_num]))
+            if not is_frame:
+                mc.stack_frame_size_delta(-WORD)
+
+            if card_marking:
+                # The helper ends again with a check of the flag in the object.
+                # So here, we can simply write again a 'JNS', which will be
+                # taken if GCFLAG_CARDS_SET is still not set.
+                jns_location = mc.emit_forward_jump('NS')   # patched later
+                #
+                # patch the JS above
+                mc.patch_forward_jump(js_location)
+                #
+                # case GCFLAG_CARDS_SET: emit a few instructions to do
+                # directly the card flag setting
+                loc_index = self.loc_index
+                if isinstance(loc_index, RegLoc):
+                    if IS_X86_64 and isinstance(loc_base, RegLoc):
+                        # copy loc_index into r11
+                        tmp1 = X86_64_SCRATCH_REG
+                        mc.forget_scratch_register()
+                        mc.MOV_rr(tmp1.value, loc_index.value)
+                        final_pop = False
+                    else:
+                        # must save the register loc_index before it is mutated
+                        mc.PUSH_r(loc_index.value)
+                        tmp1 = loc_index
+                        final_pop = True
+                    # SHR tmp, card_page_shift
+                    mc.SHR_ri(tmp1.value, descr.jit_wb_card_page_shift)
+                    # XOR tmp, -8
+                    mc.XOR_ri(tmp1.value, -8)
+                    # BTS [loc_base], tmp
+                    if final_pop:
+                        # r11 is not specially used, fall back to regloc.py
+                        mc.BTS(addr_add_const(loc_base, 0), tmp1)
+                    else:
+                        # tmp1 is r11!  but in this case, loc_base is a
+                        # register so we can invoke directly rx86.py
+                        mc.BTS_mr((loc_base.value, 0), tmp1.value)
+                    # done
+                    if final_pop:
+                        mc.POP_r(loc_index.value)
+                    #
+                elif isinstance(loc_index, ImmedLoc):
+                    byte_index = loc_index.value >> descr.jit_wb_card_page_shift
+                    byte_ofs = ~(byte_index >> 3)
+                    byte_val = 1 << (byte_index & 7)
+                    mc.OR8(addr_add_const(loc_base, byte_ofs), imm(byte_val))
+                else:
+                    raise AssertionError("index is neither RegLoc nor ImmedLoc")
+                #
+                # patch the JNS above
+                mc.patch_forward_jump(jns_location)
+
     def _write_barrier_fastpath(self, mc, descr, arglocs, array=False,
                                 is_frame=False):
         # Write code equivalent to write_barrier() in the GC: it checks
@@ -2249,6 +2353,7 @@
             assert cls is not None and isinstance(descr, cls)
         #
         card_marking = False
+        loc_index = None
         mask = descr.jit_wb_if_flag_singlebyte
         if array and descr.jit_wb_cards_set != 0:
             # assumptions the rest of the function depends on:
@@ -2256,6 +2361,7 @@
                     descr.jit_wb_if_flag_byteofs)
             assert descr.jit_wb_cards_set_singlebyte == -0x80
             card_marking = True
+            loc_index = arglocs[1]
             mask = descr.jit_wb_if_flag_singlebyte | -0x80
         #
         loc_base = arglocs[0]
@@ -2264,21 +2370,7 @@
             loc = raw_stack(descr.jit_wb_if_flag_byteofs)
         else:
             loc = addr_add_const(loc_base, descr.jit_wb_if_flag_byteofs)
-        mc.TEST8(loc, imm(mask))
-        jz_location = mc.emit_forward_jump('Z')   # patched later
-
-        # for cond_call_gc_wb_array, also add another fast path:
-        # if GCFLAG_CARDS_SET, then we can just set one bit and be done
-        if card_marking:
-            # GCFLAG_CARDS_SET is in this byte at 0x80, so this fact can
-            # been checked by the sign flags of the previous TEST8
-            js_location = mc.emit_forward_jump('S')   # patched later
-        else:
-            js_location = 0
-
-        # Write only a CALL to the helper prepared in advance, passing it as
-        # argument the address of the structure we are writing into
-        # (the first argument to COND_CALL_GC_WB).
+        #
         helper_num = card_marking
         if is_frame:
             helper_num = 4
@@ -2291,58 +2383,14 @@
                                     bool(self._regalloc.xrm.reg_bindings))
             assert self.wb_slowpath[helper_num] != 0
         #
-        if not is_frame:
-            mc.PUSH(loc_base)
-        mc.CALL(imm(self.wb_slowpath[helper_num]))
-        if not is_frame:
-            mc.stack_frame_size_delta(-WORD)
-
-        if card_marking:
-            # The helper ends again with a check of the flag in the object.
-            # So here, we can simply write again a 'JNS', which will be
-            # taken if GCFLAG_CARDS_SET is still not set.
-            jns_location = mc.emit_forward_jump('NS')   # patched later
-            #
-            # patch the JS above
-            mc.patch_forward_jump(js_location)
-            #
-            # case GCFLAG_CARDS_SET: emit a few instructions to do
-            # directly the card flag setting
-            loc_index = arglocs[1]
-            if isinstance(loc_index, RegLoc):
-                if IS_X86_64 and isinstance(loc_base, RegLoc):
-                    # copy loc_index into r11
-                    tmp1 = X86_64_SCRATCH_REG
-                    mc.MOV_rr(tmp1.value, loc_index.value)
-                    final_pop = False
-                else:
-                    # must save the register loc_index before it is mutated
-                    mc.PUSH_r(loc_index.value)
-                    tmp1 = loc_index
-                    final_pop = True
-                # SHR tmp, card_page_shift
-                mc.SHR_ri(tmp1.value, descr.jit_wb_card_page_shift)
-                # XOR tmp, -8
-                mc.XOR_ri(tmp1.value, -8)
-                # BTS [loc_base], tmp
-                mc.BTS(addr_add_const(loc_base, 0), tmp1)
-                # done
-                if final_pop:
-                    mc.POP_r(loc_index.value)
-                #
-            elif isinstance(loc_index, ImmedLoc):
-                byte_index = loc_index.value >> descr.jit_wb_card_page_shift
-                byte_ofs = ~(byte_index >> 3)
-                byte_val = 1 << (byte_index & 7)
-                mc.OR8(addr_add_const(loc_base, byte_ofs), imm(byte_val))
-            else:
-                raise AssertionError("index is neither RegLoc nor ImmedLoc")
-            #
-            # patch the JNS above
-            mc.patch_forward_jump(jns_location)
-
-        # patch the JZ above
-        mc.patch_forward_jump(jz_location)
+        mc.TEST8(loc, imm(mask))
+        sp = self.WriteBarrierSlowPath(mc, rx86.Conditions['NZ'])
+        sp.loc_base = loc_base
+        sp.loc_index = loc_index
+        sp.helper_num = helper_num
+        sp.descr = descr
+        sp.set_continue_addr(mc)
+        self.pending_slowpaths.append(sp)
 
     def genop_discard_cond_call_gc_wb(self, op, arglocs):
         self._write_barrier_fastpath(self.mc, op.getdescr(), arglocs)
@@ -2373,37 +2421,66 @@
     def label(self):
         self._check_frame_depth_debug(self.mc)
 
+    class CondCallSlowPath(codebuf.SlowPath):
+        guard_token_no_exception = None
+
+        def generate_body(self, assembler, mc):
+            assembler.push_gcmap(mc, self.gcmap, store=True)
+            #
+            # first save away the 4 registers from
+            # 'cond_call_register_arguments' plus the register 'eax'
+            base_ofs = assembler.cpu.get_baseofs_of_frame_field()
+            should_be_saved = self.should_be_saved
+            restore_eax = False
+            for gpr in cond_call_register_arguments + [eax]:
+                if gpr not in should_be_saved or gpr is self.resloc:
+                    continue
+                v = gpr_reg_mgr_cls.all_reg_indexes[gpr.value]
+                mc.MOV_br(v * WORD + base_ofs, gpr.value)
+                if gpr is eax:
+                    restore_eax = True
+            #
+            # load the 0-to-4 arguments into these registers
+            from rpython.jit.backend.x86.jump import remap_frame_layout
+            arglocs = self.arglocs
+            remap_frame_layout(assembler, arglocs,
+                               cond_call_register_arguments[:len(arglocs)],
+                               X86_64_SCRATCH_REG if IS_X86_64 else None)
+            #
+            # load the constant address of the function to call into eax
+            mc.MOV(eax, self.imm_func)
+            #
+            # figure out which variant of cond_call_slowpath to call,
+            # and call it
+            cond_call_adr = assembler.cond_call_slowpath[self.variant_num]
+            mc.CALL(imm(follow_jump(cond_call_adr)))
+            # if this is a COND_CALL_VALUE, we need to move the result in place
+            resloc = self.resloc
+            if resloc is not None and resloc is not eax:
+                mc.MOV(resloc, eax)
+            # restoring the registers saved above, and doing pop_gcmap(), is
+            # left to the cond_call_slowpath helper.  We must only restore eax,
+            # if needed.
+            if restore_eax:
+                v = gpr_reg_mgr_cls.all_reg_indexes[eax.value]
+                mc.MOV_rb(eax.value, v * WORD + base_ofs)
+            #
+            # if needed, emit now the guard_no_exception
+            if self.guard_token_no_exception is not None:
+                assembler.generate_guard_no_exception(
+                             self.guard_token_no_exception)
+
     def cond_call(self, gcmap, imm_func, arglocs, resloc=None):
         assert self.guard_success_cc >= 0
-        j_location = self.mc.emit_forward_jump_cond(
-            rx86.invert_condition(self.guard_success_cc))
+        sp = self.CondCallSlowPath(self.mc, self.guard_success_cc)
+        sp.set_continue_addr(self.mc)
         self.guard_success_cc = rx86.cond_none
+        sp.gcmap = gcmap
+        sp.imm_func = imm_func
+        sp.arglocs = arglocs
+        sp.resloc = resloc
+        sp.should_be_saved = self._regalloc.rm.reg_bindings.values()
         #
-        self.push_gcmap(self.mc, gcmap, store=True)
-        #
-        # first save away the 4 registers from 'cond_call_register_arguments'
-        # plus the register 'eax'
-        base_ofs = self.cpu.get_baseofs_of_frame_field()
-        should_be_saved = self._regalloc.rm.reg_bindings.values()
-        restore_eax = False
-        for gpr in cond_call_register_arguments + [eax]:
-            if gpr not in should_be_saved or gpr is resloc:
-                continue
-            v = gpr_reg_mgr_cls.all_reg_indexes[gpr.value]
-            self.mc.MOV_br(v * WORD + base_ofs, gpr.value)
-            if gpr is eax:
-                restore_eax = True
-        #
-        # load the 0-to-4 arguments into these registers
-        from rpython.jit.backend.x86.jump import remap_frame_layout
-        remap_frame_layout(self, arglocs,
-                           cond_call_register_arguments[:len(arglocs)],
-                           X86_64_SCRATCH_REG if IS_X86_64 else None)
-        #
-        # load the constant address of the function to call into eax
-        self.mc.MOV(eax, imm_func)
-        #
-        # figure out which variant of cond_call_slowpath to call, and call it
         callee_only = False
         floats = False
         if self._regalloc is not None:
@@ -2414,34 +2491,25 @@
                 callee_only = True
             if self._regalloc.xrm.reg_bindings:
                 floats = True
-        cond_call_adr = self.cond_call_slowpath[floats * 2 + callee_only]
-        self.mc.CALL(imm(follow_jump(cond_call_adr)))
-        # if this is a COND_CALL_VALUE, we need to move the result in place
-        if resloc is not None and resloc is not eax:
-            self.mc.MOV(resloc, eax)
-        # restoring the registers saved above, and doing pop_gcmap(), is left
-        # to the cond_call_slowpath helper.  We must only restore eax, if
-        # needed.
-        if restore_eax:
-            v = gpr_reg_mgr_cls.all_reg_indexes[eax.value]
-            self.mc.MOV_rb(eax.value, v * WORD + base_ofs)
+        sp.variant_num = floats * 2 + callee_only
         #
-        self.mc.patch_forward_jump(j_location)
-        # might be overridden again to skip over the following
-        # guard_no_exception too
-        self.previous_cond_call_jcond = j_location
+        self.pending_slowpaths.append(sp)
+
+    class MallocCondSlowPath(codebuf.SlowPath):
+        def generate_body(self, assembler, mc):
+            assembler.push_gcmap(mc, self.gcmap, store=True)
+            mc.CALL(imm(follow_jump(assembler.malloc_slowpath)))
 
     def malloc_cond(self, nursery_free_adr, nursery_top_adr, size, gcmap):
         assert size & (WORD-1) == 0     # must be correctly aligned
         self.mc.MOV(ecx, heap(nursery_free_adr))
         self.mc.LEA_rm(edx.value, (ecx.value, size))
         self.mc.CMP(edx, heap(nursery_top_adr))
-        jna_location = self.mc.emit_forward_jump('NA')   # patched later
-        # save the gcmap
-        self.push_gcmap(self.mc, gcmap, store=True)
-        self.mc.CALL(imm(follow_jump(self.malloc_slowpath)))
-        self.mc.patch_forward_jump(jna_location)
+        sp = self.MallocCondSlowPath(self.mc, rx86.Conditions['A'])
+        sp.gcmap = gcmap
         self.mc.MOV(heap(nursery_free_adr), edx)
+        sp.set_continue_addr(self.mc)
+        self.pending_slowpaths.append(sp)
 
     def malloc_cond_varsize_frame(self, nursery_free_adr, nursery_top_adr,
                                   sizeloc, gcmap):
@@ -2454,12 +2522,31 @@
         else:
             self.mc.LEA_ra(edx.value, (ecx.value, sizeloc.value, 0, 0))
         self.mc.CMP(edx, heap(nursery_top_adr))
-        jna_location = self.mc.emit_forward_jump('NA')   # patched later
-        # save the gcmap
-        self.push_gcmap(self.mc, gcmap, store=True)
-        self.mc.CALL(imm(follow_jump(self.malloc_slowpath)))
-        self.mc.patch_forward_jump(jna_location)
+        sp = self.MallocCondSlowPath(self.mc, rx86.Conditions['A'])
+        sp.gcmap = gcmap
         self.mc.MOV(heap(nursery_free_adr), edx)
+        sp.set_continue_addr(self.mc)
+        self.pending_slowpaths.append(sp)
+
+    class MallocCondVarsizeSlowPath(codebuf.SlowPath):
+        def generate_body(self, assembler, mc):
+            # save the gcmap
+            assembler.push_gcmap(mc, self.gcmap, store=True)
+            kind = self.kind
+            if kind == rewrite.FLAG_ARRAY:
+                mc.MOV_si(WORD, self.itemsize)
+                mc.MOV_ri(ecx.value, self.arraydescr.tid)
+                addr = assembler.malloc_slowpath_varsize
+            else:
+                if kind == rewrite.FLAG_STR:
+                    addr = assembler.malloc_slowpath_str
+                else:
+                    assert kind == rewrite.FLAG_UNICODE
+                    addr = assembler.malloc_slowpath_unicode
+            lengthloc = self.lengthloc
+            assert lengthloc is not ecx and lengthloc is not edx
+            mc.MOV(edx, lengthloc)
+            mc.CALL(imm(follow_jump(addr)))
 
     def malloc_cond_varsize(self, kind, nursery_free_adr, nursery_top_adr,
                             lengthloc, itemsize, maxlength, gcmap,
@@ -2500,34 +2587,24 @@
         # now edx contains the total size in bytes, rounded up to a multiple
         # of WORD, plus nursery_free_adr
         self.mc.CMP(edx, heap(nursery_top_adr))
-        jna_location = self.mc.emit_forward_jump('NA')   # patched later
-        #
         self.mc.patch_forward_jump(ja_location)
-        # save the gcmap
-        self.push_gcmap(self.mc, gcmap, store=True)
-        if kind == rewrite.FLAG_ARRAY:
-            self.mc.MOV_si(WORD, itemsize)
-            self.mc.MOV(edx, lengthloc)
-            self.mc.MOV_ri(ecx.value, arraydescr.tid)
-            addr = self.malloc_slowpath_varsize
-        else:
-            if kind == rewrite.FLAG_STR:
-                addr = self.malloc_slowpath_str
-            else:
-                assert kind == rewrite.FLAG_UNICODE
-                addr = self.malloc_slowpath_unicode
-            self.mc.MOV(edx, lengthloc)
-        self.mc.CALL(imm(follow_jump(addr)))
-        jmp_location = self.mc.emit_forward_jump_uncond()  # jump to later
-        #
-        self.mc.patch_forward_jump(jna_location)
-        self.mc.force_frame_size(DEFAULT_FRAME_BYTES)
-        # write down the tid, but not if it's the result of the CALL
+        # Note: we call the slow path in condition 'A', which may be
+        # true either because the CMP just above really got that
+        # condition, or because we jumped here from ja_location before.
+        # In both cases, the jumps are forward-going and the expected
+        # common case is "not taken".
+        sp = self.MallocCondVarsizeSlowPath(self.mc, rx86.Conditions['A'])
+        sp.gcmap = gcmap
+        sp.kind = kind
+        sp.itemsize = itemsize
+        sp.lengthloc = lengthloc
+        sp.arraydescr = arraydescr
+        # some more code that is only if we *don't* call the slow
+        # path: write down the tid, and save edx into nursery_free_adr
         self.mc.MOV(mem(ecx, 0), imm(arraydescr.tid))
-        # while we're at it, this line is not needed if we've done the CALL
         self.mc.MOV(heap(nursery_free_adr), edx)
-        #
-        self.mc.patch_forward_jump(jmp_location)
+        sp.set_continue_addr(self.mc)
+        self.pending_slowpaths.append(sp)
 
     def store_force_descr(self, op, fail_locs, frame_depth):
         guard_token = self.implement_guard_recovery(op.opnum,
diff --git a/rpython/jit/backend/x86/callbuilder.py b/rpython/jit/backend/x86/callbuilder.py
--- a/rpython/jit/backend/x86/callbuilder.py
+++ b/rpython/jit/backend/x86/callbuilder.py
@@ -11,6 +11,7 @@
     r12, r13, r14, r15, X86_64_SCRATCH_REG, X86_64_XMM_SCRATCH_REG,
     RegLoc, RawEspLoc, RawEbpLoc, imm, ImmedLoc)
 from rpython.jit.backend.x86.jump import remap_frame_layout
+from rpython.jit.backend.x86 import codebuf
 from rpython.jit.backend.llsupport.callbuilder import AbstractCallBuilder
 from rpython.jit.backend.llsupport import llerrno
 from rpython.rtyper.lltypesystem import llmemory, rffi
@@ -239,7 +240,7 @@
             if IS_X86_32:
                 tmpreg = edx
             else:
-                tmpreg = r11     # edx is used for 3rd argument
+                tmpreg = r10                   # edx is used for 3rd argument
             mc.MOV_rm(tmpreg.value, (tlofsreg.value, p_errno))
             mc.MOV32_rm(eax.value, (tlofsreg.value, rpy_errno))
             mc.MOV32_mr((tmpreg.value, 0), eax.value)
@@ -293,6 +294,41 @@
             tlofsreg = self.get_tlofs_reg()    # => esi (possibly reused)
             mc.MOV32_mr((tlofsreg.value, lasterror), eax.value)
 
+    class ReacqGilSlowPath(codebuf.SlowPath):
+        early_jump_addr = 0
+
+        def generate_body(self, assembler, mc):
+            if self.early_jump_addr != 0:
+                # This slow-path has two entry points, with two
+                # conditional jumps.  We can jump to the regular start
+                # of this slow-path with the 2nd conditional jump.  Or,
+                # we can jump past the "MOV(heap(fastgil), ecx)"
+                # instruction from the 1st conditional jump.
+                # This instruction reverts the rpy_fastgil acquired
+                # previously, so that the general 'reacqgil_addr'
+                # function can acquire it again.  It must only be done
+                # if we actually succeeded in acquiring rpy_fastgil.
+                from rpython.jit.backend.x86.assembler import heap
+                mc.MOV(heap(self.fastgil), ecx)
+                offset = mc.get_relative_pos() - self.early_jump_addr
+                mc.overwrite32(self.early_jump_addr-4, offset)
+                # scratch register forgotten here, by get_relative_pos()
+
+            # call the reacqgil() function
+            cb = self.callbuilder
+            if not cb.result_value_saved_early:
+                cb.save_result_value(save_edx=False)
+            if assembler._is_asmgcc():
+                if IS_X86_32:
+                    css_value = edx
+                    old_value = ecx
+                    mc.MOV_sr(4, old_value.value)
+                    mc.MOV_sr(0, css_value.value)
+                # on X86_64, they are already in the right registers
+            mc.CALL(imm(follow_jump(assembler.reacqgil_addr)))
+            if not cb.result_value_saved_early:
+                cb.restore_result_value(save_edx=False)
+
     def move_real_result_and_call_reacqgil_addr(self, fastgil):
         from rpython.jit.backend.x86 import rx86
         #
@@ -314,8 +350,8 @@
                     if not self.result_value_saved_early:
                         mc.MOV_sr(12, edx.value)
                         restore_edx = True
-                css_value = edx
-                old_value = ecx
+                css_value = edx    # note: duplicated in ReacqGilSlowPath
+                old_value = ecx    #
             elif IS_X86_64:
                 css_value = edi
                 old_value = esi
@@ -341,35 +377,25 @@
             # thread.  So here we check if the shadowstack pointer
             # is still the same as before we released the GIL (saved
             # in 'ebx'), and if not, we fall back to 'reacqgil_addr'.
-            jne_location = mc.emit_forward_jump('NE')
+            mc.J_il(rx86.Conditions['NE'], 0xfffff)     # patched later
+            early_jump_addr = mc.get_relative_pos(break_basic_block=False)
+            # ^^^ this jump will go to almost the same place as the
+            # ReacqGilSlowPath() computes, but one instruction farther,
+            # i.e. just after the "MOV(heap(fastgil), ecx)".
+
             # here, ecx (=old_value) is zero (so rpy_fastgil was in 'released'
             # state before the XCHG, but the XCHG acquired it by writing 1)
             rst = gcrootmap.get_root_stack_top_addr()
             mc = self.mc
             mc.CMP(ebx, heap(rst))
-            je_location = mc.emit_forward_jump('E')
-            # revert the rpy_fastgil acquired above, so that the
-            # general 'reacqgil_addr' below can acquire it again...
-            mc.MOV(heap(fastgil), ecx)
-            # patch the JNE above
-            mc.patch_forward_jump(jne_location)
+            sp = self.ReacqGilSlowPath(mc, rx86.Conditions['NE'])
+            sp.early_jump_addr = early_jump_addr
+            sp.fastgil = fastgil
         else:
-            je_location = mc.emit_forward_jump('E')
-        #
-        # Yes, we need to call the reacqgil() function
-        if not self.result_value_saved_early:
-            self.save_result_value(save_edx=False)
-        if self.asm._is_asmgcc():
-            if IS_X86_32:
-                mc.MOV_sr(4, old_value.value)
-                mc.MOV_sr(0, css_value.value)
-            # on X86_64, they are already in the right registers
-        mc.CALL(imm(follow_jump(self.asm.reacqgil_addr)))
-        if not self.result_value_saved_early:
-            self.restore_result_value(save_edx=False)
-        #
-        # patch the JE above
-        mc.patch_forward_jump(je_location)
+            sp = self.ReacqGilSlowPath(mc, rx86.Conditions['NE'])
+        sp.callbuilder = self
+        sp.set_continue_addr(mc)
+        self.asm.pending_slowpaths.append(sp)
         #
         if restore_edx:
             mc.MOV_rs(edx.value, 12)   # restore this
diff --git a/rpython/jit/backend/x86/codebuf.py b/rpython/jit/backend/x86/codebuf.py
--- a/rpython/jit/backend/x86/codebuf.py
+++ b/rpython/jit/backend/x86/codebuf.py
@@ -42,10 +42,10 @@
         self.ops_offset = {}
 
     def add_pending_relocation(self):
-        self.relocations.append(self.get_relative_pos())
+        self.relocations.append(self.get_relative_pos(break_basic_block=False))
 
     def mark_op(self, op):
-        pos = self.get_relative_pos()
+        pos = self.get_relative_pos(break_basic_block=False)
         self.ops_offset[op] = pos
 
     def copy_to_raw_memory(self, addr):
@@ -64,11 +64,11 @@
 
     def emit_forward_jump_cond(self, cond):
         self.J_il8(cond, 0)
-        return self.get_relative_pos()
+        return self.get_relative_pos(break_basic_block=False)
 
     def emit_forward_jump_uncond(self):
         self.JMP_l8(0)
-        return self.get_relative_pos()
+        return self.get_relative_pos(break_basic_block=False)
 
     def patch_forward_jump(self, jcond_location):
         offset = self.get_relative_pos() - jcond_location
@@ -76,3 +76,38 @@
         if offset > 127:
             raise ShortJumpTooFar
         self.overwrite(jcond_location-1, chr(offset))
+
+    def get_relative_pos(self, break_basic_block=True):
+        if break_basic_block:
+            self.forget_scratch_register()
+        return BlockBuilderMixin.get_relative_pos(self)
+
+
+class SlowPath(object):
+    def __init__(self, mc, condition):
+        mc.J_il(condition, 0xfffff)     # patched later
+        self.cond_jump_addr = mc.get_relative_pos(break_basic_block=False)
+        self.saved_scratch_value_1 = mc.get_scratch_register_known_value()
+        self.frame_size = mc._frame_size
+
+    def set_continue_addr(self, mc):
+        self.continue_addr = mc.get_relative_pos(break_basic_block=False)
+        self.saved_scratch_value_2 = mc.get_scratch_register_known_value()
+        assert self.frame_size == mc._frame_size
+
+    def generate(self, assembler, mc):
+        # no alignment here, prefer compactness for these slow-paths.
+        # patch the original jump to go here
+        offset = mc.get_relative_pos() - self.cond_jump_addr
+        mc.overwrite32(self.cond_jump_addr-4, offset)
+        # restore the knowledge of the scratch register value
+        # (this does not emit any code)
+        mc.force_frame_size(self.frame_size)
+        mc.restore_scratch_register_known_value(self.saved_scratch_value_1)
+        # generate the body of the slow-path
+        self.generate_body(assembler, mc)
+        # reload (if needed) the (possibly different) scratch register value
+        mc.load_scratch_if_known(self.saved_scratch_value_2)
+        # jump back
+        curpos = mc.get_relative_pos() + 5
+        mc.JMP_l(self.continue_addr - curpos)
diff --git a/rpython/jit/backend/x86/jump.py b/rpython/jit/backend/x86/jump.py
--- a/rpython/jit/backend/x86/jump.py
+++ b/rpython/jit/backend/x86/jump.py
@@ -77,6 +77,7 @@
             assembler.regalloc_pop(dst)
             return
         assembler.regalloc_mov(src, tmpreg)
+        assembler.mc.forget_scratch_register()
         src = tmpreg
     assembler.regalloc_mov(src, dst)
 
diff --git a/rpython/jit/backend/x86/regalloc.py b/rpython/jit/backend/x86/regalloc.py
--- a/rpython/jit/backend/x86/regalloc.py
+++ b/rpython/jit/backend/x86/regalloc.py
@@ -435,9 +435,9 @@
 
     def consider_guard_not_invalidated(self, op):
         mc = self.assembler.mc
-        n = mc.get_relative_pos()
+        n = mc.get_relative_pos(break_basic_block=False)
         self.perform_guard(op, [], None)
-        assert n == mc.get_relative_pos()
+        assert n == mc.get_relative_pos(break_basic_block=False)
         # ensure that the next label is at least 5 bytes farther than
         # the current position.  Otherwise, when invalidating the guard,
         # we would overwrite randomly the next label's position.
diff --git a/rpython/jit/backend/x86/regloc.py b/rpython/jit/backend/x86/regloc.py
--- a/rpython/jit/backend/x86/regloc.py
+++ b/rpython/jit/backend/x86/regloc.py
@@ -4,7 +4,7 @@
 from rpython.jit.backend.x86.arch import WORD, IS_X86_32, IS_X86_64
 from rpython.tool.sourcetools import func_with_new_name
 from rpython.rlib.objectmodel import specialize, instantiate
-from rpython.rlib.rarithmetic import intmask
+from rpython.rlib.rarithmetic import intmask, r_uint
 from rpython.jit.metainterp.history import FLOAT, INT
 from rpython.jit.codewriter import longlong
 from rpython.rtyper.lltypesystem import rffi, lltype
@@ -355,7 +355,8 @@
 # without an xmm scratch reg.
 X86_64_XMM_SCRATCH_REG = xmm15
 
-unrolling_location_codes = unrolling_iterable(list("rbsmajix"))
+# note: 'r' is after 'i' in this list, for _binaryop()
+unrolling_location_codes = unrolling_iterable(list("irbsmajx"))
 
 @specialize.arg(1)
 def _rx86_getattr(obj, methname):
@@ -372,9 +373,7 @@
 class LocationCodeBuilder(object):
     _mixin_ = True
 
-    _reuse_scratch_register = False   # for now, this is always False
-    _scratch_register_known = False   # for now, this is always False
-    _scratch_register_value = 0
+    _scratch_register_value = -1    # -1 means 'unknown'
 
     def _binaryop(name):
 
@@ -383,7 +382,7 @@
             val2 = loc2.value_i()
             if name == 'MOV' and isinstance(loc1, RegLoc):
                 self.MOV_ri(loc1.value, val2)
-                return
+                return True
             code1 = loc1.location_code()
             if code1 == 'j':
                 checkvalue = loc1.value_j()
@@ -402,10 +401,11 @@
                 self.MOV_ri(freereg.value, val2)
                 INSN(self, loc1, freereg)
                 self.POP_r(freereg.value)
+                return True
             else:
                 # For this case, we should not need the scratch register more than here.
                 self._load_scratch(val2)
-                INSN(self, loc1, X86_64_SCRATCH_REG)
+                return False
 
         def invoke(self, codes, val1, val2):
             methname = name + "_" + codes
@@ -433,15 +433,15 @@
             code1 = loc1.location_code()
             code2 = loc2.location_code()
 
-            # You can pass in the scratch register as a location, but you
-            # must be careful not to combine it with location types that
-            # might need to use the scratch register themselves.
-            if loc2 is X86_64_SCRATCH_REG:
-                if code1 == 'j':
-                    assert (name.startswith("MOV") and
-                            rx86.fits_in_32bits(loc1.value_j()))
-            if loc1 is X86_64_SCRATCH_REG and not name.startswith("MOV"):
-                assert code2 not in ('j', 'i')
+            # You cannot pass in the scratch register as a location,
+            # except with a MOV instruction.
+            if name.startswith('MOV'):
+                if loc2 is X86_64_SCRATCH_REG:
+                    assert code1 != 'j' and code1 != 'm' and code1 != 'a'
+                if loc1 is X86_64_SCRATCH_REG:
+                    self.forget_scratch_register()
+            elif loc1 is X86_64_SCRATCH_REG or loc2 is X86_64_SCRATCH_REG:
+                raise AssertionError("%s with scratch reg specified" % name)
 
             for possible_code2 in unrolling_location_codes:
                 if not has_implementation_for('?', possible_code2):
@@ -451,8 +451,14 @@
                     #
                     # Fake out certain operations for x86_64
                     if self.WORD == 8 and possible_code2 == 'i' and not rx86.fits_in_32bits(val2):
-                        insn_with_64_bit_immediate(self, loc1, loc2)
-                        return
+                        if insn_with_64_bit_immediate(self, loc1, loc2):
+                            return      # done
+                        loc2 = X86_64_SCRATCH_REG
+                        code2 = 'r'
+                        # NB. unrolling_location_codes contains 'r'
+                        # after 'i', so that it will be found after
+                        # this iteration
+                        continue
                     #
                     # Regular case
                     for possible_code1 in unrolling_location_codes:
@@ -487,6 +493,9 @@
 
     def _unaryop(name):
         def INSN(self, loc):
+            if loc is X86_64_SCRATCH_REG:
+                raise AssertionError("%s with scratch reg specified" % name)
+
             code = loc.location_code()
             for possible_code in unrolling_location_codes:
                 if code == possible_code:
@@ -532,6 +541,9 @@
                     else:
                         methname = name + "_" + possible_code
                         _rx86_getattr(self, methname)(val)
+            # This is for CALL and JMP, so it's correct to forget
+            # the value of the R11 register here.
+            self.forget_scratch_register()
 
         return func_with_new_name(INSN, "INSN_" + name)
 
@@ -540,16 +552,18 @@
         # If we are within a "reuse_scratch_register" block, we remember the
         # last value we loaded to the scratch register and encode the address
         # as an offset from that if we can
-        if self._scratch_register_known:
-            offset = addr - self._scratch_register_value
+        if self._scratch_register_value != -1:
+            offset = r_uint(addr) - r_uint(self._scratch_register_value)
+            offset = intmask(offset)
             if rx86.fits_in_32bits(offset):
+                #print '_addr_as_reg_offset(%x) [REUSED r11+%d]' % (
+                #    addr, offset)
                 return (X86_64_SCRATCH_REG.value, offset)
+            #print '_addr_as_reg_offset(%x) [too far]' % (addr,)
             # else: fall through
-
-        if self._reuse_scratch_register:
-            self._scratch_register_known = True
-            self._scratch_register_value = addr
-
+        #else:
+        #    print '_addr_as_reg_offset(%x) [new]' % (addr,)
+        self._scratch_register_value = addr
         self.MOV_ri(X86_64_SCRATCH_REG.value, addr)
         return (X86_64_SCRATCH_REG.value, 0)
 
@@ -557,12 +571,10 @@
         # For cases where an AddressLoc has the location_code 'm', but
         # where the static offset does not fit in 32-bits.  We have to fall
         # back to the X86_64_SCRATCH_REG.  Returns a new location encoded
-        # as mode 'm' too.  These are all possibly rare cases; don't try
-        # to reuse a past value of the scratch register at all.
-        self._scratch_register_known = False
-        self.MOV_ri(X86_64_SCRATCH_REG.value, static_offset)
-        self.LEA_ra(X86_64_SCRATCH_REG.value,
-                    (basereg, X86_64_SCRATCH_REG.value, 0, 0))
+        # as mode 'm' too.  These are all possibly rare cases.
+        reg, ofs = self._addr_as_reg_offset(static_offset)
+        self.forget_scratch_register()
+        self.LEA_ra(X86_64_SCRATCH_REG.value, (basereg, reg, 0, ofs))
         return (X86_64_SCRATCH_REG.value, 0)
 
     def _fix_static_offset_64_a(self, (basereg, scalereg,
@@ -570,41 +582,59 @@
         # For cases where an AddressLoc has the location_code 'a', but
         # where the static offset does not fit in 32-bits.  We have to fall
         # back to the X86_64_SCRATCH_REG.  In one case it is even more
-        # annoying.  These are all possibly rare cases; don't try to reuse a
-        # past value of the scratch register at all.
-        self._scratch_register_known = False
-        self.MOV_ri(X86_64_SCRATCH_REG.value, static_offset)
+        # annoying.  These are all possibly rare cases.
+        reg, ofs = self._addr_as_reg_offset(static_offset)
         #
         if basereg != rx86.NO_BASE_REGISTER:
-            self.LEA_ra(X86_64_SCRATCH_REG.value,
-                        (basereg, X86_64_SCRATCH_REG.value, 0, 0))
-        return (X86_64_SCRATCH_REG.value, scalereg, scale, 0)
+            self.forget_scratch_register()
+            self.LEA_ra(X86_64_SCRATCH_REG.value, (basereg, reg, 0, ofs))
+            reg = X86_64_SCRATCH_REG.value
+            ofs = 0
+        return (reg, scalereg, scale, ofs)
 
     def _load_scratch(self, value):
-        if (self._scratch_register_known
-            and value == self._scratch_register_value):
-            return
-        if self._reuse_scratch_register:
-            self._scratch_register_known = True
-            self._scratch_register_value = value
+        if self._scratch_register_value != -1:
+            if self._scratch_register_value == value:
+                #print '_load_scratch(%x) [REUSED]' % (value,)
+                return
+            offset = r_uint(value) - r_uint(self._scratch_register_value)
+            offset = intmask(offset)
+            if rx86.fits_in_32bits(offset):
+                #print '_load_scratch(%x) [LEA r11+%d]' % (value, offset)
+                #global COUNT_
+                #try:
+                #    COUNT_ += 1
+                #except NameError:
+                #    COUNT_ = 1
+                #if COUNT_ % 182 == 0:
+                #    import pdb;pdb.set_trace()
+                self.LEA_rm(X86_64_SCRATCH_REG.value,
+                    (X86_64_SCRATCH_REG.value, offset))
+                self._scratch_register_value = value
+                return
+            #print '_load_scratch(%x) [too far]' % (value,)
+        #else:
+        #    print '_load_scratch(%x) [new]' % (value,)
+        self._scratch_register_value = value
         self.MOV_ri(X86_64_SCRATCH_REG.value, value)
 
+    def forget_scratch_register(self):
+        self._scratch_register_value = -1
+
+    def get_scratch_register_known_value(self):
+        return self._scratch_register_value
+
+    def restore_scratch_register_known_value(self, saved_value):
+        self._scratch_register_value = saved_value
+
+    def load_scratch_if_known(self, saved_value):
+        if saved_value != -1:
+            assert IS_X86_64
+            self._load_scratch(saved_value)
+
     def trap(self):
         self.INT3()
 
-    def begin_reuse_scratch_register(self):
-        # --NEVER CALLED (only from a specific test)--
-        # Flag the beginning of a block where it is okay to reuse the value
-        # of the scratch register. In theory we shouldn't have to do this if
-        # we were careful to mark all possible targets of a jump or call, and
-        # "forget" the value of the scratch register at those positions, but
-        # for now this seems safer.
-        self._reuse_scratch_register = True
-
-    def end_reuse_scratch_register(self):
-        self._reuse_scratch_register = False
-        self._scratch_register_known = False
-
     def _vector_size_choose(name):
         def invoke(self, suffix, val1, val2):
             methname = name + suffix
diff --git a/rpython/jit/backend/x86/test/test_jump.py b/rpython/jit/backend/x86/test/test_jump.py
--- a/rpython/jit/backend/x86/test/test_jump.py
+++ b/rpython/jit/backend/x86/test/test_jump.py
@@ -26,6 +26,11 @@
         assert isinstance(to_loc,   FrameLoc)
         self.ops.append(('immedmem2mem', from_loc, to_loc))
 
+    class mc:
+        @staticmethod
+        def forget_scratch_register():
+            pass
+
     def got(self, expected):
         print '------------------------ comparing ---------------------------'
         for op1, op2 in zip(self.ops, expected):
@@ -405,6 +410,10 @@
             print "pop", x
         def regalloc_immedmem2mem(self, x, y):
             print "?????????????????????????"
+        class mc:
+            @staticmethod
+            def forget_scratch_register():
+                pass
     def main():
         srclocs = [FrameLoc(9999, x, 'i') for x,y in CASE]
         dstlocs = [FrameLoc(9999, y, 'i') for x,y in CASE]
diff --git a/rpython/jit/backend/x86/test/test_regloc.py b/rpython/jit/backend/x86/test/test_regloc.py
--- a/rpython/jit/backend/x86/test/test_regloc.py
+++ b/rpython/jit/backend/x86/test/test_regloc.py
@@ -149,10 +149,8 @@
     def test_reuse_scratch_register(self):
         base_addr = intmask(0xFEDCBA9876543210)
         cb = LocationCodeBuilder64()
-        cb.begin_reuse_scratch_register()
         cb.MOV(ecx, heap(base_addr))
         cb.MOV(ecx, heap(base_addr + 8))
-        cb.end_reuse_scratch_register()
 
         expected_instructions = (
                 # mov r11, 0xFEDCBA9876543210
@@ -213,12 +211,9 @@
     def test_64bit_address_4(self):
         base_addr = intmask(0xFEDCBA9876543210)
         cb = LocationCodeBuilder64()
-        cb.begin_reuse_scratch_register()
-        assert cb._reuse_scratch_register is True
-        assert cb._scratch_register_known is False
+        assert cb._scratch_register_value == -1
         cb.MOV(ecx, AddressLoc(edx, esi, 2, base_addr))
-        assert cb._reuse_scratch_register is True
-        assert cb._scratch_register_known is False
+        assert cb._scratch_register_value == -1
         # this case is a CMP_ra
         #
         expected_instructions = (
diff --git a/rpython/jit/backend/x86/test/test_runner.py b/rpython/jit/backend/x86/test/test_runner.py
--- a/rpython/jit/backend/x86/test/test_runner.py
+++ b/rpython/jit/backend/x86/test/test_runner.py
@@ -39,7 +39,7 @@
                                  'nop; '    # for the label
                                  'add; test; je; jmp;')   # plus some padding
         bridge_loop_instructions = (
-            'cmp; jge; mov;( movabs;)? mov; mov(abs)?; call; mov(abs)?; jmp;')
+            'cmp; jl; mov(abs)?; jmp;')
 
     def get_cpu(self):
         cpu = CPU(rtyper=None, stats=FakeStats())
diff --git a/rpython/jit/backend/x86/vector_ext.py b/rpython/jit/backend/x86/vector_ext.py
--- a/rpython/jit/backend/x86/vector_ext.py
+++ b/rpython/jit/backend/x86/vector_ext.py
@@ -173,9 +173,10 @@
             return
         elif arg.type == INT:
             scratchloc = X86_64_SCRATCH_REG
+            self.mc.forget_scratch_register()
             self.mc.PEXTRQ_rxi(targetloc.value, accumloc.value, 0)
             self.mc.PEXTRQ_rxi(scratchloc.value, accumloc.value, 1)
-            self.mc.ADD(targetloc, scratchloc)
+            self.mc.ADD_rr(targetloc.value, scratchloc.value)
             return
 
         not_implemented("reduce sum for %s not impl." % arg)
@@ -387,6 +388,7 @@
             return # already the right size
         if size == 4 and tosize == 8:
             scratch = X86_64_SCRATCH_REG.value
+            self.mc.forget_scratch_register()
             self.mc.PEXTRD_rxi(scratch, srcloc.value, 1)
             self.mc.PINSRQ_xri(resloc.value, scratch, 1)
             self.mc.PEXTRD_rxi(scratch, srcloc.value, 0)
@@ -394,6 +396,7 @@

From pypy.commits at gmail.com  Mon Apr 17 15:17:00 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Mon, 17 Apr 2017 12:17:00 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Fix translation
Message-ID: <58f514ac.87371c0a.352b.a8cf@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91070:61b843dccbd8
Date: 2017-04-17 18:21 +0200
http://bitbucket.org/pypy/pypy/changeset/61b843dccbd8/

Log:	Fix translation

diff --git a/pypy/interpreter/astcompiler/symtable.py b/pypy/interpreter/astcompiler/symtable.py
--- a/pypy/interpreter/astcompiler/symtable.py
+++ b/pypy/interpreter/astcompiler/symtable.py
@@ -135,7 +135,7 @@
                 err = "no binding for nonlocal '%s' found" % (name,)
                 raise SyntaxError(err, self.lineno, self.col_offset)
             self.symbols[name] = SCOPE_FREE
-            self.free_vars[name] = None
+            self.free_vars.append(name)
             free[name] = None
             self.has_free = True
         elif flags & SYM_BOUND:
@@ -147,7 +147,7 @@
                 pass
         elif bound and name in bound:
             self.symbols[name] = SCOPE_FREE
-            self.free_vars[name] = None
+            self.free_vars.append(name)
             free[name] = None
             self.has_free = True
         elif name in globs:
@@ -204,7 +204,7 @@
             except KeyError:
                 if bound and name in bound:
                     self.symbols[name] = SCOPE_FREE
-                    self.free_vars[name] = None
+                    self.free_vars.append(name)
             else:
                 if role_here & (SYM_BOUND | SYM_GLOBAL) and \
                         self._hide_bound_from_nested_scopes:
@@ -213,7 +213,7 @@
                     # scope.  We add the name to the class scope's list of free
                     # vars, so it will be passed through by the interpreter, but
                     # we leave the scope alone, so it can be local on its own.
-                    self.free_vars[name] = None
+                    self.free_vars.append(name)
         self._check_optimization()
         free.update(new_free)
 

From pypy.commits at gmail.com  Mon Apr 17 15:17:02 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Mon, 17 Apr 2017 12:17:02 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Use our space.objects_in_repr() dict,
 instead of the decorator in reprlib.py which imports too many
 things.
Message-ID: <58f514ae.c791df0a.f8ac6.ebc9@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91071:6a485971d4fa
Date: 2017-04-17 18:46 +0200
http://bitbucket.org/pypy/pypy/changeset/6a485971d4fa/

Log:	Use our space.objects_in_repr() dict, instead of the decorator in
	reprlib.py which imports too many things.

diff --git a/lib_pypy/_pypy_collections.py b/lib_pypy/_pypy_collections.py
--- a/lib_pypy/_pypy_collections.py
+++ b/lib_pypy/_pypy_collections.py
@@ -1,6 +1,5 @@
-from __pypy__ import reversed_dict, move_to_end
+from __pypy__ import reversed_dict, move_to_end, objects_in_repr
 from _operator import eq as _eq
-from reprlib import recursive_repr as _recursive_repr
 import _collections_abc
 
 
@@ -44,12 +43,21 @@
         '''
         return move_to_end(self, key, last)
 
-    @_recursive_repr()
     def __repr__(self):
         'od.__repr__() <==> repr(od)'
         if not self:
             return '%s()' % (self.__class__.__name__,)
-        return '%s(%r)' % (self.__class__.__name__, list(self.items()))
+        currently_in_repr = objects_in_repr()
+        if self in currently_in_repr:
+            return '...'
+        currently_in_repr[self] = 1
+        try:
+            return '%s(%r)' % (self.__class__.__name__, list(self.items()))
+        finally:
+            try:
+                del currently_in_repr[self]
+            except:
+                pass
 
     def __reduce__(self):
         'Return state information for pickling'
diff --git a/pypy/module/__pypy__/__init__.py b/pypy/module/__pypy__/__init__.py
--- a/pypy/module/__pypy__/__init__.py
+++ b/pypy/module/__pypy__/__init__.py
@@ -67,6 +67,7 @@
     interpleveldefs = {
         'attach_gdb'                : 'interp_magic.attach_gdb',
         'internal_repr'             : 'interp_magic.internal_repr',
+        'objects_in_repr'           : 'interp_magic.objects_in_repr',
         'bytebuffer'                : 'bytebuffer.bytebuffer',
         'identity_dict'             : 'interp_identitydict.W_IdentityDict',
         'debug_start'               : 'interp_debug.debug_start',
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
@@ -15,6 +15,14 @@
 def internal_repr(space, w_object):
     return space.newtext('%r' % (w_object,))
 
+def objects_in_repr(space):
+    """The identitydict of objects currently being repr().
+
+    This object is thread-local and can be used in a __repr__ method
+    to avoid recursion.
+    """
+    return space.get_objects_in_repr()
+
 
 def attach_gdb(space):
     """Run an interp-level gdb (or pdb when untranslated)"""
diff --git a/pypy/module/_collections/test/test_ordereddict.py b/pypy/module/_collections/test/test_ordereddict.py
--- a/pypy/module/_collections/test/test_ordereddict.py
+++ b/pypy/module/_collections/test/test_ordereddict.py
@@ -6,3 +6,9 @@
         from _collections import OrderedDict
         assert issubclass(OrderedDict, dict)
         assert hasattr(OrderedDict, 'move_to_end')
+
+    def test_recursive_repr(self):
+        from _collections import OrderedDict
+        d = OrderedDict()
+        d[1] = d
+        assert repr(d) == 'OrderedDict([(1, ...)])'

From pypy.commits at gmail.com  Mon Apr 17 15:17:04 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Mon, 17 Apr 2017 12:17:04 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Try harder to reduce the number of
 modules imported at startup.
Message-ID: <58f514b0.8b121c0a.a58e3.9f7d@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91072:f2d2c66f439d
Date: 2017-04-17 21:14 +0200
http://bitbucket.org/pypy/pypy/changeset/f2d2c66f439d/

Log:	Try harder to reduce the number of modules imported at startup.

diff --git a/lib-python/3/site.py b/lib-python/3/site.py
--- a/lib-python/3/site.py
+++ b/lib-python/3/site.py
@@ -305,9 +305,7 @@
         seen.add(prefix)
 
         if is_pypy:
-            from distutils.sysconfig import get_python_lib
-            sitepackages.append(get_python_lib(standard_lib=False,
-                                               prefix=prefix))
+            sitepackages.append(os.path.join(prefix, "site-packages"))
         elif os.sep == '/':
             sitepackages.append(os.path.join(prefix, "lib",
                                         "python" + sys.version[:3],
diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py
--- a/lib_pypy/_sysconfigdata.py
+++ b/lib_pypy/_sysconfigdata.py
@@ -1,6 +1,6 @@
-import imp
+import _imp
 
-so_ext = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
+so_ext = _imp.extension_suffixes()[0]
 
 build_time_vars = {
     "EXT_SUFFIX": so_ext,

From pypy.commits at gmail.com  Mon Apr 17 15:17:06 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Mon, 17 Apr 2017 12:17:06 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Don't freeze operator.py,
 use _operator instead.
Message-ID: <58f514b2.9ba2df0a.f0784.746f@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91073:4a1ca556668a
Date: 2017-04-17 21:15 +0200
http://bitbucket.org/pypy/pypy/changeset/4a1ca556668a/

Log:	Don't freeze operator.py, use _operator instead.

diff --git a/pypy/objspace/std/sliceobject.py b/pypy/objspace/std/sliceobject.py
--- a/pypy/objspace/std/sliceobject.py
+++ b/pypy/objspace/std/sliceobject.py
@@ -253,7 +253,7 @@
 
 
 app = gateway.applevel("""
-    from operator import index
+    from _operator import index
 
     def evaluate_slice_index(x):
         try:

From pypy.commits at gmail.com  Mon Apr 17 16:13:37 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Mon, 17 Apr 2017 13:13:37 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Apply CPython rev 9180fb4eccc7: Raise our
 own SubprocessError rather than a RuntimeError
Message-ID: <58f521f1.0386df0a.5190b.152f@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91074:a402a0d7ee30
Date: 2017-04-17 21:35 +0200
http://bitbucket.org/pypy/pypy/changeset/a402a0d7ee30/

Log:	Apply CPython rev 9180fb4eccc7: Raise our own SubprocessError rather
	than a RuntimeError when dealing with odd rare errors coming from
	the subprocess module.

diff --git a/pypy/module/_posixsubprocess/_posixsubprocess.c b/pypy/module/_posixsubprocess/_posixsubprocess.c
--- a/pypy/module/_posixsubprocess/_posixsubprocess.c
+++ b/pypy/module/_posixsubprocess/_posixsubprocess.c
@@ -491,7 +491,7 @@
         /* We can't call strerror(saved_errno).  It is not async signal safe.
          * The parent process will look the error message up. */
     } else {
-        unused = write(errpipe_write, "RuntimeError:0:", 15);
+        unused = write(errpipe_write, "SubprocessError:0:", 18);
         unused = write(errpipe_write, err_msg, strlen(err_msg));
     }
     if (unused) return;  /* silly? yes! avoids gcc compiler warning. */

From pypy.commits at gmail.com  Mon Apr 17 16:13:40 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Mon, 17 Apr 2017 13:13:40 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Apply diffs from CPython, mainly:
Message-ID: <58f521f4.068edf0a.16c3.13a9@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91075:991de0b87cdc
Date: 2017-04-17 22:12 +0200
http://bitbucket.org/pypy/pypy/changeset/991de0b87cdc/

Log:	Apply diffs from CPython, mainly: CPython rev 5453b9c59cd7: On
	systems with a functioning /proc/self/fd or /dev/fd interface the
	max is now ignored and all fds are closed. CPython rev e54b23d7afa6:
	close() must not be retried when it fails with EINTR

	This fixes the remaining failures in test_subprocess

diff --git a/pypy/module/_posixsubprocess/_posixsubprocess.c b/pypy/module/_posixsubprocess/_posixsubprocess.c
--- a/pypy/module/_posixsubprocess/_posixsubprocess.c
+++ b/pypy/module/_posixsubprocess/_posixsubprocess.c
@@ -18,7 +18,19 @@
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
 #endif
+#if defined(HAVE_SYS_RESOURCE_H)
+#include <sys/resource.h>
+#endif
+#ifdef HAVE_DIRENT_H
 #include <dirent.h>
+#endif
+
+#if defined(__ANDROID__) && !defined(SYS_getdents64)
+/* Android doesn't expose syscalls, add the definition manually. */
+# include <sys/linux-syscalls.h>
+# define SYS_getdents64  __NR_getdents64
+#endif
+
 #include "_posixsubprocess.h"
 
 #if defined(sun)
@@ -38,11 +50,7 @@
 # define FD_DIR "/proc/self/fd"
 #endif
 
-#define POSIX_CALL(call)   if ((call) == -1) goto error
-
-
-/* Maximum file descriptor, initialized on module load. */
-static long max_fd;
+#define POSIX_CALL(call)   do { if ((call) == -1) goto error; } while (0)
 
 
 /* Convert ASCII to a positive int, no libc call. no overflow. -1 on error. */
@@ -75,7 +83,7 @@
     if (stat("/dev", &dev_stat) != 0)
         return 0;
     if (stat(FD_DIR, &dev_fd_stat) != 0)
-        return 0; 
+        return 0;
     if (dev_stat.st_dev == dev_fd_stat.st_dev)
         return 0;  /* / == /dev == /dev/fd means it is static. #fail */
     return 1;
@@ -130,15 +138,47 @@
 }
 
 
-/* Close all file descriptors in the range start_fd inclusive to
- * end_fd exclusive except for those in py_fds_to_keep.  If the
- * range defined by [start_fd, end_fd) is large this will take a
- * long time as it calls close() on EVERY possible fd.
+/* Get the maximum file descriptor that could be opened by this process.
+ * This function is async signal safe for use between fork() and exec().
+ */
+static long
+safe_get_max_fd(void)
+{
+    long local_max_fd;
+#if defined(__NetBSD__)
+    local_max_fd = fcntl(0, F_MAXFD);
+    if (local_max_fd >= 0)
+        return local_max_fd;
+#endif
+#if defined(HAVE_SYS_RESOURCE_H) && defined(__OpenBSD__)
+    struct rlimit rl;
+    /* Not on the POSIX async signal safe functions list but likely
+     * safe.  TODO - Someone should audit OpenBSD to make sure. */
+    if (getrlimit(RLIMIT_NOFILE, &rl) >= 0)
+        return (long) rl.rlim_max;
+#endif
+#ifdef _SC_OPEN_MAX
+    local_max_fd = sysconf(_SC_OPEN_MAX);
+    if (local_max_fd == -1)
+#endif
+        local_max_fd = 256;  /* Matches legacy Lib/subprocess.py behavior. */
+    return local_max_fd;
+}
+
+
+/* Close all file descriptors in the range from start_fd and higher
+ * except for those in py_fds_to_keep.  If the range defined by
+ * [start_fd, safe_get_max_fd()) is large this will take a long
+ * time as it calls close() on EVERY possible fd.
+ *
+ * It isn't possible to know for sure what the max fd to go up to
+ * is for processes with the capability of raising their maximum.
  */
 static void
-_close_fds_by_brute_force(int start_fd, int end_fd, long *py_fds_to_keep,
+_close_fds_by_brute_force(long start_fd, long *py_fds_to_keep,
 			  ssize_t num_fds_to_keep)
 {
+    long end_fd = safe_get_max_fd();
     ssize_t keep_seq_idx;
     int fd_num;
     /* As py_fds_to_keep is sorted we can loop through the list closing
@@ -148,13 +188,13 @@
         if (keep_fd < start_fd)
             continue;
         for (fd_num = start_fd; fd_num < keep_fd; ++fd_num) {
-            while (close(fd_num) < 0 && errno == EINTR);
+            close(fd_num);
         }
         start_fd = keep_fd + 1;
     }
     if (start_fd <= end_fd) {
         for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
-            while (close(fd_num) < 0 && errno == EINTR);
+            close(fd_num);
         }
     }
 }
@@ -175,8 +215,8 @@
    char           d_name[256];  /* Filename (null-terminated) */
 };
 
-/* Close all open file descriptors in the range start_fd inclusive to end_fd
- * exclusive. Do not close any in the sorted py_fds_to_keep list.
+/* Close all open file descriptors in the range from start_fd and higher
+ * Do not close any in the sorted py_fds_to_keep list.
  *
  * This version is async signal safe as it does not make any unsafe C library
  * calls, malloc calls or handle any locks.  It is _unfortunate_ to be forced
@@ -191,12 +231,10 @@
  * it with some cpp #define magic to work on other OSes as well if you want.
  */
 static void
-_close_open_fd_range_safe(int start_fd, int end_fd, long *py_fds_to_keep,
+_close_open_fds_safe(int start_fd, long *py_fds_to_keep,
 			  ssize_t num_fds_to_keep)
 {
     int fd_dir_fd;
-    if (start_fd >= end_fd)
-        return;
 #ifdef O_CLOEXEC
     fd_dir_fd = open(FD_DIR, O_RDONLY | O_CLOEXEC, 0);
 #else
@@ -211,8 +249,7 @@
 #endif
     if (fd_dir_fd == -1) {
         /* No way to get a list of open fds. */
-	_close_fds_by_brute_force(start_fd, end_fd, py_fds_to_keep,
-				  num_fds_to_keep);
+	_close_fds_by_brute_force(start_fd, py_fds_to_keep, num_fds_to_keep);
         return;
     } else {
         char buffer[sizeof(struct linux_dirent64)];
@@ -227,10 +264,10 @@
                 entry = (struct linux_dirent64 *)(buffer + offset);
                 if ((fd = _pos_int_from_ascii(entry->d_name)) < 0)
                     continue;  /* Not a number. */
-                if (fd != fd_dir_fd && fd >= start_fd && fd < end_fd &&
+                if (fd != fd_dir_fd && fd >= start_fd &&
                     !_is_fd_in_sorted_fd_sequence(
 			fd, py_fds_to_keep, num_fds_to_keep)) {
-                    while (close(fd) < 0 && errno == EINTR);
+                    close(fd);
                 }
             }
         }
@@ -238,13 +275,13 @@
     }
 }
 
-#define _close_open_fd_range _close_open_fd_range_safe
+#define _close_open_fds _close_open_fds_safe
 
 #else  /* NOT (defined(__linux__) && defined(HAVE_SYS_SYSCALL_H)) */
 
 
-/* Close all open file descriptors in the range start_fd inclusive to end_fd
- * exclusive. Do not close any in the sorted py_fds_to_keep list.
+/* Close all open file descriptors from start_fd and higher.
+ * Do not close any in the sorted py_fds_to_keep list.
  *
  * This function violates the strict use of async signal safe functions. :(
  * It calls opendir(), readdir() and closedir().  Of these, the one most
@@ -257,26 +294,21 @@
  *   http://womble.decadent.org.uk/readdir_r-advisory.html
  */
 static void
-_close_open_fd_range_maybe_unsafe(int start_fd, int end_fd,
-                                  long *py_fds_to_keep, ssize_t num_fds_to_keep)
+_close_open_fds_maybe_unsafe(long start_fd,
+			     long *py_fds_to_keep, ssize_t num_fds_to_keep)
 {
     DIR *proc_fd_dir;
 #ifndef HAVE_DIRFD
-    while (_is_fd_in_sorted_fd_sequence(start_fd, py_fds_to_keep, num_fds_to_keep) &&
-           (start_fd < end_fd)) {
+    while (_is_fd_in_sorted_fd_sequence(start_fd, py_fds_to_keep, num_fds_to_keep)) {
         ++start_fd;
     }
-    if (start_fd >= end_fd)
-        return;
     /* Close our lowest fd before we call opendir so that it is likely to
      * reuse that fd otherwise we might close opendir's file descriptor in
      * our loop.  This trick assumes that fd's are allocated on a lowest
      * available basis. */
-    while (close(start_fd) < 0 && errno == EINTR);
+    close(start_fd);
     ++start_fd;
 #endif
-    if (start_fd >= end_fd)
-        return;
 
 #if defined(__FreeBSD__)
     if (!_is_fdescfs_mounted_on_dev_fd())
@@ -286,7 +318,7 @@
         proc_fd_dir = opendir(FD_DIR);
     if (!proc_fd_dir) {
         /* No way to get a list of open fds. */
-        _close_fds_by_brute_force(start_fd, end_fd, py_fds_to_keep, num_fds_to_keep);
+        _close_fds_by_brute_force(start_fd, py_fds_to_keep, num_fds_to_keep);
     } else {
         struct dirent *dir_entry;
 #ifdef HAVE_DIRFD
@@ -299,22 +331,22 @@
             int fd;
             if ((fd = _pos_int_from_ascii(dir_entry->d_name)) < 0)
                 continue;  /* Not a number. */
-            if (fd != fd_used_by_opendir && fd >= start_fd && fd < end_fd &&
+            if (fd != fd_used_by_opendir && fd >= start_fd &&
                 !_is_fd_in_sorted_fd_sequence(fd, py_fds_to_keep, num_fds_to_keep)) {
-                while (close(fd) < 0 && errno == EINTR);
+                close(fd);
             }
             errno = 0;
         }
         if (errno) {
             /* readdir error, revert behavior. Highly Unlikely. */
             _close_fds_by_brute_force(
-		start_fd, end_fd, py_fds_to_keep, num_fds_to_keep);
+		start_fd, py_fds_to_keep, num_fds_to_keep);
         }
         closedir(proc_fd_dir);
     }
 }
 
-#define _close_open_fd_range _close_open_fd_range_maybe_unsafe
+#define _close_open_fds _close_open_fds_maybe_unsafe
 
 #endif  /* else NOT (defined(__linux__) && defined(HAVE_SYS_SYSCALL_H)) */
 
@@ -357,15 +389,12 @@
         goto error;
 
     /* Close parent's pipe ends. */
-    if (p2cwrite != -1) {
+    if (p2cwrite != -1)
         POSIX_CALL(close(p2cwrite));
-    }
-    if (c2pread != -1) {
+    if (c2pread != -1)
         POSIX_CALL(close(c2pread));
-    }
-    if (errread != -1) {
+    if (errread != -1)
         POSIX_CALL(close(errread));
-    }
     POSIX_CALL(close(errpipe_read));
 
     /* When duping fds, if there arises a situation where one of the fds is
@@ -401,15 +430,12 @@
 
     /* Close pipe fds.  Make sure we don't close the same fd more than */
     /* once, or standard fds. */
-    if (p2cread > 2) {
+    if (p2cread > 2)
         POSIX_CALL(close(p2cread));
-    }
-    if (c2pwrite > 2 && c2pwrite != p2cread) {
+    if (c2pwrite > 2 && c2pwrite != p2cread)
         POSIX_CALL(close(c2pwrite));
-    }
-    if (errwrite != c2pwrite && errwrite != p2cread && errwrite > 2) {
+    if (errwrite != c2pwrite && errwrite != p2cread && errwrite > 2)
         POSIX_CALL(close(errwrite));
-    }
 
     if (cwd)
         POSIX_CALL(chdir(cwd));
@@ -441,14 +467,8 @@
 
     /* close FDs after executing preexec_fn, which might open FDs */
     if (close_fds) {
-        int local_max_fd = max_fd;
-#if defined(__NetBSD__)
-        local_max_fd = fcntl(0, F_MAXFD);
-        if (local_max_fd < 0)
-            local_max_fd = max_fd;
-#endif
         /* TODO HP-UX could use pstat_getproc() if anyone cares about it. */
-        _close_open_fd_range(3, local_max_fd, py_fds_to_keep, num_fds_to_keep);
+        _close_open_fds(3, py_fds_to_keep, num_fds_to_keep);
     }
 
     /* This loop matches the Lib/os.py _execvpe()'s PATH search when */
@@ -579,9 +599,4 @@
 void
 pypy_subprocess_init(void)
 {
-#ifdef _SC_OPEN_MAX
-    max_fd = sysconf(_SC_OPEN_MAX);
-    if (max_fd == -1)
-#endif
-        max_fd = 256;  /* Matches Lib/subprocess.py */
 }

From pypy.commits at gmail.com  Mon Apr 17 16:25:50 2017
From: pypy.commits at gmail.com (arigo)
Date: Mon, 17 Apr 2017 13:25:50 -0700 (PDT)
Subject: [pypy-commit] pypy default: Avoid freezing
 lib-python/2.7/__future__.py
Message-ID: <58f524ce.cd90df0a.1af79.b096@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91076:3ac7b22f8ffa
Date: 2017-04-17 22:25 +0200
http://bitbucket.org/pypy/pypy/changeset/3ac7b22f8ffa/

Log:	Avoid freezing lib-python/2.7/__future__.py

diff --git a/pypy/module/__builtin__/app_functional.py b/pypy/module/__builtin__/app_functional.py
--- a/pypy/module/__builtin__/app_functional.py
+++ b/pypy/module/__builtin__/app_functional.py
@@ -2,7 +2,6 @@
 Plain Python definition of the builtin functions oriented towards
 functional programming.
 """
-from __future__ import with_statement
 import operator
 from __pypy__ import resizelist_hint, newlist_hint
 from __pypy__ import specialized_zip_2_lists

From pypy.commits at gmail.com  Mon Apr 17 16:37:08 2017
From: pypy.commits at gmail.com (mattip)
Date: Mon, 17 Apr 2017 13:37:08 -0700 (PDT)
Subject: [pypy-commit] pypy default: a passing test for issue #2482,
 but perhaps we should support PyBaseObject_Type too?
Message-ID: <58f52774.3797df0a.ce750.0d4b@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r91077:8175c5e20480
Date: 2017-04-17 23:34 +0300
http://bitbucket.org/pypy/pypy/changeset/8175c5e20480/

Log:	a passing test for issue #2482, but perhaps we should support
	PyBaseObject_Type too?

diff --git a/pypy/module/cpyext/test/issue2482.c b/pypy/module/cpyext/test/issue2482.c
new file mode 100644
--- /dev/null
+++ b/pypy/module/cpyext/test/issue2482.c
@@ -0,0 +1,107 @@
+
+#include "Python.h"
+//#define ISSUE_2482
+
+typedef struct {
+    PyObject_HEAD
+    // Some extra storage:
+    char blank[500];
+} instance;
+
+static PyObject * get_basicsize(PyObject *self, PyObject * arg)
+{
+    return PyLong_FromLong(((PyTypeObject*)arg)->tp_basicsize);
+}
+
+const char *name = "issue2482_object";
+static
+PyObject *make_object_base_type(void) {
+
+    PyHeapTypeObject *heap_type = (PyHeapTypeObject *) PyType_Type.tp_alloc(&PyType_Type, 0);
+    if (!heap_type) return NULL;
+
+    PyTypeObject *type = &heap_type->ht_type;
+    type->tp_name = name;
+#ifdef ISSUE_2482
+    type->tp_base = &PyBaseObject_Type; /*fails */
+#else 
+    type->tp_base = &PyType_Type;
+#endif
+    type->tp_basicsize = sizeof(instance);
+    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
+
+    if (PyType_Ready(type) < 0)
+        return NULL;
+
+    return (PyObject *) heap_type;
+};
+
+static PyMethodDef issue2482_functions[] = {
+    {"get_basicsize", (PyCFunction)get_basicsize, METH_O, NULL},
+    {NULL,        NULL}    /* Sentinel */
+};
+
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef moduledef = {
+    PyModuleDef_HEAD_INIT,
+    "issue2482",
+    "Module Doc",
+    -1,
+    issue2482_functions, 
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+};
+#define INITERROR return NULL
+
+/* Initialize this module. */
+#ifdef __GNUC__
+extern __attribute__((visibility("default")))
+#else
+extern __declspec(dllexport)
+#endif
+
+PyMODINIT_FUNC
+PyInit_issue2482(void)
+
+#else
+
+#define INITERROR return
+
+/* Initialize this module. */
+#ifdef __GNUC__
+extern __attribute__((visibility("default")))
+#else
+extern __declspec(dllexport)
+#endif
+
+PyMODINIT_FUNC
+initissue2482(void)
+#endif
+{
+#if PY_MAJOR_VERSION >= 3
+    PyObject *module = PyModule_Create(&moduledef);
+#else
+    PyObject *module = Py_InitModule("issue2482", issue2482_functions);
+#endif
+    if (module == NULL)
+        INITERROR;
+
+    PyHeapTypeObject *heap_type = (PyHeapTypeObject *) PyType_Type.tp_alloc(&PyType_Type, 0);
+    if (!heap_type) INITERROR;
+
+    PyTypeObject *type = &heap_type->ht_type;
+    type->tp_name = name;
+
+    PyObject *base = make_object_base_type();
+    if (! base) INITERROR;
+    Py_INCREF(base);
+    type->tp_base = (PyTypeObject *) base;
+    type->tp_basicsize = ((PyTypeObject *) base)->tp_basicsize;
+    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE | Py_TPFLAGS_CHECKTYPES;
+
+    if (PyType_Ready(type) < 0) INITERROR;
+
+    PyModule_AddObject(module, name, (PyObject *) type);
+};
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -1256,3 +1256,27 @@
         # doesn't call tp_getattr at all, also on CPython
         raises(AttributeError, type(module.gettype1).__getattribute__,
                                module.gettype1, 'dcBA')
+
+    def test_multiple_inheritance_tp_basicsize(self):
+        module = self.import_module(name='issue2482')
+
+        class PyBase(object):
+            pass
+
+        basesize = module.get_basicsize(PyBase)
+
+        CBase = module.issue2482_object
+        class A(CBase, PyBase):
+            def __init__(self, i):
+                CBase.__init__(self)
+                PyBase.__init__(self)
+
+        class B(PyBase, CBase):
+            def __init__(self, i):
+                PyBase.__init__(self)
+                CBase.__init__(self)
+
+        Asize = module.get_basicsize(A)
+        Bsize = module.get_basicsize(B)
+        assert Asize == Bsize
+        assert Asize > basesize

From pypy.commits at gmail.com  Tue Apr 18 03:48:54 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Tue, 18 Apr 2017 00:48:54 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Attempt to fix 'nonlocal' in class scopes.
Message-ID: <58f5c4e6.87371c0a.352b.473c@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91078:785e75435a92
Date: 2017-04-18 09:48 +0200
http://bitbucket.org/pypy/pypy/changeset/785e75435a92/

Log:	Attempt to fix 'nonlocal' in class scopes. test_scope and test_super
	are passing again.

diff --git a/pypy/interpreter/astcompiler/symtable.py b/pypy/interpreter/astcompiler/symtable.py
--- a/pypy/interpreter/astcompiler/symtable.py
+++ b/pypy/interpreter/astcompiler/symtable.py
@@ -135,7 +135,8 @@
                 err = "no binding for nonlocal '%s' found" % (name,)
                 raise SyntaxError(err, self.lineno, self.col_offset)
             self.symbols[name] = SCOPE_FREE
-            self.free_vars.append(name)
+            if not self._hide_bound_from_nested_scopes:
+                self.free_vars.append(name)
             free[name] = None
             self.has_free = True
         elif flags & SYM_BOUND:

From pypy.commits at gmail.com  Tue Apr 18 09:16:27 2017
From: pypy.commits at gmail.com (danchr)
Date: Tue, 18 Apr 2017 06:16:27 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5-mac-translate: Add checks for
 posix_fadvise() and posix_fallocate()
Message-ID: <58f611ab.8a841c0a.2f3b2.c441@mx.google.com>

Author: Dan Villiom Podlaski Christiansen <dan at magenta.dk>
Branch: py3.5-mac-translate
Changeset: r91079:4e08bb45b11b
Date: 2017-04-18 12:55 +0200
http://bitbucket.org/pypy/pypy/changeset/4e08bb45b11b/

Log:	Add checks for posix_fadvise() and posix_fallocate()

	macOS Sierra does not define these, and CPython 3.5 does not include
	them in its 'posix' module. Without this, translation on my Mac
	fails with an assertion failure when posix_fadvise() exists but the
	constants do not.

diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -255,18 +255,14 @@
     PRIO_PROCESS = rffi_platform.DefinedConstantInteger('PRIO_PROCESS')
     PRIO_PGRP = rffi_platform.DefinedConstantInteger('PRIO_PGRP')
     PRIO_USER = rffi_platform.DefinedConstantInteger('PRIO_USER')
-    POSIX_FADV_WILLNEED = rffi_platform.DefinedConstantInteger('POSIX_FADV_WILLNEED')
-    POSIX_FADV_NORMAL = rffi_platform.DefinedConstantInteger('POSIX_FADV_NORMAL')
-    POSIX_FADV_SEQUENTIAL = rffi_platform.DefinedConstantInteger('POSIX_FADV_SEQUENTIAL')
-    POSIX_FADV_RANDOM= rffi_platform.DefinedConstantInteger('POSIX_FADV_RANDOM')
-    POSIX_FADV_NOREUSE = rffi_platform.DefinedConstantInteger('POSIX_FADV_NOREUSE')
-    POSIX_FADV_DONTNEED = rffi_platform.DefinedConstantInteger('POSIX_FADV_DONTNEED')
     O_NONBLOCK = rffi_platform.DefinedConstantInteger('O_NONBLOCK')
     OFF_T = rffi_platform.SimpleType('off_t')
     OFF_T_SIZE = rffi_platform.SizeOf('off_t')
 
     HAVE_UTIMES = rffi_platform.Has('utimes')
     HAVE_D_TYPE = rffi_platform.Has('DT_UNKNOWN')
+    HAVE_FALLOCATE = rffi_platform.Has('posix_fallocate')
+    HAVE_FADVISE = rffi_platform.Has('posix_fadvise')
     UTIMBUF = rffi_platform.Struct('struct %sutimbuf' % UNDERSCORE_ON_WIN32,
                                    [('actime', rffi.INT),
                                     ('modtime', rffi.INT)])
@@ -496,22 +492,37 @@
         with rffi.scoped_nonmovingbuffer(data) as buf:
             return handle_posix_error('pwrite', c_pwrite(fd, buf, count, offset))
 
-    c_posix_fallocate = external('posix_fallocate',
-                      [rffi.INT, OFF_T, OFF_T], rffi.INT,
-                      save_err=rffi.RFFI_SAVE_ERRNO)
-    c_posix_fadvise = external('posix_fadvise',
-                       [rffi.INT, OFF_T, OFF_T, rffi.INT], rffi.INT,
-                       save_err=rffi.RFFI_SAVE_ERRNO)
+    if HAVE_FALLOCATE:
+        c_posix_fallocate = external('posix_fallocate',
+                                     [rffi.INT, OFF_T, OFF_T], rffi.INT,
+                                     save_err=rffi.RFFI_SAVE_ERRNO)
 
-    @enforceargs(int, None, None)
-    def posix_fallocate(fd, offset, length):
-        validate_fd(fd)
-        return handle_posix_error('posix_fallocate', c_posix_fallocate(fd, offset, length))
+        @enforceargs(int, None, None)
+        def posix_fallocate(fd, offset, length):
+            validate_fd(fd)
+            return handle_posix_error('posix_fallocate', c_posix_fallocate(fd, offset, length))
 
-    @enforceargs(int, None, None, int)
-    def posix_fadvise(fd, offset, length, advice):
-        validate_fd(fd)
-        return handle_posix_error('posix_fadvise', c_posix_fadvise(fd, offset, length, advice))
+    if HAVE_FADVISE:
+        class CConfig:
+            _compilation_info_ = eci
+            POSIX_FADV_WILLNEED = rffi_platform.DefinedConstantInteger('POSIX_FADV_WILLNEED')
+            POSIX_FADV_NORMAL = rffi_platform.DefinedConstantInteger('POSIX_FADV_NORMAL')
+            POSIX_FADV_SEQUENTIAL = rffi_platform.DefinedConstantInteger('POSIX_FADV_SEQUENTIAL')
+            POSIX_FADV_RANDOM= rffi_platform.DefinedConstantInteger('POSIX_FADV_RANDOM')
+            POSIX_FADV_NOREUSE = rffi_platform.DefinedConstantInteger('POSIX_FADV_NOREUSE')
+            POSIX_FADV_DONTNEED = rffi_platform.DefinedConstantInteger('POSIX_FADV_DONTNEED')
+
+        config = rffi_platform.configure(CConfig)
+        globals().update(config)
+
+        c_posix_fadvise = external('posix_fadvise',
+                                   [rffi.INT, OFF_T, OFF_T, rffi.INT], rffi.INT,
+                                   save_err=rffi.RFFI_SAVE_ERRNO)
+
+        @enforceargs(int, None, None, int)
+        def posix_fadvise(fd, offset, length, advice):
+            validate_fd(fd)
+            return handle_posix_error('posix_fadvise', c_posix_fadvise(fd, offset, length, advice))
 
 c_ftruncate = external('ftruncate', [rffi.INT, rffi.LONGLONG], rffi.INT,
                        macro=_MACRO_ON_POSIX, save_err=rffi.RFFI_SAVE_ERRNO)

From pypy.commits at gmail.com  Tue Apr 18 09:16:30 2017
From: pypy.commits at gmail.com (danchr)
Date: Tue, 18 Apr 2017 06:16:30 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5-mac-translate: Add check for HAVE_DIRENT_H
Message-ID: <58f611ae.53341c0a.2aa07.01c7@mx.google.com>

Author: Dan Villiom Podlaski Christiansen <dan at magenta.dk>
Branch: py3.5-mac-translate
Changeset: r91080:b66e14493a7b
Date: 2017-04-18 12:57 +0200
http://bitbucket.org/pypy/pypy/changeset/b66e14493a7b/

Log:	Add check for HAVE_DIRENT_H

	_posixsubprocess.c uses this symbol to optionally include the
	header, but there's no logic for actually defining it. As the 'DIR'
	structure is defined in 'dirent.h' on macOS, C-source compilation
	fails without it.

diff --git a/pypy/module/_posixsubprocess/interp_subprocess.py b/pypy/module/_posixsubprocess/interp_subprocess.py
--- a/pypy/module/_posixsubprocess/interp_subprocess.py
+++ b/pypy/module/_posixsubprocess/interp_subprocess.py
@@ -36,6 +36,15 @@
 if config['HAVE_SETSID']:
     compile_extra.append("-DHAVE_SETSID")
 
+class CConfig:
+    _compilation_info_ = ExternalCompilationInfo(includes=['dirent.h'])
+    HAVE_DIRENT_H = platform.Has("opendir")
+
+config = platform.configure(CConfig)
+
+if config['HAVE_DIRENT_H']:
+    compile_extra.append("-DHAVE_DIRENT_H")
+
 eci = eci.merge(
     rposix.eci_inheritable,
     ExternalCompilationInfo(

From pypy.commits at gmail.com  Tue Apr 18 13:24:09 2017
From: pypy.commits at gmail.com (rlamy)
Date: Tue, 18 Apr 2017 10:24:09 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: fix test
Message-ID: <58f64bb9.d7dd1c0a.916e.12c2@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91081:3b48e100aaba
Date: 2017-04-18 18:23 +0100
http://bitbucket.org/pypy/pypy/changeset/3b48e100aaba/

Log:	fix test

diff --git a/pypy/module/cpyext/test/test_memoryobject.py b/pypy/module/cpyext/test/test_memoryobject.py
--- a/pypy/module/cpyext/test/test_memoryobject.py
+++ b/pypy/module/cpyext/test/test_memoryobject.py
@@ -3,7 +3,7 @@
 from rpython.rtyper.lltypesystem import rffi
 from pypy.module.cpyext.test.test_api import BaseApiTest
 from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
-from pypy.interpreter.buffer import StringBuffer
+from pypy.interpreter.buffer import SimpleBuffer, StringBuffer
 from pypy.module.cpyext.pyobject import from_ref
 from pypy.module.cpyext.memoryobject import PyMemoryViewObject
 
@@ -11,7 +11,7 @@
 
 class TestMemoryViewObject(BaseApiTest):
     def test_frombuffer(self, space, api):
-        w_buf = space.newbuffer(StringBuffer("hello"))
+        w_buf = space.newbuffer(SimpleBuffer(StringBuffer("hello")))
         c_memoryview = rffi.cast(
             PyMemoryViewObject, api.PyMemoryView_FromObject(w_buf))
         w_memoryview = from_ref(space, c_memoryview)

From pypy.commits at gmail.com  Tue Apr 18 17:03:12 2017
From: pypy.commits at gmail.com (mattip)
Date: Tue, 18 Apr 2017 14:03:12 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: document branch
Message-ID: <58f67f10.8fa91c0a.6734c.5346@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.5
Changeset: r91084:3e391513b23c
Date: 2017-04-19 00:02 +0300
http://bitbucket.org/pypy/pypy/changeset/3e391513b23c/

Log:	document branch

diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -18,3 +18,6 @@
 
 Implement posix.posix_fallocate() and posix.posix_fadvise()
 
+.. branch: py3.5-mac-translate
+
+Fix for different posix primitives on MacOS

From pypy.commits at gmail.com  Tue Apr 18 18:55:28 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Tue, 18 Apr 2017 15:55:28 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: CPython Issue #21057: TextIOWrapper now
 allows the underlying binary stream's read() or read1() method to return an
 arbitrary bytes-like object
Message-ID: <58f69960.555e1c0a.cf909.6aa8@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91085:77139bab65b2
Date: 2017-04-18 17:49 +0200
http://bitbucket.org/pypy/pypy/changeset/77139bab65b2/

Log:	CPython Issue #21057: TextIOWrapper now allows the underlying binary
	stream's read() or read1() method to return an arbitrary bytes-like
	object (such as a memoryview).

diff --git a/pypy/module/_io/interp_textio.py b/pypy/module/_io/interp_textio.py
--- a/pypy/module/_io/interp_textio.py
+++ b/pypy/module/_io/interp_textio.py
@@ -1,6 +1,6 @@
 import sys
 
-from pypy.interpreter.baseobjspace import W_Root
+from pypy.interpreter.baseobjspace import W_Root, BufferInterfaceNotFound
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.gateway import WrappedDefault, interp2app, unwrap_spec
 from pypy.interpreter.typedef import (
@@ -584,6 +584,10 @@
             # Given this, we know there was a valid snapshot point
             # len(dec_buffer) bytes ago with decoder state (b'', dec_flags).
             w_dec_buffer, w_dec_flags = space.unpackiterable(w_state, 2)
+            if not space.isinstance_w(w_dec_buffer, space.w_bytes):
+                msg = "decoder getstate() should have returned a bytes " \
+                      "object not '%T'"
+                raise oefmt(space.w_TypeError, msg, w_dec_buffer)
             dec_buffer = space.bytes_w(w_dec_buffer)
             dec_flags = space.int_w(w_dec_flags)
         else:
@@ -591,16 +595,18 @@
             dec_flags = 0
 
         # Read a chunk, decode it, and put the result in self._decoded_chars
-        w_input = space.call_method(self.w_buffer,
-                                    "read1" if self.has_read1 else "read",
+        func_name = "read1" if self.has_read1 else "read"
+        w_input = space.call_method(self.w_buffer, func_name,
                                     space.newint(self.chunk_size))
 
-        if not space.isinstance_w(w_input, space.w_bytes):
-            msg = "decoder getstate() should have returned a bytes " \
-                  "object not '%T'"
-            raise oefmt(space.w_TypeError, msg, w_input)
+        try:
+            input_buf = w_input.buffer_w(space, space.BUF_SIMPLE)
+        except BufferInterfaceNotFound:
+            msg = ("underlying %s() should have returned a bytes-like "
+                   "object, not '%T'")
+            raise oefmt(space.w_TypeError, msg, func_name, w_input)
 
-        eof = space.len_w(w_input) == 0
+        eof = input_buf.getlength() == 0
         w_decoded = space.call_method(self.w_decoder, "decode",
                                       w_input, space.newbool(eof))
         check_decoded(space, w_decoded)
@@ -611,7 +617,7 @@
         if self.telling:
             # At the snapshot point, len(dec_buffer) bytes before the read,
             # the next input to be decoded is dec_buffer + input_chunk.
-            next_input = dec_buffer + space.bytes_w(w_input)
+            next_input = dec_buffer + input_buf.as_str()
             self.snapshot = PositionSnapshot(dec_flags, next_input)
 
         return not eof
diff --git a/pypy/module/_io/test/test_textio.py b/pypy/module/_io/test/test_textio.py
--- a/pypy/module/_io/test/test_textio.py
+++ b/pypy/module/_io/test/test_textio.py
@@ -1,5 +1,5 @@
 class AppTestTextIO:
-    spaceconfig = dict(usemodules=['_io', '_locale'])
+    spaceconfig = dict(usemodules=['_io', '_locale', 'array'])
 
     def setup_class(cls):
         from rpython.rlib.rarithmetic import INT_MAX, UINT_MAX
@@ -381,6 +381,38 @@
         t = _io.TextIOWrapper(NonbytesStream(u'a'))
         raises(TypeError, t.read)
 
+    def test_read_byteslike(self):
+        import _io as io
+        import array
+
+        class MemviewBytesIO(io.BytesIO):
+            '''A BytesIO object whose read method returns memoryviews
+               rather than bytes'''
+
+            def read1(self, len_):
+                return _to_memoryview(super().read1(len_))
+
+            def read(self, len_):
+                return _to_memoryview(super().read(len_))
+
+        def _to_memoryview(buf):
+            '''Convert bytes-object *buf* to a non-trivial memoryview'''
+
+            arr = array.array('i')
+            idx = len(buf) - len(buf) % arr.itemsize
+            arr.frombytes(buf[:idx])
+            return memoryview(arr)
+
+        r = MemviewBytesIO(b'Just some random string\n')
+        t = io.TextIOWrapper(r, 'utf-8')
+
+        # TextIOwrapper will not read the full string, because
+        # we truncate it to a multiple of the native int size
+        # so that we can construct a more complex memoryview.
+        bytes_val =  _to_memoryview(r.getvalue()).tobytes()
+
+        assert t.read(200) == bytes_val.decode('utf-8')
+
     def test_device_encoding(self):
         import os
         import sys

From pypy.commits at gmail.com  Tue Apr 18 18:55:30 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Tue, 18 Apr 2017 15:55:30 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Python Issue #21310: Fixed possible
 resource leak in failed open()
Message-ID: <58f69962.6e8fdf0a.cab8e.3cf9@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91086:af84269c028b
Date: 2017-04-18 18:37 +0200
http://bitbucket.org/pypy/pypy/changeset/af84269c028b/

Log:	Python Issue #21310: Fixed possible resource leak in failed open()

diff --git a/pypy/module/_io/interp_io.py b/pypy/module/_io/interp_io.py
--- a/pypy/module/_io/interp_io.py
+++ b/pypy/module/_io/interp_io.py
@@ -86,46 +86,61 @@
     if binary and newline is not None:
         raise oefmt(space.w_ValueError,
                     "binary mode doesn't take a newline argument")
-    w_raw = space.call_function(
-        space.gettypefor(W_FileIO), w_file, space.newtext(rawmode),
-        space.newbool(bool(closefd)), w_opener)
 
-    isatty = space.is_true(space.call_method(w_raw, "isatty"))
-    line_buffering = buffering == 1 or (buffering < 0 and isatty)
-    if line_buffering:
-        buffering = -1
+    w_result = None
+    try:
+        w_raw = space.call_function(
+            space.gettypefor(W_FileIO), w_file, space.newtext(rawmode),
+            space.newbool(bool(closefd)), w_opener)
+        w_result = w_raw
 
-    if buffering < 0:
-        buffering = space.c_int_w(space.getattr(w_raw, space.newtext("_blksize")))
+        isatty = space.is_true(space.call_method(w_raw, "isatty"))
+        line_buffering = buffering == 1 or (buffering < 0 and isatty)
+        if line_buffering:
+            buffering = -1
 
-    if buffering < 0:
-        raise oefmt(space.w_ValueError, "invalid buffering size")
+        if buffering < 0:
+            buffering = space.c_int_w(space.getattr(
+                w_raw, space.newtext("_blksize")))
 
-    if buffering == 0:
-        if not binary:
-            raise oefmt(space.w_ValueError, "can't have unbuffered text I/O")
-        return w_raw
+        if buffering < 0:
+            raise oefmt(space.w_ValueError, "invalid buffering size")
 
-    if updating:
-        buffer_cls = W_BufferedRandom
-    elif writing or creating or appending:
-        buffer_cls = W_BufferedWriter
-    elif reading:
-        buffer_cls = W_BufferedReader
-    else:
-        raise oefmt(space.w_ValueError, "unknown mode: '%s'", mode)
-    w_buffer = space.call_function(
-        space.gettypefor(buffer_cls), w_raw, space.newint(buffering)
-    )
-    if binary:
-        return w_buffer
+        if buffering == 0:
+            if not binary:
+                raise oefmt(space.w_ValueError,
+                            "can't have unbuffered text I/O")
+            return w_result
 
-    w_wrapper = space.call_function(space.gettypefor(W_TextIOWrapper),
-        w_buffer,
-        space.newtext_or_none(encoding),
-        space.newtext_or_none(errors),
-        space.newtext_or_none(newline),
-        space.newbool(line_buffering)
-    )
-    space.setattr(w_wrapper, space.newtext("mode"), space.newtext(mode))
-    return w_wrapper
+        if updating:
+            buffer_cls = W_BufferedRandom
+        elif writing or creating or appending:
+            buffer_cls = W_BufferedWriter
+        elif reading:
+            buffer_cls = W_BufferedReader
+        else:
+            raise oefmt(space.w_ValueError, "unknown mode: '%s'", mode)
+        w_buffer = space.call_function(
+            space.gettypefor(buffer_cls), w_raw, space.newint(buffering)
+        )
+        w_result = w_buffer
+        if binary:
+            return w_result
+
+        w_wrapper = space.call_function(space.gettypefor(W_TextIOWrapper),
+            w_buffer,
+            space.newtext_or_none(encoding),
+            space.newtext_or_none(errors),
+            space.newtext_or_none(newline),
+            space.newbool(line_buffering)
+        )
+        w_result = w_wrapper
+        space.setattr(w_wrapper, space.newtext("mode"), space.newtext(mode))
+        return w_result
+    except OperationError as e:
+        if w_result:
+            try:
+                space.call_method(w_result, "close")
+            except OperationError as e2:
+                e.chain_exceptions(space, e2)
+        raise
diff --git a/pypy/module/_io/test/test_io.py b/pypy/module/_io/test/test_io.py
--- a/pypy/module/_io/test/test_io.py
+++ b/pypy/module/_io/test/test_io.py
@@ -474,6 +474,22 @@
             assert f.mode == 'x'
         raises(FileExistsError, _io.open, filename, 'x')
 
+    def test_nonbuffered_textio(self):
+        import warnings, _io as io
+        filename = self.tmpfile + '_x2'
+        warnings.simplefilter("always", category=ResourceWarning)
+        with warnings.catch_warnings(record=True) as recorded:
+            raises(ValueError, io.open, filename, 'w', buffering=0)
+        assert recorded == []
+
+    def test_invalid_newline(self):
+        import warnings, _io as io
+        filename = self.tmpfile + '_x2'
+        warnings.simplefilter("always", category=ResourceWarning)
+        with warnings.catch_warnings(record=True) as recorded:
+            raises(ValueError, io.open, filename, 'w', newline='invalid')
+        assert recorded == []
+
 
 class AppTestIoAferClose:
     spaceconfig = dict(usemodules=['_io'])

From pypy.commits at gmail.com  Tue Apr 18 18:55:32 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Tue, 18 Apr 2017 15:55:32 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Chain exceptions when close() contains
 multiple operations that can fail.
Message-ID: <58f69964.dd421c0a.cf2ec.86c7@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91087:0f983f4075de
Date: 2017-04-18 19:03 +0200
http://bitbucket.org/pypy/pypy/changeset/0f983f4075de/

Log:	Chain exceptions when close() contains multiple operations that can
	fail.

diff --git a/pypy/module/_io/interp_bufferedio.py b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -1030,7 +1030,12 @@
             raise oefmt(space.w_ValueError,
                         "I/O operation on uninitialized object")
         w_meth = space.getattr(self.w_reader, space.newtext("close"))
-        space.call_args(w_meth, __args__)
+        try:
+            space.call_args(w_meth, __args__)
+        except OperationError as e2:
+            if e:
+                e2.chain_exceptions(space, e)
+            e = e2
 
         if e:
             raise e
diff --git a/pypy/module/_io/interp_textio.py b/pypy/module/_io/interp_textio.py
--- a/pypy/module/_io/interp_textio.py
+++ b/pypy/module/_io/interp_textio.py
@@ -528,13 +528,20 @@
 
     def close_w(self, space):
         self._check_attached(space)
-        if not space.is_true(space.getattr(self.w_buffer,
-                                           space.newtext("closed"))):
+        if space.is_true(space.getattr(self.w_buffer,
+                                       space.newtext("closed"))):
+            return
+        try:
+            space.call_method(self, "flush")
+        except OperationError as e:
             try:
-                space.call_method(self, "flush")
-            finally:
                 ret = space.call_method(self.w_buffer, "close")
-            return ret
+            except OperationError as e2:
+                e2.chain_exceptions(space, e)
+            raise
+        else:
+            ret = space.call_method(self.w_buffer, "close")
+        return ret
 
     def _dealloc_warn_w(self, space, w_source):
         space.call_method(self.w_buffer, "_dealloc_warn", w_source)
diff --git a/pypy/module/_io/test/test_bufferedio.py b/pypy/module/_io/test/test_bufferedio.py
--- a/pypy/module/_io/test/test_bufferedio.py
+++ b/pypy/module/_io/test/test_bufferedio.py
@@ -707,6 +707,7 @@
         pair = _io.BufferedRWPair(reader, writer)
         err = raises(NameError, pair.close)
         assert 'reader_non_existing' in str(err.value)
+        assert 'writer_non_existing' in str(err.value.__context__)
         assert not pair.closed
         assert not reader.closed
         assert not writer.closed
diff --git a/pypy/module/_io/test/test_textio.py b/pypy/module/_io/test/test_textio.py
--- a/pypy/module/_io/test/test_textio.py
+++ b/pypy/module/_io/test/test_textio.py
@@ -365,6 +365,22 @@
         raises(IOError, txt.close)  # exception not swallowed
         assert txt.closed
 
+    def test_close_error_on_close(self):
+        import _io as io
+        buffer = io.BytesIO(b'testdata')
+        def bad_flush():
+            raise OSError('flush')
+        def bad_close():
+            raise OSError('close')
+        buffer.close = bad_close
+        txt = io.TextIOWrapper(buffer, encoding="ascii")
+        txt.flush = bad_flush
+        err = raises(OSError, txt.close)
+        assert err.value.args == ('close',)
+        assert isinstance(err.value.__context__, OSError)
+        assert err.value.__context__.args == ('flush',)
+        assert not txt.closed
+
     def test_illegal_decoder(self):
         import _io
         raises(LookupError, _io.TextIOWrapper, _io.BytesIO(),

From pypy.commits at gmail.com  Tue Apr 18 18:55:34 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Tue, 18 Apr 2017 15:55:34 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: CPython Issue #21396: write_through=True
 doesn't force a flush() on the underlying binary buffered object.
Message-ID: <58f69966.c5a3df0a.fb231.3ca0@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91088:15ee4ffa4842
Date: 2017-04-18 19:11 +0200
http://bitbucket.org/pypy/pypy/changeset/15ee4ffa4842/

Log:	CPython Issue #21396: write_through=True doesn't force a flush() on
	the underlying binary buffered object.

diff --git a/pypy/module/_io/interp_textio.py b/pypy/module/_io/interp_textio.py
--- a/pypy/module/_io/interp_textio.py
+++ b/pypy/module/_io/interp_textio.py
@@ -801,9 +801,10 @@
             text = space.unicode_w(w_text)
 
         needflush = False
+        text_needflush = False
         if self.write_through:
-            needflush = True
-        elif self.line_buffering and (haslf or text.find(u'\r') >= 0):
+            text_needflush = True
+        if self.line_buffering and (haslf or text.find(u'\r') >= 0):
             needflush = True
 
         # XXX What if we were just reading?
@@ -820,7 +821,8 @@
         self.pending_bytes.append(b)
         self.pending_bytes_count += len(b)
 
-        if self.pending_bytes_count > self.chunk_size or needflush:
+        if (self.pending_bytes_count > self.chunk_size or
+            needflush or text_needflush):
             self._writeflush(space)
 
         if needflush:
diff --git a/pypy/module/_io/test/test_bufferedio.py b/pypy/module/_io/test/test_bufferedio.py
--- a/pypy/module/_io/test/test_bufferedio.py
+++ b/pypy/module/_io/test/test_bufferedio.py
@@ -291,6 +291,39 @@
         raises(_io.UnsupportedOperation, bufio.seek, 0)
         raises(_io.UnsupportedOperation, bufio.tell)
 
+    def test_bufio_write_through(self):
+        import _io as io
+        # Issue #21396: write_through=True doesn't force a flush()
+        # on the underlying binary buffered object.
+        flush_called, write_called = [], []
+        class BufferedWriter(io.BufferedWriter):
+            def flush(self, *args, **kwargs):
+                flush_called.append(True)
+                return super().flush(*args, **kwargs)
+            def write(self, *args, **kwargs):
+                write_called.append(True)
+                return super().write(*args, **kwargs)
+
+        rawio = io.BytesIO()
+        data = b"a"
+        bufio = BufferedWriter(rawio, len(data)*2)
+        textio = io.TextIOWrapper(bufio, encoding='ascii',
+                                  write_through=True)
+        # write to the buffered io but don't overflow the buffer
+        text = data.decode('ascii')
+        textio.write(text)
+
+        # buffer.flush is not called with write_through=True
+        assert not flush_called
+        # buffer.write *is* called with write_through=True
+        assert write_called
+        assert rawio.getvalue() == b"" # no flush
+
+        write_called = [] # reset
+        textio.write(text * 10) # total content is larger than bufio buffer
+        assert write_called
+        assert rawio.getvalue() == data * 11 # all flushed
+
 class AppTestBufferedReaderWithThreads(AppTestBufferedReader):
     spaceconfig = dict(usemodules=['_io', 'thread', 'time'])
 

From pypy.commits at gmail.com  Tue Apr 18 18:55:36 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Tue, 18 Apr 2017 15:55:36 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: CPython Issue #22982: Improve BOM
 handling when seeking to multiple positions of a writable text file.
Message-ID: <58f69968.16acdf0a.8c10c.3da1@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91089:32c611c850d8
Date: 2017-04-18 22:12 +0200
http://bitbucket.org/pypy/pypy/changeset/32c611c850d8/

Log:	CPython Issue #22982: Improve BOM handling when seeking to multiple
	positions of a writable text file.

diff --git a/pypy/module/_io/interp_textio.py b/pypy/module/_io/interp_textio.py
--- a/pypy/module/_io/interp_textio.py
+++ b/pypy/module/_io/interp_textio.py
@@ -878,14 +878,18 @@
                               space.newtuple([space.newbytes(""),
                                               space.newint(cookie.dec_flags)]))
 
-    def _encoder_setstate(self, space, cookie):
-        if cookie.start_pos == 0 and cookie.dec_flags == 0:
+    def _encoder_reset(self, space, start_of_stream):
+        if start_of_stream:
             space.call_method(self.w_encoder, "reset")
             self.encoding_start_of_stream = True
         else:
             space.call_method(self.w_encoder, "setstate", space.newint(0))
             self.encoding_start_of_stream = False
 
+    def _encoder_setstate(self, space, cookie):
+        self._encoder_reset(space,
+                            cookie.start_pos == 0 and cookie.dec_flags == 0)
+
     @unwrap_spec(whence=int)
     def seek_w(self, space, w_pos, whence=0):
         self._check_attached(space)
@@ -913,8 +917,13 @@
             self.snapshot = None
             if self.w_decoder:
                 space.call_method(self.w_decoder, "reset")
-            return space.call_method(self.w_buffer, "seek",
-                                     w_pos, space.newint(whence))
+            w_res = space.call_method(self.w_buffer, "seek",
+                                      w_pos, space.newint(whence))
+            if self.w_encoder:
+                # If seek() == 0, we are at the start of stream
+                start_of_stream = space.eq_w(w_res, space.newint(0))
+                self._encoder_reset(space, start_of_stream)
+            return w_res
 
         elif whence != 0:
             raise oefmt(space.w_ValueError,
diff --git a/pypy/module/_io/test/test_fileio.py b/pypy/module/_io/test/test_fileio.py
--- a/pypy/module/_io/test/test_fileio.py
+++ b/pypy/module/_io/test/test_fileio.py
@@ -302,6 +302,36 @@
             return -1
         raises(ValueError, _io.FileIO, "foo", 'r', opener=opener)
 
+    def test_seek_bom(self):
+        # The BOM is not written again when seeking manually
+        import _io
+        filename = self.tmpfile + '_x3'
+        for charset in ('utf-8-sig', 'utf-16', 'utf-32'):
+            with _io.open(filename, 'w', encoding=charset) as f:
+                f.write('aaa')
+                pos = f.tell()
+            with _io.open(filename, 'r+', encoding=charset) as f:
+                f.seek(pos)
+                f.write('zzz')
+                f.seek(0)
+                f.write('bbb')
+            with _io.open(filename, 'rb') as f:
+                assert f.read() == 'bbbzzz'.encode(charset)
+
+    def test_seek_append_bom(self):
+        # Same test, but first seek to the start and then to the end
+        import _io, os
+        filename = self.tmpfile + '_x3'
+        for charset in ('utf-8-sig', 'utf-16', 'utf-32'):
+            with _io.open(filename, 'w', encoding=charset) as f:
+                f.write('aaa')
+            with _io.open(filename, 'a', encoding=charset) as f:
+                f.seek(0)
+                f.seek(0, os.SEEK_END)
+                f.write('xxx')
+            with _io.open(filename, 'rb') as f:
+                assert f.read() == 'aaaxxx'.encode(charset)
+
 
 def test_flush_at_exit():
     from pypy import conftest

From pypy.commits at gmail.com  Tue Apr 18 18:55:38 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Tue, 18 Apr 2017 15:55:38 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Add support for rejecting lone surrogates
 in utf16 and utf32 decoders.
Message-ID: <58f6996a.098c1c0a.cc23b.6f98@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91090:7ce52a9f8d1f
Date: 2017-04-19 00:53 +0200
http://bitbucket.org/pypy/pypy/changeset/7ce52a9f8d1f/

Log:	Add support for rejecting lone surrogates in utf16 and utf32
	decoders.

diff --git a/rpython/rlib/runicode.py b/rpython/rlib/runicode.py
--- a/rpython/rlib/runicode.py
+++ b/rpython/rlib/runicode.py
@@ -591,7 +591,10 @@
 
 def unicode_encode_utf_16_helper(s, size, errors,
                                  errorhandler=None,
+                                 allow_surrogates=True,
                                  byteorder='little'):
+    if errorhandler is None:
+        errorhandler = default_unicode_error_encode
     if size == 0:
         if byteorder == 'native':
             result = StringBuilder(2)
@@ -604,34 +607,60 @@
         _STORECHAR(result, 0xFEFF, BYTEORDER)
         byteorder = BYTEORDER
 
-    i = 0
-    while i < size:
-        ch = ord(s[i])
-        i += 1
-        ch2 = 0
-        if ch >= 0x10000:
-            ch2 = 0xDC00 | ((ch-0x10000) & 0x3FF)
-            ch  = 0xD800 | ((ch-0x10000) >> 10)
+    pos = 0
+    while pos < size:
+        ch = ord(s[pos])
+        pos += 1
 
-        _STORECHAR(result, ch, byteorder)
-        if ch2:
-            _STORECHAR(result, ch2, byteorder)
+        if ch < 0xD800:
+            _STORECHAR(result, ch, byteorder)
+        elif ch >= 0x10000:
+            _STORECHAR(result, 0xD800 | ((ch-0x10000) >> 10), byteorder)
+            _STORECHAR(result, 0xDC00 | ((ch-0x10000) & 0x3FF), byteorder)
+        elif ch >= 0xE000 or allow_surrogates:
+            _STORECHAR(result, ch, byteorder)
+        else:
+            ru, rs, pos = errorhandler(errors, 'utf16',
+                                       'surrogates not allowed',
+                                       s, pos-1, pos)
+            if rs is not None:
+                # py3k only
+                if len(rs) % 2 != 0:
+                    errorhandler('strict', 'utf16',
+                                 'surrogates not allowed',
+                                 s, pos-1, pos)
+                result.append(rs)
+                continue
+            for ch in ru:
+                if ord(ch) < 0xD800:
+                    _STORECHAR(result, ord(ch), byteorder)
+                else:
+                    errorhandler('strict', 'utf16',
+                                 'surrogates not allowed',
+                                 s, pos-1, pos)
+            continue
 
     return result.build()
 
 def unicode_encode_utf_16(s, size, errors,
-                          errorhandler=None):
-    return unicode_encode_utf_16_helper(s, size, errors, errorhandler, "native")
+                          errorhandler=None,
+                          allow_surrogates=True):
+    return unicode_encode_utf_16_helper(s, size, errors, errorhandler,
+                                        allow_surrogates, "native")
 
 
 def unicode_encode_utf_16_be(s, size, errors,
-                             errorhandler=None):
-    return unicode_encode_utf_16_helper(s, size, errors, errorhandler, "big")
+                             errorhandler=None,
+                             allow_surrogates=True):
+    return unicode_encode_utf_16_helper(s, size, errors, errorhandler,
+                                        allow_surrogates, "big")
 
 
 def unicode_encode_utf_16_le(s, size, errors,
-                             errorhandler=None):
-    return unicode_encode_utf_16_helper(s, size, errors, errorhandler, "little")
+                             errorhandler=None,
+                             allow_surrogates=True):
+    return unicode_encode_utf_16_helper(s, size, errors, errorhandler,
+                                        allow_surrogates, "little")
 
 
 # ____________________________________________________________
@@ -756,7 +785,10 @@
 
 def unicode_encode_utf_32_helper(s, size, errors,
                                  errorhandler=None,
+                                 allow_surrogates=True,
                                  byteorder='little'):
+    if errorhandler is None:
+        errorhandler = default_unicode_error_encode
     if size == 0:
         if byteorder == 'native':
             result = StringBuilder(4)
@@ -769,33 +801,57 @@
         _STORECHAR32(result, 0xFEFF, BYTEORDER)
         byteorder = BYTEORDER
 
-    i = 0
-    while i < size:
-        ch = ord(s[i])
-        i += 1
+    pos = 0
+    while pos < size:
+        ch = ord(s[pos])
+        pos += 1
         ch2 = 0
-        if MAXUNICODE < 65536 and 0xD800 <= ch <= 0xDBFF and i < size:
-            ch2 = ord(s[i])
-            if 0xDC00 <= ch2 <= 0xDFFF:
-                ch = (((ch & 0x3FF)<<10) | (ch2 & 0x3FF)) + 0x10000;
-                i += 1
+        if 0xD800 <= ch < 0xDC00:
+            if not allow_surrogates:
+                ru, rs, pos = errorhandler(errors, 'utf32',
+                                           'surrogates not allowed',
+                                           s, pos-1, pos)
+                if rs is not None:
+                    # py3k only
+                    if len(rs) % 4 != 0:
+                        errorhandler('strict', 'utf32',
+                                     'surrogates not allowed',
+                                     s, pos-1, pos)
+                    result.append(rs)
+                    continue
+                for ch in ru:
+                    if ord(ch) < 0xD800:
+                        _STORECHAR32(result, ord(ch), byteorder)
+                    else:
+                        errorhandler('strict', 'utf32',
+                                     'surrogates not allowed',
+                                     s, pos-1, pos)
+                continue
+            elif MAXUNICODE < 65536 and pos < size:
+                ch2 = ord(s[pos])
+                if 0xDC00 <= ch2 < 0xE000:
+                    ch = (((ch & 0x3FF)<<10) | (ch2 & 0x3FF)) + 0x10000;
+                    pos += 1
         _STORECHAR32(result, ch, byteorder)
 
     return result.build()
 
 def unicode_encode_utf_32(s, size, errors,
-                          errorhandler=None):
-    return unicode_encode_utf_32_helper(s, size, errors, errorhandler, "native")
+                          errorhandler=None, allow_surrogates=True):
+    return unicode_encode_utf_32_helper(s, size, errors, errorhandler,
+                                        allow_surrogates, "native")
 
 
 def unicode_encode_utf_32_be(s, size, errors,
-                             errorhandler=None):
-    return unicode_encode_utf_32_helper(s, size, errors, errorhandler, "big")
+                             errorhandler=None, allow_surrogates=True):
+    return unicode_encode_utf_32_helper(s, size, errors, errorhandler,
+                                        allow_surrogates, "big")
 
 
 def unicode_encode_utf_32_le(s, size, errors,
-                             errorhandler=None):
-    return unicode_encode_utf_32_helper(s, size, errors, errorhandler, "little")
+                             errorhandler=None, allow_surrogates=True):
+    return unicode_encode_utf_32_helper(s, size, errors, errorhandler,
+                                        allow_surrogates, "little")
 
 
 # ____________________________________________________________
diff --git a/rpython/rlib/test/test_runicode.py b/rpython/rlib/test/test_runicode.py
--- a/rpython/rlib/test/test_runicode.py
+++ b/rpython/rlib/test/test_runicode.py
@@ -223,6 +223,40 @@
         py.test.raises(UnicodeDecodeError, runicode.str_decode_utf_16_le,
                        s, len(s), True)
 
+    def test_utf16_surrogates(self):
+        assert runicode.unicode_encode_utf_16_be(
+            u"\ud800", 1, None) == '\xd8\x00'
+        py.test.raises(UnicodeEncodeError, runicode.unicode_encode_utf_16_be,
+                       u"\ud800", 1, None, allow_surrogates=False)
+        def replace_with(ru, rs):
+            def errorhandler(errors, enc, msg, u, startingpos, endingpos):
+                if errors == 'strict':
+                    raise UnicodeEncodeError(enc, u, startingpos,
+                                             endingpos, msg)
+                return ru, rs, endingpos
+            return runicode.unicode_encode_utf_16_be(
+                u"<\ud800>", 3, None,
+                errorhandler, allow_surrogates=False)
+        assert replace_with(u'rep', None) == '\x00<\x00r\x00e\x00p\x00>'
+        assert replace_with(None, '\xca\xfe') == '\x00<\xca\xfe\x00>'
+
+    def test_utf32_surrogates(self):
+        assert runicode.unicode_encode_utf_32_be(
+            u"\ud800", 1, None) == '\x00\x00\xd8\x00'
+        py.test.raises(UnicodeEncodeError, runicode.unicode_encode_utf_32_be,
+                       u"\ud800", 1, None, allow_surrogates=False)
+        def replace_with(ru, rs):
+            def errorhandler(errors, enc, msg, u, startingpos, endingpos):
+                if errors == 'strict':
+                    raise UnicodeEncodeError(enc, u, startingpos,
+                                             endingpos, msg)
+                return ru, rs, endingpos
+            return runicode.unicode_encode_utf_32_be(
+                u"<\ud800>", 3, None,
+                errorhandler, allow_surrogates=False)
+        assert replace_with(u'rep', None) == u'<rep>'.encode('utf-32-be')
+        assert replace_with(None, '\xca\xfe\xca\xfe') == '\x00\x00\x00<\xca\xfe\xca\xfe\x00\x00\x00>'
+
     def test_utf7_bugs(self):
         u = u'A\u2262\u0391.'
         assert runicode.unicode_encode_utf_7(u, len(u), None) == 'A+ImIDkQ.'

From pypy.commits at gmail.com  Wed Apr 19 04:26:17 2017
From: pypy.commits at gmail.com (danchr)
Date: Wed, 19 Apr 2017 01:26:17 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: hgignore: ignore pypy3-c everywhere and
 libpypy on OS X
Message-ID: <58f71f29.54091c0a.7de7d.e37f@mx.google.com>

Author: Dan Villiom Podlaski Christiansen <dan at magenta.dk>
Branch: py3.5
Changeset: r91091:48a6e79c2d32
Date: 2017-04-18 23:04 +0200
http://bitbucket.org/pypy/pypy/changeset/48a6e79c2d32/

Log:	hgignore: ignore pypy3-c everywhere and libpypy on OS X

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -53,9 +53,11 @@
 ^rpython/translator/goal/.+\.dll$
 ^pypy/goal/pypy-translation-snapshot$
 ^pypy/goal/pypy-c
+^pypy/goal/pypy3-c
 ^pypy/goal/.+\.exe$
 ^pypy/goal/.+\.dll$
 ^pypy/goal/.+\.lib$
+^pypy/goal/.+\.dylib$
 ^pypy/_cache$
 ^lib-python/2.7/lib2to3/.+\.pickle$
 ^lib_pypy/__pycache__$

From pypy.commits at gmail.com  Wed Apr 19 06:47:38 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 19 Apr 2017 03:47:38 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Fix test, broken on several levels,
 and fix implementation to match.
Message-ID: <58f7404a.ee86df0a.d805b.f085@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r91092:0c746868b18a
Date: 2017-04-19 11:47 +0100
http://bitbucket.org/pypy/pypy/changeset/0c746868b18a/

Log:	Fix test, broken on several levels, and fix implementation to match.

diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -419,11 +419,11 @@
     """
     while True:
         try:
-            res = rposix.posix_fadvise(fd, offset, length, advice)
+            rposix.posix_fadvise(fd, offset, length, advice)
         except OSError as e:
             wrap_oserror(space, e, eintr_retry=True)
         else:
-            return space.newint(res)
+            return
 
 # ____________________________________________________________
 
diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/test_posix2.py
--- a/pypy/module/posix/test/test_posix2.py
+++ b/pypy/module/posix/test/test_posix2.py
@@ -862,23 +862,19 @@
 
     if hasattr(rposix, 'posix_fadvise'):
         def test_os_posix_fadvise(self):
-            posix, os = self.posix, self.os
-            localdir = os.getcwd()
-            os.mkdir(self.path2 + 'test_os_posix_fadvise')
+            posix = self.posix
+            fd = posix.open(self.path2 + 'test_os_posix_fadvise', posix.O_CREAT | posix.O_RDWR)
             try:
-                fd = os.open(self.path2 + 'test_os_posix_fadvise', os.O_RDONLY)
-                try:
-                    mypath = os.getcwd()
-                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_WILLNEED) == 0
-                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_NORMAL) == 0
-                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_SEQUENTIAL) == 0
-                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_RANDOM) == 0
-                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_NOREUSE) == 0
-                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_DONTNEED) == 0
-                finally:
-                    os.close(fd)
+                posix.write(fd, b"foobar")
+                assert posix.posix_fadvise(fd, 0, 1, posix.POSIX_FADV_WILLNEED) is None
+                assert posix.posix_fadvise(fd, 1, 1, posix.POSIX_FADV_NORMAL) is None
+                assert posix.posix_fadvise(fd, 2, 1, posix.POSIX_FADV_SEQUENTIAL) is None
+                assert posix.posix_fadvise(fd, 3, 1, posix.POSIX_FADV_RANDOM) is None
+                assert posix.posix_fadvise(fd, 4, 1, posix.POSIX_FADV_NOREUSE) is None
+                assert posix.posix_fadvise(fd, 5, 1, posix.POSIX_FADV_DONTNEED) is None
+                raises(OSError, posix.posix_fadvise, fd, 6, 1, 1234567)
             finally:
-                os.chdir(localdir)
+                posix.close(fd)
 
     if hasattr(rposix, 'posix_fallocate'):
         def test_os_posix_posix_fallocate(self):
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -522,7 +522,10 @@
         @enforceargs(int, None, None, int)
         def posix_fadvise(fd, offset, length, advice):
             validate_fd(fd)
-            return handle_posix_error('posix_fadvise', c_posix_fadvise(fd, offset, length, advice))
+            error = c_posix_fadvise(fd, offset, length, advice)
+            error = widen(error)
+            if error != 0:
+                raise OSError(error, 'posix_fadvise failed')
 
 c_ftruncate = external('ftruncate', [rffi.INT, rffi.LONGLONG], rffi.INT,
                        macro=_MACRO_ON_POSIX, save_err=rffi.RFFI_SAVE_ERRNO)

From pypy.commits at gmail.com  Wed Apr 19 06:51:54 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 19 Apr 2017 03:51:54 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Fix test here too
Message-ID: <58f7414a.cd8ddf0a.6d1bc.f179@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r91093:f9d363d1e2d3
Date: 2017-04-19 11:51 +0100
http://bitbucket.org/pypy/pypy/changeset/f9d363d1e2d3/

Log:	Fix test here too

diff --git a/rpython/rlib/test/test_rposix.py b/rpython/rlib/test/test_rposix.py
--- a/rpython/rlib/test/test_rposix.py
+++ b/rpython/rlib/test/test_rposix.py
@@ -754,22 +754,18 @@
 @rposix_requires('posix_fadvise')
 def test_posix_fadvise():
     fname = str(udir.join('test_os_posix_fadvise'))
-    localdir = os.getcwd()
-    os.mkdir(fname)
+    fd = os.open(fname, os.O_CREAT | os.O_RDWR)
     try:
-        fd = os.open(fname, os.O_RDONLY, 0777)
-        try:
-            mypath = os.getcwd()
-            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_WILLNEED) == 0
-            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_NORMAL) == 0
-            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_SEQUENTIAL) == 0
-            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_RANDOM) == 0
-            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_NOREUSE) == 0
-            assert rposix.posix_fadvise(fd, 0, 0, rposix.POSIX_FADV_DONTNEED) == 0
-        finally:
-            os.close(fd)
+        os.write(fd, b"foobar")
+        assert rposix.posix_fadvise(fd, 0, 1, rposix.POSIX_FADV_WILLNEED) is None
+        assert rposix.posix_fadvise(fd, 1, 1, rposix.POSIX_FADV_NORMAL) is None
+        assert rposix.posix_fadvise(fd, 2, 1, rposix.POSIX_FADV_SEQUENTIAL) is None
+        assert rposix.posix_fadvise(fd, 3, 1, rposix.POSIX_FADV_RANDOM) is None
+        assert rposix.posix_fadvise(fd, 4, 1, rposix.POSIX_FADV_NOREUSE) is None
+        assert rposix.posix_fadvise(fd, 5, 1, rposix.POSIX_FADV_DONTNEED) is None
+        py.test.raises(OSError, rposix.posix_fadvise, fd, 6, 1, 1234567)
     finally:
-        os.chdir(localdir)
+        os.close(fd)
 
 @rposix_requires('posix_fallocate')
 def test_posix_fallocate():

From pypy.commits at gmail.com  Wed Apr 19 14:45:45 2017
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 19 Apr 2017 11:45:45 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Fix interaction of space.getarg_w('w*',
 ...) and CPyBuffer
Message-ID: <58f7b059.15371c0a.ac09c.c134@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91095:e30a5a8a4062
Date: 2017-04-19 19:44 +0100
http://bitbucket.org/pypy/pypy/changeset/e30a5a8a4062/

Log:	Fix interaction of space.getarg_w('w*', ...) and CPyBuffer

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1540,7 +1540,7 @@
                 self._getarg_error("bytes or read-only buffer", w_obj)
         elif code == 'w*':
             try:
-                return w_obj.buffer_w(self, self.BUF_WRITABLE).as_binary()
+                return w_obj.buffer_w(self, self.BUF_WRITABLE).as_binary_rw()
             except OperationError:
                 pass
             except BufferInterfaceNotFound:
diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -39,6 +39,10 @@
         # Inefficient. May be overridden.
         return StringBuffer(self.as_str())
 
+    def as_binary_rw(self):
+        """Return a writable BinaryBuffer sharing the same data as `self`."""
+        raise NotImplementedError
+
     def getformat(self):
         raise NotImplementedError
 
@@ -204,6 +208,10 @@
     def as_binary(self):
         return self.data
 
+    def as_binary_rw(self):
+        assert not self.data.readonly
+        return self.data
+
     def getformat(self):
         return 'B'
 
diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -19,7 +19,7 @@
 from pypy.module.cpyext.memoryobject import fill_Py_buffer
 from pypy.module.cpyext.state import State
 from pypy.module.cpyext import userslot
-from pypy.interpreter.buffer import PyBuffer
+from pypy.interpreter.buffer import PyBuffer, BinaryBuffer
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.argument import Arguments
 from rpython.rlib.unroll import unrolling_iterable
@@ -388,6 +388,13 @@
         for i in range(len(string)):
             self.ptr[start + i] = string[i]
 
+    def as_binary(self):
+        return CBuffer(self)
+
+    def as_binary_rw(self):
+        assert not self.readonly
+        return CBuffer(self)
+
     def get_raw_address(self):
         return rffi.cast(rffi.CCHARP, self.ptr)
 
@@ -417,6 +424,37 @@
 
 fq = FQ()
 
+
+class CBuffer(BinaryBuffer):
+    _immutable_ = True
+    def __init__(self, pybuffer):
+        self.pybuffer = pybuffer
+        self.readonly = pybuffer.readonly
+
+    def getlength(self):
+        return self.pybuffer.getlength()
+
+    def getitem(self, index):
+        return self.pybuffer.ptr[index]
+
+    def getslice(self, start, stop, step, size):
+        assert step == 1
+        assert stop - start == size
+        ptr = rffi.ptradd(cts.cast('char *', self.pybuffer.ptr), start)
+        return rffi.charpsize2str(ptr, size)
+
+    def setitem(self, index, char):
+        self.pybuffer.ptr[index] = char
+
+    def setslice(self, index, s):
+        assert s is not None
+        ptr = rffi.ptradd(cts.cast('char *', self.pybuffer.ptr), index)
+        rffi.str2chararray(s, ptr, len(s))
+
+    def get_raw_address(self):
+        return cts.cast('char *', self.pybuffer.ptr)
+
+
 def wrap_getreadbuffer(space, w_self, w_args, func):
     func_target = rffi.cast(readbufferproc, func)
     py_obj = make_ref(space, w_self)
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -216,7 +216,9 @@
             src = space.buffer_w(w_obj, space.BUF_CONTIG_RO)
             dst_strides = self.getstrides()
             dim = 0
-            dst = SubBuffer(self.buf.as_binary(), start * itemsize, slicelength * itemsize)
+            dst = SubBuffer(
+                self.buf.as_binary_rw(),
+                start * itemsize, slicelength * itemsize)
             src_stride0 = dst_strides[dim]
 
             off = 0
@@ -670,6 +672,9 @@
     def as_binary(self):
         return self.parent.as_binary()
 
+    def as_binary_rw(self):
+        return self.parent.as_binary_rw()
+
 class BufferView1D(BufferViewBase):
     _immutable_ = True
     _attrs_ = ['readonly', 'parent', 'format', 'itemsize']

From pypy.commits at gmail.com  Wed Apr 19 14:45:42 2017
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 19 Apr 2017 11:45:42 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: hg merge py3.5
Message-ID: <58f7b056.0386df0a.bcd31.91d7@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91094:165dc3ba1754
Date: 2017-04-19 17:05 +0100
http://bitbucket.org/pypy/pypy/changeset/165dc3ba1754/

Log:	hg merge py3.5

diff too long, truncating to 2000 out of 20552 lines

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -53,9 +53,11 @@
 ^rpython/translator/goal/.+\.dll$
 ^pypy/goal/pypy-translation-snapshot$
 ^pypy/goal/pypy-c
+^pypy/goal/pypy3-c
 ^pypy/goal/.+\.exe$
 ^pypy/goal/.+\.dll$
 ^pypy/goal/.+\.lib$
+^pypy/goal/.+\.dylib$
 ^pypy/_cache$
 ^lib-python/2.7/lib2to3/.+\.pickle$
 ^lib_pypy/__pycache__$
@@ -86,3 +88,5 @@
 ^\.cache$
 
 pypy/module/cppyy/.+/*\.pcm
+
+
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -36,3 +36,5 @@
 aff251e543859ce4508159dd9f1a82a2f553de00 release-pypy2.7-v5.6.0
 fa3249d55d15b9829e1be69cdf45b5a44cec902d release-pypy2.7-v5.7.0
 b16a4363e930f6401bceb499b9520955504c6cb0 release-pypy3.5-v5.7.0
+1aa2d8e03cdfab54b7121e93fda7e98ea88a30bf release-pypy2.7-v5.7.1
+2875f328eae2216a87f3d6f335092832eb031f56 release-pypy3.5-v5.7.1
diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py b/lib-python/2.7/distutils/sysconfig_pypy.py
--- a/lib-python/2.7/distutils/sysconfig_pypy.py
+++ b/lib-python/2.7/distutils/sysconfig_pypy.py
@@ -61,12 +61,12 @@
 def _init_posix():
     """Initialize the module as appropriate for POSIX systems."""
     g = {}
-    g['CC'] = "gcc -pthread"
-    g['CXX'] = "g++ -pthread"
+    g['CC'] = "cc -pthread"
+    g['CXX'] = "c++ -pthread"
     g['OPT'] = "-DNDEBUG -O2"
     g['CFLAGS'] = "-DNDEBUG -O2"
     g['CCSHARED'] = "-fPIC"
-    g['LDSHARED'] = "gcc -pthread -shared"
+    g['LDSHARED'] = "cc -pthread -shared"
     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
     g['AR'] = "ar"
     g['ARFLAGS'] = "rc"
diff --git a/lib-python/3/site.py b/lib-python/3/site.py
--- a/lib-python/3/site.py
+++ b/lib-python/3/site.py
@@ -305,9 +305,7 @@
         seen.add(prefix)
 
         if is_pypy:
-            from distutils.sysconfig import get_python_lib
-            sitepackages.append(get_python_lib(standard_lib=False,
-                                               prefix=prefix))
+            sitepackages.append(os.path.join(prefix, "site-packages"))
         elif os.sep == '/':
             sitepackages.append(os.path.join(prefix, "lib",
                                         "python" + sys.version[:3],
diff --git a/lib_pypy/_cffi_ssl/README.md b/lib_pypy/_cffi_ssl/README.md
--- a/lib_pypy/_cffi_ssl/README.md
+++ b/lib_pypy/_cffi_ssl/README.md
@@ -5,16 +5,22 @@
 it renames the compiled shared object to _pypy_openssl.so (which means
 that cryptography can ship their own cffi backend)
 
+NOTE: currently, we have changed ``_cffi_src/openssl/callbacks.py`` to
+not rely on the CPython C API.
+
 # Tests?
 
 Currently this module is tested using CPython's standard library test suite.
 
 # Install it into PyPy's source tree
 
-Copy over all the sources into the folder `lib_pypy/_cffi_ssl/*`. Updating the cffi backend can be simply done by the following command:
+Copy over all the sources into the folder `lib_pypy/_cffi_ssl/*`. Updating the cffi backend can be simply done by the following command::
 
     $ cp -r <cloned cryptography folder>/src/_cffi_src/* .
 
+NOTE: you need to keep our version of ``_cffi_src/openssl/callbacks.py``
+for now!
+
 # Crpytography version
 
 Copied over release version `1.7.2`
diff --git a/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py b/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
--- a/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
+++ b/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
@@ -13,8 +13,6 @@
 #include <openssl/x509.h>
 #include <openssl/x509_vfy.h>
 #include <openssl/crypto.h>
-
-#include <pythread.h>
 """
 
 TYPES = """
@@ -64,8 +62,44 @@
    Copyright 2001-2016 Python Software Foundation; All Rights Reserved.
 */
 
+#ifdef _WIN32
+#include <Windows.h>
+typedef CRITICAL_SECTION mutex1_t;
+static inline void mutex1_init(mutex1_t *mutex) {
+    InitializeCriticalSection(mutex);
+}
+static inline void mutex1_lock(mutex1_t *mutex) {
+    EnterCriticalSection(mutex);
+}
+static inline void mutex1_unlock(mutex1_t *mutex) {
+    LeaveCriticalSection(mutex);
+}
+#else
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+typedef pthread_mutex_t mutex1_t;
+#define ASSERT_STATUS(call)                             \
+    if (call != 0) {                                    \
+        perror("Fatal error in _cffi_ssl: " #call);     \
+        abort();                                        \
+    }
+static inline void mutex1_init(mutex1_t *mutex) {
+#if !defined(pthread_mutexattr_default)
+#  define pthread_mutexattr_default ((pthread_mutexattr_t *)NULL)
+#endif
+    ASSERT_STATUS(pthread_mutex_init(mutex, pthread_mutexattr_default));
+}
+static inline void mutex1_lock(mutex1_t *mutex) {
+    ASSERT_STATUS(pthread_mutex_lock(mutex));
+}
+static inline void mutex1_unlock(mutex1_t *mutex) {
+    ASSERT_STATUS(pthread_mutex_unlock(mutex));
+}
+#endif
+
 static unsigned int _ssl_locks_count = 0;
-static PyThread_type_lock *_ssl_locks = NULL;
+static mutex1_t *_ssl_locks = NULL;
 
 static void _ssl_thread_locking_function(int mode, int n, const char *file,
                                          int line) {
@@ -89,35 +123,32 @@
     }
 
     if (mode & CRYPTO_LOCK) {
-        PyThread_acquire_lock(_ssl_locks[n], 1);
+        mutex1_lock(_ssl_locks + n);
     } else {
-        PyThread_release_lock(_ssl_locks[n]);
+        mutex1_unlock(_ssl_locks + n);
+    }
+}
+
+static void init_mutexes(void)
+{
+    int i;
+    for (i = 0;  i < _ssl_locks_count;  i++) {
+        mutex1_init(_ssl_locks + i);
     }
 }
 
 int _setup_ssl_threads(void) {
-    unsigned int i;
-
     if (_ssl_locks == NULL) {
         _ssl_locks_count = CRYPTO_num_locks();
-        _ssl_locks = PyMem_New(PyThread_type_lock, _ssl_locks_count);
+        _ssl_locks = malloc(sizeof(mutex1_t) * _ssl_locks_count);
         if (_ssl_locks == NULL) {
-            PyErr_NoMemory();
             return 0;
         }
-        memset(_ssl_locks, 0, sizeof(PyThread_type_lock) * _ssl_locks_count);
-        for (i = 0;  i < _ssl_locks_count;  i++) {
-            _ssl_locks[i] = PyThread_allocate_lock();
-            if (_ssl_locks[i] == NULL) {
-                unsigned int j;
-                for (j = 0;  j < i;  j++) {
-                    PyThread_free_lock(_ssl_locks[j]);
-                }
-                PyMem_Free(_ssl_locks);
-                return 0;
-            }
-        }
+        init_mutexes();
         CRYPTO_set_locking_callback(_ssl_thread_locking_function);
+#ifndef _WIN32
+        pthread_atfork(NULL, NULL, &init_mutexes);
+#endif
     }
     return 1;
 }
diff --git a/lib_pypy/_ctypes/array.py b/lib_pypy/_ctypes/array.py
--- a/lib_pypy/_ctypes/array.py
+++ b/lib_pypy/_ctypes/array.py
@@ -83,8 +83,9 @@
         res = self.__new__(self)
         ffiarray = self._ffiarray.fromaddress(resarray.buffer, self._length_)
         res._buffer = ffiarray
-        res._base = base
-        res._index = index
+        if base is not None:
+            res._base = base
+            res._index = index
         return res
 
     def _CData_retval(self, resbuffer):
diff --git a/lib_pypy/_ctypes/basics.py b/lib_pypy/_ctypes/basics.py
--- a/lib_pypy/_ctypes/basics.py
+++ b/lib_pypy/_ctypes/basics.py
@@ -64,8 +64,9 @@
         res = object.__new__(self)
         res.__class__ = self
         res.__dict__['_buffer'] = resbuffer
-        res.__dict__['_base'] = base
-        res.__dict__['_index'] = index
+        if base is not None:
+            res.__dict__['_base'] = base
+            res.__dict__['_index'] = index
         return res
 
     def _CData_retval(self, resbuffer):
diff --git a/lib_pypy/_pypy_collections.py b/lib_pypy/_pypy_collections.py
--- a/lib_pypy/_pypy_collections.py
+++ b/lib_pypy/_pypy_collections.py
@@ -1,6 +1,5 @@
-from __pypy__ import reversed_dict, move_to_end
+from __pypy__ import reversed_dict, move_to_end, objects_in_repr
 from _operator import eq as _eq
-from reprlib import recursive_repr as _recursive_repr
 import _collections_abc
 
 
@@ -44,12 +43,21 @@
         '''
         return move_to_end(self, key, last)
 
-    @_recursive_repr()
     def __repr__(self):
         'od.__repr__() <==> repr(od)'
         if not self:
             return '%s()' % (self.__class__.__name__,)
-        return '%s(%r)' % (self.__class__.__name__, list(self.items()))
+        currently_in_repr = objects_in_repr()
+        if self in currently_in_repr:
+            return '...'
+        currently_in_repr[self] = 1
+        try:
+            return '%s(%r)' % (self.__class__.__name__, list(self.items()))
+        finally:
+            try:
+                del currently_in_repr[self]
+            except:
+                pass
 
     def __reduce__(self):
         'Return state information for pickling'
diff --git a/lib_pypy/_structseq.py b/lib_pypy/_structseq.py
--- a/lib_pypy/_structseq.py
+++ b/lib_pypy/_structseq.py
@@ -129,3 +129,38 @@
     parts = ["%s=%r" % (fields[index].__name__, value)
             for index, value in enumerate(self[:visible_count])]
     return "%s(%s)" % (self._name, ", ".join(parts))
+
+
+class SimpleNamespace:
+    """A simple attribute-based namespace.
+
+SimpleNamespace(**kwargs)"""
+
+    def __init__(self, **kwargs):
+        self.__dict__.update(kwargs)
+
+    def __repr__(self):
+        ident = id(self)
+        if ident in sns_recurse:
+            return "namespace(...)"
+        sns_recurse.add(ident)
+        try:
+            pairs = ('%s=%r' % item for item in sorted(self.__dict__.items()))
+            return "namespace(%s)" % ', '.join(pairs)
+        finally:
+            sns_recurse.discard(ident)
+
+    def __eq__(self, other):
+        if issubclass(type(other), SimpleNamespace):
+            return self.__dict__ == other.__dict__
+        return NotImplemented
+
+    def __ne__(self, other):
+        if issubclass(type(other), SimpleNamespace):
+            return self.__dict__ != other.__dict__
+        return NotImplemented
+
+sns_recurse = set()
+
+# This class is not exposed in sys, but by the types module.
+SimpleNamespace.__module__ = 'types'
diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py
--- a/lib_pypy/_sysconfigdata.py
+++ b/lib_pypy/_sysconfigdata.py
@@ -1,6 +1,6 @@
-import imp
+import _imp
 
-so_ext = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
+so_ext = _imp.extension_suffixes()[0]
 
 build_time_vars = {
     "EXT_SUFFIX": so_ext,
diff --git a/pypy/doc/index-of-release-notes.rst b/pypy/doc/index-of-release-notes.rst
--- a/pypy/doc/index-of-release-notes.rst
+++ b/pypy/doc/index-of-release-notes.rst
@@ -6,6 +6,7 @@
 
 .. toctree::
 
+   release-v5.7.1.rst
    release-v5.7.0.rst
    release-pypy2.7-v5.6.0.rst
    release-pypy2.7-v5.4.1.rst
@@ -59,6 +60,7 @@
 
 .. toctree::
 
+   release-v5.7.1.rst
    release-v5.7.0.rst
 
 CPython 3.3 compatible versions
diff --git a/pypy/doc/install.rst b/pypy/doc/install.rst
--- a/pypy/doc/install.rst
+++ b/pypy/doc/install.rst
@@ -32,10 +32,10 @@
 
 .. code-block:: console
 
-    $ tar xf pypy-2.1.tar.bz2
-    $ ./pypy-2.1/bin/pypy
-    Python 2.7.3 (480845e6b1dd, Jul 31 2013, 11:05:31)
-    [PyPy 2.1.0 with GCC 4.4.3] on linux2
+    $ tar xf pypy-x.y.z.tar.bz2
+    $ ./pypy-x.y.z/bin/pypy
+    Python 2.7.x (xxxxxxxxxxxx, Date, Time)
+    [PyPy x.y.z with GCC x.y.z] on linux2
     Type "help", "copyright", "credits" or "license" for more information.
     And now for something completely different: ``PyPy is an exciting technology
     that lets you to write fast, portable, multi-platform interpreters with less
diff --git a/pypy/doc/release-v5.7.0.rst b/pypy/doc/release-v5.7.0.rst
--- a/pypy/doc/release-v5.7.0.rst
+++ b/pypy/doc/release-v5.7.0.rst
@@ -99,7 +99,7 @@
     tp_dealloc
   * refactor and clean up poor handling of unicode exposed in work on py3.5
   * builtin module cppyy_ supports C++ 11, 14, etc. via cling (reflex has been removed)
-  * adapt ``weakref`` according to CPython issue #19542_, will be in CPython 2.7.14
+  * adapt ``weakref`` according to CPython issue 19542_, will be in CPython 2.7.14
   * support translations with cpyext and the Boehm GC (for special cases like
     RevDB_
   * implement ``StringBuffer.get_raw_address`` for the buffer protocol, it is
@@ -125,18 +125,18 @@
   * disable ``clock_gettime()`` on OS/X, since we support 10.11 and it was only
     added in 10.12
   * support ``HAVE_FSTATVFS`` which was unintentionally always false
-  * fix user-created C-API heaptype, issue #2434_
+  * fix user-created C-API heaptype, issue 2434_
   * fix ``PyDict_Update`` is not actually the same as ``dict.update``
   * assign ``tp_doc`` on ``PyTypeObject`` and tie it to the app-level ``__doc__`` attribute
-    issue #2446_
+    issue 2446_
   * clean up memory leaks around ``PyObject_GetBuffer``, ``PyMemoryView_GET_BUFFER``,
     ``PyMemoryView_FromBuffer``, and ``PyBuffer_Release``
   * improve support for creating C-extension objects from app-level classes,
     filling more slots, especially ``tp_new`` and ``tp_dealloc``
-  * fix for ``ctypes.c_bool`` returning ``bool`` restype, issue #2475_
+  * fix for ``ctypes.c_bool`` returning ``bool`` restype, issue 2475_
   * fix in corner cases with the GIL and C-API functions
-  * allow overriding thread.local.__init__ in a subclass, issue #2501_
-  * allow ``PyClass_New`` to be called with NULL as the first arguemnt, issue #2504_
+  * allow overriding thread.local.__init__ in a subclass, issue 2501_
+  * allow ``PyClass_New`` to be called with NULL as the first arguemnt, issue 2504_
 
 
 * Performance improvements:
diff --git a/pypy/doc/release-v5.7.1.rst b/pypy/doc/release-v5.7.1.rst
new file mode 100644
--- /dev/null
+++ b/pypy/doc/release-v5.7.1.rst
@@ -0,0 +1,50 @@
+==========
+PyPy 5.7.1
+==========
+
+We have released a bugfix PyPy2.7-v5.7.1 and PyPy3.5-v5.7.1 beta (Linux 64bit),
+due to the following issues:
+
+  * correctly handle an edge case in dict.pop (issue 2508_)
+
+  * fix a regression to correctly handle multiple inheritance in a C-API type
+    where the second base is an app-level class with a ``__new__`` function
+
+  * fix a regression to fill a C-API type's ``tp_getattr`` slot from a
+    ``__getattr__`` method (issue 2523_)
+
+Thanks to those who reported the issues.
+
+.. _2508: https://bitbucket.org/pypy/pypy/issues/2508
+.. _2523: https://bitbucket.org/pypy/pypy/issues/2523
+
+What is PyPy?
+=============
+
+PyPy is a very compliant Python interpreter, almost a drop-in replacement for
+CPython 2.7 and CPython 3.5. 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.
+
+The PyPy 2.7 release supports: 
+
+  * **x86** machines on most common operating systems
+    (Linux 32/64 bits, Mac OS X 64 bits, Windows 32 bits, OpenBSD, FreeBSD)
+  
+  * newer **ARM** hardware (ARMv6 or ARMv7, with VFPv3) running Linux,
+  
+  * big- and little-endian variants of **PPC64** running Linux,
+
+  * **s390x** running Linux
+
+.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
+.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+
+Please update, and continue to help us make PyPy better.
+
+Cheers
+
+The PyPy Team
+
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -21,3 +21,10 @@
 .. branch: vmprof-native
 
 PyPy support to profile native frames in vmprof.
+
+.. branch: reusing-r11
+.. branch: branch-prediction
+
+Performance tweaks in the x86 JIT-generated machine code: rarely taken
+blocks are moved off-line.  Also, the temporary register used to contain
+large constants is reused across instructions.
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -18,3 +18,6 @@
 
 Implement posix.posix_fallocate() and posix.posix_fadvise()
 
+.. branch: py3.5-mac-translate
+
+Fix for different posix primitives on MacOS
diff --git a/pypy/interpreter/astcompiler/assemble.py b/pypy/interpreter/astcompiler/assemble.py
--- a/pypy/interpreter/astcompiler/assemble.py
+++ b/pypy/interpreter/astcompiler/assemble.py
@@ -7,6 +7,7 @@
 from pypy.interpreter.astcompiler import ast, consts, misc, symtable
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.pycode import PyCode
+from pypy.interpreter.miscutils import string_sort
 from pypy.tool import stdlib_opcode as ops
 
 
@@ -138,9 +139,12 @@
 
 
 def _make_index_dict_filter(syms, flag1, flag2):
+    names = syms.keys()
+    string_sort(names)   # return cell vars in alphabetical order
     i = 0
     result = {}
-    for name, scope in syms.iteritems():
+    for name in names:
+        scope = syms[name]
         if scope in (flag1, flag2):
             result[name] = i
             i += 1
@@ -172,6 +176,7 @@
         self.cell_vars = _make_index_dict_filter(scope.symbols,
                                                  symtable.SCOPE_CELL,
                                                  symtable.SCOPE_CELL_CLASS)
+        string_sort(scope.free_vars)    # return free vars in alphabetical order
         self.free_vars = _iter_to_dict(scope.free_vars, len(self.cell_vars))
         self.w_consts = space.newdict()
         self.argcount = 0
diff --git a/pypy/interpreter/astcompiler/symtable.py b/pypy/interpreter/astcompiler/symtable.py
--- a/pypy/interpreter/astcompiler/symtable.py
+++ b/pypy/interpreter/astcompiler/symtable.py
@@ -38,7 +38,7 @@
         self.roles = {}
         self.varnames = []
         self.children = []
-        self.free_vars = {}
+        self.free_vars = []    # a bag of names: the order doesn't matter here
         self.temp_name_counter = 1
         self.has_free = False
         self.child_has_free = False
@@ -135,7 +135,8 @@
                 err = "no binding for nonlocal '%s' found" % (name,)
                 raise SyntaxError(err, self.lineno, self.col_offset)
             self.symbols[name] = SCOPE_FREE
-            self.free_vars[name] = None
+            if not self._hide_bound_from_nested_scopes:
+                self.free_vars.append(name)
             free[name] = None
             self.has_free = True
         elif flags & SYM_BOUND:
@@ -147,7 +148,7 @@
                 pass
         elif bound and name in bound:
             self.symbols[name] = SCOPE_FREE
-            self.free_vars[name] = None
+            self.free_vars.append(name)
             free[name] = None
             self.has_free = True
         elif name in globs:
@@ -204,7 +205,7 @@
             except KeyError:
                 if bound and name in bound:
                     self.symbols[name] = SCOPE_FREE
-                    self.free_vars[name] = None
+                    self.free_vars.append(name)
             else:
                 if role_here & (SYM_BOUND | SYM_GLOBAL) and \
                         self._hide_bound_from_nested_scopes:
@@ -213,7 +214,7 @@
                     # scope.  We add the name to the class scope's list of free
                     # vars, so it will be passed through by the interpreter, but
                     # we leave the scope alone, so it can be local on its own.
-                    self.free_vars[name] = None
+                    self.free_vars.append(name)
         self._check_optimization()
         free.update(new_free)
 
diff --git a/pypy/interpreter/miscutils.py b/pypy/interpreter/miscutils.py
--- a/pypy/interpreter/miscutils.py
+++ b/pypy/interpreter/miscutils.py
@@ -2,6 +2,9 @@
 Miscellaneous utilities.
 """
 
+from rpython.rlib.listsort import make_timsort_class
+
+
 class ThreadLocals:
     """Pseudo thread-local storage, for 'space.threadlocals'.
     This is not really thread-local at all; the intention is that the PyPy
@@ -53,3 +56,15 @@
             def set(self, key, value):
                 self._dict[key] = value
         return FakeWeakValueDict()
+
+
+_StringBaseTimSort = make_timsort_class()
+
+class StringSort(_StringBaseTimSort):
+    def lt(self, a, b):
+        return a < b
+
+def string_sort(lst):
+    """Sort a (resizable) list of strings."""
+    sorter = StringSort(lst, len(lst))
+    sorter.sort()
diff --git a/pypy/interpreter/test/test_compiler.py b/pypy/interpreter/test/test_compiler.py
--- a/pypy/interpreter/test/test_compiler.py
+++ b/pypy/interpreter/test/test_compiler.py
@@ -1035,6 +1035,32 @@
         else:
             assert l1 == l2 == l3 == l4 == [1, 3, 2, 4]
 
+    def test_freevars_order(self):
+        # co_cellvars and co_freevars are guaranteed to appear in
+        # alphabetical order.  See CPython Issue #15368 (which does
+        # not come with tests).
+        source = """if 1:
+        def f1(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15):
+            def g1():
+                return (x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15)
+            return g1
+        def f2(x15,x14,x13,x12,x11,x10,x9,x8,x7,x6,x5,x4,x3,x2,x1):
+            def g2():
+                return (x15,x14,x13,x12,x11,x10,x9,x8,x7,x6,x5,x4,x3,x2,x1)
+            return g2
+        c1 = f1(*range(15)).__code__.co_freevars
+        c2 = f2(*range(15)).__code__.co_freevars
+        r1 = f1.__code__.co_cellvars
+        r2 = f2.__code__.co_cellvars
+        """
+        d = {}
+        exec(source, d)
+        assert d['c1'] == d['c2']
+        # the test above is important for a few bytecode hacks,
+        # but actually we get them in alphabetical order, so check that:
+        assert d['c1'] == tuple(sorted(d['c1']))
+        assert d['r1'] == d['r2'] == d['c1']
+
     def test_ast_equality(self):
         import _ast
         sample_code = [
diff --git a/pypy/module/__pypy__/__init__.py b/pypy/module/__pypy__/__init__.py
--- a/pypy/module/__pypy__/__init__.py
+++ b/pypy/module/__pypy__/__init__.py
@@ -67,6 +67,7 @@
     interpleveldefs = {
         'attach_gdb'                : 'interp_magic.attach_gdb',
         'internal_repr'             : 'interp_magic.internal_repr',
+        'objects_in_repr'           : 'interp_magic.objects_in_repr',
         'bytebuffer'                : 'bytebuffer.bytebuffer',
         'identity_dict'             : 'interp_identitydict.W_IdentityDict',
         'debug_start'               : 'interp_debug.debug_start',
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
@@ -15,6 +15,14 @@
 def internal_repr(space, w_object):
     return space.newtext('%r' % (w_object,))
 
+def objects_in_repr(space):
+    """The identitydict of objects currently being repr().
+
+    This object is thread-local and can be used in a __repr__ method
+    to avoid recursion.
+    """
+    return space.get_objects_in_repr()
+
 
 def attach_gdb(space):
     """Run an interp-level gdb (or pdb when untranslated)"""
diff --git a/pypy/module/_collections/interp_deque.py b/pypy/module/_collections/interp_deque.py
--- a/pypy/module/_collections/interp_deque.py
+++ b/pypy/module/_collections/interp_deque.py
@@ -406,11 +406,7 @@
 
     def repr(self):
         space = self.space
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return dequerepr(space, w_currently_in_repr, self)
+        return dequerepr(space, space.get_objects_in_repr(), self)
 
     @specialize.arg(2)
     def compare(self, w_other, op):
@@ -523,18 +519,17 @@
 app = gateway.applevel("""
     def dequerepr(currently_in_repr, d):
         'The app-level part of repr().'
-        deque_id = id(d)
-        if deque_id in currently_in_repr:
+        if d in currently_in_repr:
             return '[...]'   # strange because it's a deque and this
                              # strongly suggests it's a list instead,
                              # but confirmed behavior from python-dev
         else:
-            currently_in_repr[deque_id] = 1
+            currently_in_repr[d] = 1
             try:
                 listrepr = "[" + ", ".join([repr(x) for x in d]) + ']'
             finally:
                 try:
-                    del currently_in_repr[deque_id]
+                    del currently_in_repr[d]
                 except:
                     pass
         if d.maxlen is None:
diff --git a/pypy/module/_collections/test/test_ordereddict.py b/pypy/module/_collections/test/test_ordereddict.py
--- a/pypy/module/_collections/test/test_ordereddict.py
+++ b/pypy/module/_collections/test/test_ordereddict.py
@@ -6,3 +6,9 @@
         from _collections import OrderedDict
         assert issubclass(OrderedDict, dict)
         assert hasattr(OrderedDict, 'move_to_end')
+
+    def test_recursive_repr(self):
+        from _collections import OrderedDict
+        d = OrderedDict()
+        d[1] = d
+        assert repr(d) == 'OrderedDict([(1, ...)])'
diff --git a/pypy/module/_io/interp_bufferedio.py b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -1035,7 +1035,12 @@
             raise oefmt(space.w_ValueError,
                         "I/O operation on uninitialized object")
         w_meth = space.getattr(self.w_reader, space.newtext("close"))
-        space.call_args(w_meth, __args__)
+        try:
+            space.call_args(w_meth, __args__)
+        except OperationError as e2:
+            if e:
+                e2.chain_exceptions(space, e)
+            e = e2
 
         if e:
             raise e
diff --git a/pypy/module/_io/interp_io.py b/pypy/module/_io/interp_io.py
--- a/pypy/module/_io/interp_io.py
+++ b/pypy/module/_io/interp_io.py
@@ -86,46 +86,61 @@
     if binary and newline is not None:
         raise oefmt(space.w_ValueError,
                     "binary mode doesn't take a newline argument")
-    w_raw = space.call_function(
-        space.gettypefor(W_FileIO), w_file, space.newtext(rawmode),
-        space.newbool(bool(closefd)), w_opener)
 
-    isatty = space.is_true(space.call_method(w_raw, "isatty"))
-    line_buffering = buffering == 1 or (buffering < 0 and isatty)
-    if line_buffering:
-        buffering = -1
+    w_result = None
+    try:
+        w_raw = space.call_function(
+            space.gettypefor(W_FileIO), w_file, space.newtext(rawmode),
+            space.newbool(bool(closefd)), w_opener)
+        w_result = w_raw
 
-    if buffering < 0:
-        buffering = space.c_int_w(space.getattr(w_raw, space.newtext("_blksize")))
+        isatty = space.is_true(space.call_method(w_raw, "isatty"))
+        line_buffering = buffering == 1 or (buffering < 0 and isatty)
+        if line_buffering:
+            buffering = -1
 
-    if buffering < 0:
-        raise oefmt(space.w_ValueError, "invalid buffering size")
+        if buffering < 0:
+            buffering = space.c_int_w(space.getattr(
+                w_raw, space.newtext("_blksize")))
 
-    if buffering == 0:
-        if not binary:
-            raise oefmt(space.w_ValueError, "can't have unbuffered text I/O")
-        return w_raw
+        if buffering < 0:
+            raise oefmt(space.w_ValueError, "invalid buffering size")
 
-    if updating:
-        buffer_cls = W_BufferedRandom
-    elif writing or creating or appending:
-        buffer_cls = W_BufferedWriter
-    elif reading:
-        buffer_cls = W_BufferedReader
-    else:
-        raise oefmt(space.w_ValueError, "unknown mode: '%s'", mode)
-    w_buffer = space.call_function(
-        space.gettypefor(buffer_cls), w_raw, space.newint(buffering)
-    )
-    if binary:
-        return w_buffer
+        if buffering == 0:
+            if not binary:
+                raise oefmt(space.w_ValueError,
+                            "can't have unbuffered text I/O")
+            return w_result
 
-    w_wrapper = space.call_function(space.gettypefor(W_TextIOWrapper),
-        w_buffer,
-        space.newtext_or_none(encoding),
-        space.newtext_or_none(errors),
-        space.newtext_or_none(newline),
-        space.newbool(line_buffering)
-    )
-    space.setattr(w_wrapper, space.newtext("mode"), space.newtext(mode))
-    return w_wrapper
+        if updating:
+            buffer_cls = W_BufferedRandom
+        elif writing or creating or appending:
+            buffer_cls = W_BufferedWriter
+        elif reading:
+            buffer_cls = W_BufferedReader
+        else:
+            raise oefmt(space.w_ValueError, "unknown mode: '%s'", mode)
+        w_buffer = space.call_function(
+            space.gettypefor(buffer_cls), w_raw, space.newint(buffering)
+        )
+        w_result = w_buffer
+        if binary:
+            return w_result
+
+        w_wrapper = space.call_function(space.gettypefor(W_TextIOWrapper),
+            w_buffer,
+            space.newtext_or_none(encoding),
+            space.newtext_or_none(errors),
+            space.newtext_or_none(newline),
+            space.newbool(line_buffering)
+        )
+        w_result = w_wrapper
+        space.setattr(w_wrapper, space.newtext("mode"), space.newtext(mode))
+        return w_result
+    except OperationError as e:
+        if w_result:
+            try:
+                space.call_method(w_result, "close")
+            except OperationError as e2:
+                e.chain_exceptions(space, e2)
+        raise
diff --git a/pypy/module/_io/interp_textio.py b/pypy/module/_io/interp_textio.py
--- a/pypy/module/_io/interp_textio.py
+++ b/pypy/module/_io/interp_textio.py
@@ -1,6 +1,6 @@
 import sys
 
-from pypy.interpreter.baseobjspace import W_Root
+from pypy.interpreter.baseobjspace import W_Root, BufferInterfaceNotFound
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.gateway import WrappedDefault, interp2app, unwrap_spec
 from pypy.interpreter.typedef import (
@@ -290,7 +290,7 @@
 
     try:
         w_locale = space.call_method(space.builtin, '__import__',
-                                     space.newtext('locale'))
+                                     space.newtext('_bootlocale'))
         w_encoding = space.call_method(w_locale, 'getpreferredencoding',
                                        space.w_False)
     except OperationError as e:
@@ -528,13 +528,20 @@
 
     def close_w(self, space):
         self._check_attached(space)
-        if not space.is_true(space.getattr(self.w_buffer,
-                                           space.newtext("closed"))):
+        if space.is_true(space.getattr(self.w_buffer,
+                                       space.newtext("closed"))):
+            return
+        try:
+            space.call_method(self, "flush")
+        except OperationError as e:
             try:
-                space.call_method(self, "flush")
-            finally:
                 ret = space.call_method(self.w_buffer, "close")
-            return ret
+            except OperationError as e2:
+                e2.chain_exceptions(space, e)
+            raise
+        else:
+            ret = space.call_method(self.w_buffer, "close")
+        return ret
 
     def _dealloc_warn_w(self, space, w_source):
         space.call_method(self.w_buffer, "_dealloc_warn", w_source)
@@ -584,6 +591,10 @@
             # Given this, we know there was a valid snapshot point
             # len(dec_buffer) bytes ago with decoder state (b'', dec_flags).
             w_dec_buffer, w_dec_flags = space.unpackiterable(w_state, 2)
+            if not space.isinstance_w(w_dec_buffer, space.w_bytes):
+                msg = "decoder getstate() should have returned a bytes " \
+                      "object not '%T'"
+                raise oefmt(space.w_TypeError, msg, w_dec_buffer)
             dec_buffer = space.bytes_w(w_dec_buffer)
             dec_flags = space.int_w(w_dec_flags)
         else:
@@ -591,16 +602,18 @@
             dec_flags = 0
 
         # Read a chunk, decode it, and put the result in self._decoded_chars
-        w_input = space.call_method(self.w_buffer,
-                                    "read1" if self.has_read1 else "read",
+        func_name = "read1" if self.has_read1 else "read"
+        w_input = space.call_method(self.w_buffer, func_name,
                                     space.newint(self.chunk_size))
 
-        if not space.isinstance_w(w_input, space.w_bytes):
-            msg = "decoder getstate() should have returned a bytes " \
-                  "object not '%T'"
-            raise oefmt(space.w_TypeError, msg, w_input)
+        try:
+            input_buf = w_input.buffer_w(space, space.BUF_SIMPLE)
+        except BufferInterfaceNotFound:
+            msg = ("underlying %s() should have returned a bytes-like "
+                   "object, not '%T'")
+            raise oefmt(space.w_TypeError, msg, func_name, w_input)
 
-        eof = space.len_w(w_input) == 0
+        eof = input_buf.getlength() == 0
         w_decoded = space.call_method(self.w_decoder, "decode",
                                       w_input, space.newbool(eof))
         check_decoded(space, w_decoded)
@@ -611,7 +624,7 @@
         if self.telling:
             # At the snapshot point, len(dec_buffer) bytes before the read,
             # the next input to be decoded is dec_buffer + input_chunk.
-            next_input = dec_buffer + space.bytes_w(w_input)
+            next_input = dec_buffer + input_buf.as_str()
             self.snapshot = PositionSnapshot(dec_flags, next_input)
 
         return not eof
@@ -788,9 +801,10 @@
             text = space.unicode_w(w_text)
 
         needflush = False
+        text_needflush = False
         if self.write_through:
-            needflush = True
-        elif self.line_buffering and (haslf or text.find(u'\r') >= 0):
+            text_needflush = True
+        if self.line_buffering and (haslf or text.find(u'\r') >= 0):
             needflush = True
 
         # XXX What if we were just reading?
@@ -807,7 +821,8 @@
         self.pending_bytes.append(b)
         self.pending_bytes_count += len(b)
 
-        if self.pending_bytes_count > self.chunk_size or needflush:
+        if (self.pending_bytes_count > self.chunk_size or
+            needflush or text_needflush):
             self._writeflush(space)
 
         if needflush:
@@ -863,14 +878,18 @@
                               space.newtuple([space.newbytes(""),
                                               space.newint(cookie.dec_flags)]))
 
-    def _encoder_setstate(self, space, cookie):
-        if cookie.start_pos == 0 and cookie.dec_flags == 0:
+    def _encoder_reset(self, space, start_of_stream):
+        if start_of_stream:
             space.call_method(self.w_encoder, "reset")
             self.encoding_start_of_stream = True
         else:
             space.call_method(self.w_encoder, "setstate", space.newint(0))
             self.encoding_start_of_stream = False
 
+    def _encoder_setstate(self, space, cookie):
+        self._encoder_reset(space,
+                            cookie.start_pos == 0 and cookie.dec_flags == 0)
+
     @unwrap_spec(whence=int)
     def seek_w(self, space, w_pos, whence=0):
         self._check_attached(space)
@@ -898,8 +917,13 @@
             self.snapshot = None
             if self.w_decoder:
                 space.call_method(self.w_decoder, "reset")
-            return space.call_method(self.w_buffer, "seek",
-                                     w_pos, space.newint(whence))
+            w_res = space.call_method(self.w_buffer, "seek",
+                                      w_pos, space.newint(whence))
+            if self.w_encoder:
+                # If seek() == 0, we are at the start of stream
+                start_of_stream = space.eq_w(w_res, space.newint(0))
+                self._encoder_reset(space, start_of_stream)
+            return w_res
 
         elif whence != 0:
             raise oefmt(space.w_ValueError,
diff --git a/pypy/module/_io/test/test_bufferedio.py b/pypy/module/_io/test/test_bufferedio.py
--- a/pypy/module/_io/test/test_bufferedio.py
+++ b/pypy/module/_io/test/test_bufferedio.py
@@ -291,6 +291,39 @@
         raises(_io.UnsupportedOperation, bufio.seek, 0)
         raises(_io.UnsupportedOperation, bufio.tell)
 
+    def test_bufio_write_through(self):
+        import _io as io
+        # Issue #21396: write_through=True doesn't force a flush()
+        # on the underlying binary buffered object.
+        flush_called, write_called = [], []
+        class BufferedWriter(io.BufferedWriter):
+            def flush(self, *args, **kwargs):
+                flush_called.append(True)
+                return super().flush(*args, **kwargs)
+            def write(self, *args, **kwargs):
+                write_called.append(True)
+                return super().write(*args, **kwargs)
+
+        rawio = io.BytesIO()
+        data = b"a"
+        bufio = BufferedWriter(rawio, len(data)*2)
+        textio = io.TextIOWrapper(bufio, encoding='ascii',
+                                  write_through=True)
+        # write to the buffered io but don't overflow the buffer
+        text = data.decode('ascii')
+        textio.write(text)
+
+        # buffer.flush is not called with write_through=True
+        assert not flush_called
+        # buffer.write *is* called with write_through=True
+        assert write_called
+        assert rawio.getvalue() == b"" # no flush
+
+        write_called = [] # reset
+        textio.write(text * 10) # total content is larger than bufio buffer
+        assert write_called
+        assert rawio.getvalue() == data * 11 # all flushed
+
 class AppTestBufferedReaderWithThreads(AppTestBufferedReader):
     spaceconfig = dict(usemodules=['_io', 'thread', 'time'])
 
@@ -707,6 +740,7 @@
         pair = _io.BufferedRWPair(reader, writer)
         err = raises(NameError, pair.close)
         assert 'reader_non_existing' in str(err.value)
+        assert 'writer_non_existing' in str(err.value.__context__)
         assert not pair.closed
         assert not reader.closed
         assert not writer.closed
diff --git a/pypy/module/_io/test/test_fileio.py b/pypy/module/_io/test/test_fileio.py
--- a/pypy/module/_io/test/test_fileio.py
+++ b/pypy/module/_io/test/test_fileio.py
@@ -302,6 +302,36 @@
             return -1
         raises(ValueError, _io.FileIO, "foo", 'r', opener=opener)
 
+    def test_seek_bom(self):
+        # The BOM is not written again when seeking manually
+        import _io
+        filename = self.tmpfile + '_x3'
+        for charset in ('utf-8-sig', 'utf-16', 'utf-32'):
+            with _io.open(filename, 'w', encoding=charset) as f:
+                f.write('aaa')
+                pos = f.tell()
+            with _io.open(filename, 'r+', encoding=charset) as f:
+                f.seek(pos)
+                f.write('zzz')
+                f.seek(0)
+                f.write('bbb')
+            with _io.open(filename, 'rb') as f:
+                assert f.read() == 'bbbzzz'.encode(charset)
+
+    def test_seek_append_bom(self):
+        # Same test, but first seek to the start and then to the end
+        import _io, os
+        filename = self.tmpfile + '_x3'
+        for charset in ('utf-8-sig', 'utf-16', 'utf-32'):
+            with _io.open(filename, 'w', encoding=charset) as f:
+                f.write('aaa')
+            with _io.open(filename, 'a', encoding=charset) as f:
+                f.seek(0)
+                f.seek(0, os.SEEK_END)
+                f.write('xxx')
+            with _io.open(filename, 'rb') as f:
+                assert f.read() == 'aaaxxx'.encode(charset)
+
 
 def test_flush_at_exit():
     from pypy import conftest
diff --git a/pypy/module/_io/test/test_io.py b/pypy/module/_io/test/test_io.py
--- a/pypy/module/_io/test/test_io.py
+++ b/pypy/module/_io/test/test_io.py
@@ -474,6 +474,22 @@
             assert f.mode == 'x'
         raises(FileExistsError, _io.open, filename, 'x')
 
+    def test_nonbuffered_textio(self):
+        import warnings, _io as io
+        filename = self.tmpfile + '_x2'
+        warnings.simplefilter("always", category=ResourceWarning)
+        with warnings.catch_warnings(record=True) as recorded:
+            raises(ValueError, io.open, filename, 'w', buffering=0)
+        assert recorded == []
+
+    def test_invalid_newline(self):
+        import warnings, _io as io
+        filename = self.tmpfile + '_x2'
+        warnings.simplefilter("always", category=ResourceWarning)
+        with warnings.catch_warnings(record=True) as recorded:
+            raises(ValueError, io.open, filename, 'w', newline='invalid')
+        assert recorded == []
+
 
 class AppTestIoAferClose:
     spaceconfig = dict(usemodules=['_io'])
diff --git a/pypy/module/_io/test/test_textio.py b/pypy/module/_io/test/test_textio.py
--- a/pypy/module/_io/test/test_textio.py
+++ b/pypy/module/_io/test/test_textio.py
@@ -1,5 +1,5 @@
 class AppTestTextIO:
-    spaceconfig = dict(usemodules=['_io', '_locale'])
+    spaceconfig = dict(usemodules=['_io', '_locale', 'array'])
 
     def setup_class(cls):
         from rpython.rlib.rarithmetic import INT_MAX, UINT_MAX
@@ -365,6 +365,22 @@
         raises(IOError, txt.close)  # exception not swallowed
         assert txt.closed
 
+    def test_close_error_on_close(self):
+        import _io as io
+        buffer = io.BytesIO(b'testdata')
+        def bad_flush():
+            raise OSError('flush')
+        def bad_close():
+            raise OSError('close')
+        buffer.close = bad_close
+        txt = io.TextIOWrapper(buffer, encoding="ascii")
+        txt.flush = bad_flush
+        err = raises(OSError, txt.close)
+        assert err.value.args == ('close',)
+        assert isinstance(err.value.__context__, OSError)
+        assert err.value.__context__.args == ('flush',)
+        assert not txt.closed
+
     def test_illegal_decoder(self):
         import _io
         raises(LookupError, _io.TextIOWrapper, _io.BytesIO(),
@@ -381,6 +397,38 @@
         t = _io.TextIOWrapper(NonbytesStream(u'a'))
         raises(TypeError, t.read)
 
+    def test_read_byteslike(self):
+        import _io as io
+        import array
+
+        class MemviewBytesIO(io.BytesIO):
+            '''A BytesIO object whose read method returns memoryviews
+               rather than bytes'''
+
+            def read1(self, len_):
+                return _to_memoryview(super().read1(len_))
+
+            def read(self, len_):
+                return _to_memoryview(super().read(len_))
+
+        def _to_memoryview(buf):
+            '''Convert bytes-object *buf* to a non-trivial memoryview'''
+
+            arr = array.array('i')
+            idx = len(buf) - len(buf) % arr.itemsize
+            arr.frombytes(buf[:idx])
+            return memoryview(arr)
+
+        r = MemviewBytesIO(b'Just some random string\n')
+        t = io.TextIOWrapper(r, 'utf-8')
+
+        # TextIOwrapper will not read the full string, because
+        # we truncate it to a multiple of the native int size
+        # so that we can construct a more complex memoryview.
+        bytes_val =  _to_memoryview(r.getvalue()).tobytes()
+
+        assert t.read(200) == bytes_val.decode('utf-8')
+
     def test_device_encoding(self):
         import os
         import sys
diff --git a/pypy/module/_posixsubprocess/_posixsubprocess.c b/pypy/module/_posixsubprocess/_posixsubprocess.c
--- a/pypy/module/_posixsubprocess/_posixsubprocess.c
+++ b/pypy/module/_posixsubprocess/_posixsubprocess.c
@@ -18,7 +18,19 @@
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
 #endif
+#if defined(HAVE_SYS_RESOURCE_H)
+#include <sys/resource.h>
+#endif
+#ifdef HAVE_DIRENT_H
 #include <dirent.h>
+#endif
+
+#if defined(__ANDROID__) && !defined(SYS_getdents64)
+/* Android doesn't expose syscalls, add the definition manually. */
+# include <sys/linux-syscalls.h>
+# define SYS_getdents64  __NR_getdents64
+#endif
+
 #include "_posixsubprocess.h"
 
 #if defined(sun)
@@ -38,11 +50,7 @@
 # define FD_DIR "/proc/self/fd"
 #endif
 
-#define POSIX_CALL(call)   if ((call) == -1) goto error
-
-
-/* Maximum file descriptor, initialized on module load. */
-static long max_fd;
+#define POSIX_CALL(call)   do { if ((call) == -1) goto error; } while (0)
 
 
 /* Convert ASCII to a positive int, no libc call. no overflow. -1 on error. */
@@ -75,7 +83,7 @@
     if (stat("/dev", &dev_stat) != 0)
         return 0;
     if (stat(FD_DIR, &dev_fd_stat) != 0)
-        return 0; 
+        return 0;
     if (dev_stat.st_dev == dev_fd_stat.st_dev)
         return 0;  /* / == /dev == /dev/fd means it is static. #fail */
     return 1;
@@ -130,15 +138,47 @@
 }
 
 
-/* Close all file descriptors in the range start_fd inclusive to
- * end_fd exclusive except for those in py_fds_to_keep.  If the
- * range defined by [start_fd, end_fd) is large this will take a
- * long time as it calls close() on EVERY possible fd.
+/* Get the maximum file descriptor that could be opened by this process.
+ * This function is async signal safe for use between fork() and exec().
+ */
+static long
+safe_get_max_fd(void)
+{
+    long local_max_fd;
+#if defined(__NetBSD__)
+    local_max_fd = fcntl(0, F_MAXFD);
+    if (local_max_fd >= 0)
+        return local_max_fd;
+#endif
+#if defined(HAVE_SYS_RESOURCE_H) && defined(__OpenBSD__)
+    struct rlimit rl;
+    /* Not on the POSIX async signal safe functions list but likely
+     * safe.  TODO - Someone should audit OpenBSD to make sure. */
+    if (getrlimit(RLIMIT_NOFILE, &rl) >= 0)
+        return (long) rl.rlim_max;
+#endif
+#ifdef _SC_OPEN_MAX
+    local_max_fd = sysconf(_SC_OPEN_MAX);
+    if (local_max_fd == -1)
+#endif
+        local_max_fd = 256;  /* Matches legacy Lib/subprocess.py behavior. */
+    return local_max_fd;
+}
+
+
+/* Close all file descriptors in the range from start_fd and higher
+ * except for those in py_fds_to_keep.  If the range defined by
+ * [start_fd, safe_get_max_fd()) is large this will take a long
+ * time as it calls close() on EVERY possible fd.
+ *
+ * It isn't possible to know for sure what the max fd to go up to
+ * is for processes with the capability of raising their maximum.
  */
 static void
-_close_fds_by_brute_force(int start_fd, int end_fd, long *py_fds_to_keep,
+_close_fds_by_brute_force(long start_fd, long *py_fds_to_keep,
 			  ssize_t num_fds_to_keep)
 {
+    long end_fd = safe_get_max_fd();
     ssize_t keep_seq_idx;
     int fd_num;
     /* As py_fds_to_keep is sorted we can loop through the list closing
@@ -148,13 +188,13 @@
         if (keep_fd < start_fd)
             continue;
         for (fd_num = start_fd; fd_num < keep_fd; ++fd_num) {
-            while (close(fd_num) < 0 && errno == EINTR);
+            close(fd_num);
         }
         start_fd = keep_fd + 1;
     }
     if (start_fd <= end_fd) {
         for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
-            while (close(fd_num) < 0 && errno == EINTR);
+            close(fd_num);
         }
     }
 }
@@ -175,8 +215,8 @@
    char           d_name[256];  /* Filename (null-terminated) */
 };
 
-/* Close all open file descriptors in the range start_fd inclusive to end_fd
- * exclusive. Do not close any in the sorted py_fds_to_keep list.
+/* Close all open file descriptors in the range from start_fd and higher
+ * Do not close any in the sorted py_fds_to_keep list.
  *
  * This version is async signal safe as it does not make any unsafe C library
  * calls, malloc calls or handle any locks.  It is _unfortunate_ to be forced
@@ -191,12 +231,10 @@
  * it with some cpp #define magic to work on other OSes as well if you want.
  */
 static void
-_close_open_fd_range_safe(int start_fd, int end_fd, long *py_fds_to_keep,
+_close_open_fds_safe(int start_fd, long *py_fds_to_keep,
 			  ssize_t num_fds_to_keep)
 {
     int fd_dir_fd;
-    if (start_fd >= end_fd)
-        return;
 #ifdef O_CLOEXEC
     fd_dir_fd = open(FD_DIR, O_RDONLY | O_CLOEXEC, 0);
 #else
@@ -211,8 +249,7 @@
 #endif
     if (fd_dir_fd == -1) {
         /* No way to get a list of open fds. */
-	_close_fds_by_brute_force(start_fd, end_fd, py_fds_to_keep,
-				  num_fds_to_keep);
+	_close_fds_by_brute_force(start_fd, py_fds_to_keep, num_fds_to_keep);
         return;
     } else {
         char buffer[sizeof(struct linux_dirent64)];
@@ -227,10 +264,10 @@
                 entry = (struct linux_dirent64 *)(buffer + offset);
                 if ((fd = _pos_int_from_ascii(entry->d_name)) < 0)
                     continue;  /* Not a number. */
-                if (fd != fd_dir_fd && fd >= start_fd && fd < end_fd &&
+                if (fd != fd_dir_fd && fd >= start_fd &&
                     !_is_fd_in_sorted_fd_sequence(
 			fd, py_fds_to_keep, num_fds_to_keep)) {
-                    while (close(fd) < 0 && errno == EINTR);
+                    close(fd);
                 }
             }
         }
@@ -238,13 +275,13 @@
     }
 }
 
-#define _close_open_fd_range _close_open_fd_range_safe
+#define _close_open_fds _close_open_fds_safe
 
 #else  /* NOT (defined(__linux__) && defined(HAVE_SYS_SYSCALL_H)) */
 
 
-/* Close all open file descriptors in the range start_fd inclusive to end_fd
- * exclusive. Do not close any in the sorted py_fds_to_keep list.
+/* Close all open file descriptors from start_fd and higher.
+ * Do not close any in the sorted py_fds_to_keep list.
  *
  * This function violates the strict use of async signal safe functions. :(
  * It calls opendir(), readdir() and closedir().  Of these, the one most
@@ -257,26 +294,21 @@
  *   http://womble.decadent.org.uk/readdir_r-advisory.html
  */
 static void
-_close_open_fd_range_maybe_unsafe(int start_fd, int end_fd,
-                                  long *py_fds_to_keep, ssize_t num_fds_to_keep)
+_close_open_fds_maybe_unsafe(long start_fd,
+			     long *py_fds_to_keep, ssize_t num_fds_to_keep)
 {
     DIR *proc_fd_dir;
 #ifndef HAVE_DIRFD
-    while (_is_fd_in_sorted_fd_sequence(start_fd, py_fds_to_keep, num_fds_to_keep) &&
-           (start_fd < end_fd)) {
+    while (_is_fd_in_sorted_fd_sequence(start_fd, py_fds_to_keep, num_fds_to_keep)) {
         ++start_fd;
     }
-    if (start_fd >= end_fd)
-        return;
     /* Close our lowest fd before we call opendir so that it is likely to
      * reuse that fd otherwise we might close opendir's file descriptor in
      * our loop.  This trick assumes that fd's are allocated on a lowest
      * available basis. */
-    while (close(start_fd) < 0 && errno == EINTR);
+    close(start_fd);
     ++start_fd;
 #endif
-    if (start_fd >= end_fd)
-        return;
 
 #if defined(__FreeBSD__)
     if (!_is_fdescfs_mounted_on_dev_fd())
@@ -286,7 +318,7 @@
         proc_fd_dir = opendir(FD_DIR);
     if (!proc_fd_dir) {
         /* No way to get a list of open fds. */
-        _close_fds_by_brute_force(start_fd, end_fd, py_fds_to_keep, num_fds_to_keep);
+        _close_fds_by_brute_force(start_fd, py_fds_to_keep, num_fds_to_keep);
     } else {
         struct dirent *dir_entry;
 #ifdef HAVE_DIRFD
@@ -299,22 +331,22 @@
             int fd;
             if ((fd = _pos_int_from_ascii(dir_entry->d_name)) < 0)
                 continue;  /* Not a number. */
-            if (fd != fd_used_by_opendir && fd >= start_fd && fd < end_fd &&
+            if (fd != fd_used_by_opendir && fd >= start_fd &&
                 !_is_fd_in_sorted_fd_sequence(fd, py_fds_to_keep, num_fds_to_keep)) {
-                while (close(fd) < 0 && errno == EINTR);
+                close(fd);
             }
             errno = 0;
         }
         if (errno) {
             /* readdir error, revert behavior. Highly Unlikely. */
             _close_fds_by_brute_force(
-		start_fd, end_fd, py_fds_to_keep, num_fds_to_keep);
+		start_fd, py_fds_to_keep, num_fds_to_keep);
         }
         closedir(proc_fd_dir);
     }
 }
 
-#define _close_open_fd_range _close_open_fd_range_maybe_unsafe
+#define _close_open_fds _close_open_fds_maybe_unsafe
 
 #endif  /* else NOT (defined(__linux__) && defined(HAVE_SYS_SYSCALL_H)) */
 
@@ -357,15 +389,12 @@
         goto error;
 
     /* Close parent's pipe ends. */
-    if (p2cwrite != -1) {
+    if (p2cwrite != -1)
         POSIX_CALL(close(p2cwrite));
-    }
-    if (c2pread != -1) {
+    if (c2pread != -1)
         POSIX_CALL(close(c2pread));
-    }
-    if (errread != -1) {
+    if (errread != -1)
         POSIX_CALL(close(errread));
-    }
     POSIX_CALL(close(errpipe_read));
 
     /* When duping fds, if there arises a situation where one of the fds is
@@ -401,15 +430,12 @@
 
     /* Close pipe fds.  Make sure we don't close the same fd more than */
     /* once, or standard fds. */
-    if (p2cread > 2) {
+    if (p2cread > 2)
         POSIX_CALL(close(p2cread));
-    }
-    if (c2pwrite > 2 && c2pwrite != p2cread) {
+    if (c2pwrite > 2 && c2pwrite != p2cread)
         POSIX_CALL(close(c2pwrite));
-    }
-    if (errwrite != c2pwrite && errwrite != p2cread && errwrite > 2) {
+    if (errwrite != c2pwrite && errwrite != p2cread && errwrite > 2)
         POSIX_CALL(close(errwrite));
-    }
 
     if (cwd)
         POSIX_CALL(chdir(cwd));
@@ -441,14 +467,8 @@
 
     /* close FDs after executing preexec_fn, which might open FDs */
     if (close_fds) {
-        int local_max_fd = max_fd;
-#if defined(__NetBSD__)
-        local_max_fd = fcntl(0, F_MAXFD);
-        if (local_max_fd < 0)
-            local_max_fd = max_fd;
-#endif
         /* TODO HP-UX could use pstat_getproc() if anyone cares about it. */
-        _close_open_fd_range(3, local_max_fd, py_fds_to_keep, num_fds_to_keep);
+        _close_open_fds(3, py_fds_to_keep, num_fds_to_keep);
     }
 
     /* This loop matches the Lib/os.py _execvpe()'s PATH search when */
@@ -491,7 +511,7 @@
         /* We can't call strerror(saved_errno).  It is not async signal safe.
          * The parent process will look the error message up. */
     } else {
-        unused = write(errpipe_write, "RuntimeError:0:", 15);
+        unused = write(errpipe_write, "SubprocessError:0:", 18);
         unused = write(errpipe_write, err_msg, strlen(err_msg));
     }
     if (unused) return;  /* silly? yes! avoids gcc compiler warning. */
@@ -579,9 +599,4 @@
 void
 pypy_subprocess_init(void)
 {
-#ifdef _SC_OPEN_MAX
-    max_fd = sysconf(_SC_OPEN_MAX);
-    if (max_fd == -1)
-#endif
-        max_fd = 256;  /* Matches Lib/subprocess.py */
 }
diff --git a/pypy/module/_posixsubprocess/interp_subprocess.py b/pypy/module/_posixsubprocess/interp_subprocess.py
--- a/pypy/module/_posixsubprocess/interp_subprocess.py
+++ b/pypy/module/_posixsubprocess/interp_subprocess.py
@@ -36,6 +36,15 @@
 if config['HAVE_SETSID']:
     compile_extra.append("-DHAVE_SETSID")
 
+class CConfig:
+    _compilation_info_ = ExternalCompilationInfo(includes=['dirent.h'])
+    HAVE_DIRENT_H = platform.Has("opendir")
+
+config = platform.configure(CConfig)
+
+if config['HAVE_DIRENT_H']:
+    compile_extra.append("-DHAVE_DIRENT_H")
+
 eci = eci.merge(
     rposix.eci_inheritable,
     ExternalCompilationInfo(
diff --git a/pypy/module/_vmprof/test/test_direct.py b/pypy/module/_vmprof/test/test_direct.py
--- a/pypy/module/_vmprof/test/test_direct.py
+++ b/pypy/module/_vmprof/test/test_direct.py
@@ -1,4 +1,4 @@
-
+import sys
 import py
 try:
     import cffi
@@ -7,6 +7,7 @@
 
 from rpython.rlib import rvmprof
 srcdir = py.path.local(rvmprof.__file__).join("..", "src")
+shareddir = srcdir.join('shared')
 
 ffi = cffi.FFI()
 ffi.cdef("""
@@ -43,7 +44,7 @@
 }
 
 
-""" + open(str(srcdir.join("shared/vmprof_get_custom_offset.h"))).read(), include_dirs=[str(srcdir)])
+""" + open(str(srcdir.join("shared/vmprof_get_custom_offset.h"))).read(), include_dirs=[str(srcdir), str(shareddir)])
 
 class TestDirect(object):
     def test_infrastructure(self):
diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -419,11 +419,11 @@
     """
     while True:
         try:
-            res = rposix.posix_fadvise(fd, offset, length, advice)
+            rposix.posix_fadvise(fd, offset, length, advice)
         except OSError as e:
             wrap_oserror(space, e, eintr_retry=True)
         else:
-            return space.newint(res)
+            return
 
 # ____________________________________________________________
 
diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/test_posix2.py
--- a/pypy/module/posix/test/test_posix2.py
+++ b/pypy/module/posix/test/test_posix2.py
@@ -862,23 +862,19 @@
 
     if hasattr(rposix, 'posix_fadvise'):
         def test_os_posix_fadvise(self):
-            posix, os = self.posix, self.os
-            localdir = os.getcwd()
-            os.mkdir(self.path2 + 'test_os_posix_fadvise')
+            posix = self.posix
+            fd = posix.open(self.path2 + 'test_os_posix_fadvise', posix.O_CREAT | posix.O_RDWR)
             try:
-                fd = os.open(self.path2 + 'test_os_posix_fadvise', os.O_RDONLY)
-                try:
-                    mypath = os.getcwd()
-                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_WILLNEED) == 0
-                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_NORMAL) == 0
-                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_SEQUENTIAL) == 0
-                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_RANDOM) == 0
-                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_NOREUSE) == 0
-                    assert posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_DONTNEED) == 0
-                finally:
-                    os.close(fd)
+                posix.write(fd, b"foobar")
+                assert posix.posix_fadvise(fd, 0, 1, posix.POSIX_FADV_WILLNEED) is None
+                assert posix.posix_fadvise(fd, 1, 1, posix.POSIX_FADV_NORMAL) is None
+                assert posix.posix_fadvise(fd, 2, 1, posix.POSIX_FADV_SEQUENTIAL) is None
+                assert posix.posix_fadvise(fd, 3, 1, posix.POSIX_FADV_RANDOM) is None
+                assert posix.posix_fadvise(fd, 4, 1, posix.POSIX_FADV_NOREUSE) is None
+                assert posix.posix_fadvise(fd, 5, 1, posix.POSIX_FADV_DONTNEED) is None
+                raises(OSError, posix.posix_fadvise, fd, 6, 1, 1234567)
             finally:
-                os.chdir(localdir)
+                posix.close(fd)
 
     if hasattr(rposix, 'posix_fallocate'):
         def test_os_posix_posix_fallocate(self):
diff --git a/pypy/module/sys/app.py b/pypy/module/sys/app.py
--- a/pypy/module/sys/app.py
+++ b/pypy/module/sys/app.py
@@ -3,7 +3,7 @@
 The 'sys' module.
 """
 
-from _structseq import structseqtype, structseqfield
+from _structseq import structseqtype, structseqfield, SimpleNamespace
 import sys
 import _imp
 
@@ -111,41 +111,6 @@
 null__xoptions = {}
 
 
-class SimpleNamespace:
-    """A simple attribute-based namespace.
-
-SimpleNamespace(**kwargs)"""
-
-    def __init__(self, **kwargs):
-        self.__dict__.update(kwargs)
-
-    def __repr__(self):
-        ident = id(self)
-        if ident in sns_recurse:
-            return "namespace(...)"
-        sns_recurse.add(ident)
-        try:
-            pairs = ('%s=%r' % item for item in sorted(self.__dict__.items()))
-            return "namespace(%s)" % ', '.join(pairs)
-        finally:
-            sns_recurse.discard(ident)
-
-    def __eq__(self, other):
-        if issubclass(type(other), SimpleNamespace):
-            return self.__dict__ == other.__dict__
-        return NotImplemented
-
-    def __ne__(self, other):
-        if issubclass(type(other), SimpleNamespace):
-            return self.__dict__ != other.__dict__
-        return NotImplemented
-
-sns_recurse = set()
-
-# This class is not exposed in sys, but by the types module.
-SimpleNamespace.__module__ = 'types'
-
-
 implementation = SimpleNamespace(
     name='pypy',
     version=sys.version_info,
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py b/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
@@ -596,3 +596,37 @@
 
         get_data.errcheck = ret_list_p(1)
         assert get_data('testing!') == [-1, -2, -3, -4]
+
+    def test_issue2533(self):
+        import cffi
+        ffi = cffi.FFI()
+        ffi.cdef("int **fetchme(void);")
+        ffi.set_source("_x_cffi", """
+            int **fetchme(void)
+            {
+                static int a = 42;
+                static int *pa = &a;
+                return &pa;
+            }
+        """)
+        from rpython.tool.udir import udir
+        ffi.compile(verbose=True, tmpdir=str(udir))
+
+        import sys
+        sys.path.insert(0, str(udir))
+        try:
+            from _x_cffi import ffi, lib
+        finally:
+            sys.path.pop(0)
+        fetchme = ffi.addressof(lib, 'fetchme')
+        fetchme = int(ffi.cast("intptr_t", fetchme))
+
+        FN = CFUNCTYPE(POINTER(POINTER(c_int)))
+        ff = cast(fetchme, FN)
+
+        g = ff()
+        assert g.contents.contents.value == 42
+
+        h = c_int(43)
+        g[0] = pointer(h)     # used to crash here
+        assert g.contents.contents.value == 43
diff --git a/pypy/module/time/app_time.py b/pypy/module/time/app_time.py
--- a/pypy/module/time/app_time.py
+++ b/pypy/module/time/app_time.py
@@ -1,7 +1,6 @@
 # NOT_RPYTHON
 
-from _structseq import structseqtype, structseqfield
-from types import SimpleNamespace
+from _structseq import structseqtype, structseqfield, SimpleNamespace
 import time
 
 class struct_time(metaclass=structseqtype):
diff --git a/pypy/objspace/std/dictmultiobject.py b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -143,11 +143,7 @@
         init_or_update(space, self, __args__, 'dict')
 
     def descr_repr(self, space):
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return dictrepr(space, w_currently_in_repr, self)
+        return dictrepr(space, space.get_objects_in_repr(), self)
 
     def descr_eq(self, space, w_other):
         if space.is_w(self, w_other):
@@ -404,10 +400,9 @@
     def dictrepr(currently_in_repr, d):
         if len(d) == 0:
             return "{}"
-        dict_id = id(d)
-        if dict_id in currently_in_repr:
+        if d in currently_in_repr:
             return '{...}'
-        currently_in_repr[dict_id] = 1
+        currently_in_repr[d] = 1
         try:
             items = []
             # XXX for now, we cannot use items() without list at
@@ -419,7 +414,7 @@
             return "{" +  ', '.join(items) + "}"
         finally:
             try:
-                del currently_in_repr[dict_id]
+                del currently_in_repr[d]
             except:
                 pass
 ''', filename=__file__)
diff --git a/pypy/objspace/std/listobject.py b/pypy/objspace/std/listobject.py
--- a/pypy/objspace/std/listobject.py
+++ b/pypy/objspace/std/listobject.py
@@ -23,6 +23,7 @@
     WrappedDefault, applevel, interp2app, unwrap_spec)
 from pypy.interpreter.signature import Signature
 from pypy.interpreter.typedef import TypeDef
+from pypy.interpreter.miscutils import StringSort
 from pypy.objspace.std.bytesobject import W_BytesObject
 from pypy.objspace.std.floatobject import W_FloatObject
 from pypy.objspace.std.intobject import W_IntObject
@@ -438,11 +439,7 @@
     def descr_repr(self, space):
         if self.length() == 0:
             return space.newtext('[]')
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return listrepr(space, w_currently_in_repr, self)
+        return listrepr(space, space.get_objects_in_repr(), self)
 
     def descr_eq(self, space, w_other):
         if not isinstance(w_other, W_ListObject):
@@ -2014,15 +2011,14 @@
 app = applevel("""
     def listrepr(currently_in_repr, l):
         'The app-level part of repr().'
-        list_id = id(l)
-        if list_id in currently_in_repr:
+        if l in currently_in_repr:
             return '[...]'
-        currently_in_repr[list_id] = 1
+        currently_in_repr[l] = 1
         try:
             return "[" + ", ".join([repr(x) for x in l]) + ']'
         finally:
             try:
-                del currently_in_repr[list_id]
+                del currently_in_repr[l]
             except:
                 pass
 """, filename=__file__)
@@ -2039,7 +2035,6 @@
 IntBaseTimSort = make_timsort_class()
 FloatBaseTimSort = make_timsort_class()
 IntOrFloatBaseTimSort = make_timsort_class()
-StringBaseTimSort = make_timsort_class()
 UnicodeBaseTimSort = make_timsort_class()
 
 
@@ -2076,11 +2071,6 @@
         return fa < fb
 
 
-class StringSort(StringBaseTimSort):
-    def lt(self, a, b):
-        return a < b
-
-
 class UnicodeSort(UnicodeBaseTimSort):
     def lt(self, a, b):
         return a < b
diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objspace/std/objspace.py
@@ -126,6 +126,14 @@
         ec._py_repr = None
         return ec
 
+    def get_objects_in_repr(self):
+        from pypy.module.__pypy__.interp_identitydict import W_IdentityDict
+        ec = self.getexecutioncontext()
+        w_currently_in_repr = ec._py_repr
+        if w_currently_in_repr is None:
+            w_currently_in_repr = ec._py_repr = W_IdentityDict(self)
+        return w_currently_in_repr
+
     def gettypefor(self, cls):
         return self.gettypeobject(cls.typedef)
 
diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py
--- a/pypy/objspace/std/setobject.py
+++ b/pypy/objspace/std/setobject.py
@@ -165,11 +165,7 @@
         _initialize_set(space, self, w_iterable)
 
     def descr_repr(self, space):
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return setrepr(space, w_currently_in_repr, self)
+        return setrepr(space, space.get_objects_in_repr(), self)
 
     def descr_eq(self, space, w_other):
         if isinstance(w_other, W_BaseSetObject):
@@ -1700,10 +1696,9 @@
 app = gateway.applevel("""
     def setrepr(currently_in_repr, s):
         'The app-level part of repr().'
-        set_id = id(s)
-        if set_id in currently_in_repr:
+        if s in currently_in_repr:
             return '%s(...)' % (s.__class__.__name__,)
-        currently_in_repr[set_id] = 1
+        currently_in_repr[s] = 1
         try:
             if not s:
                 return '%s()' % (s.__class__.__name__,)
@@ -1714,7 +1709,7 @@
                 return '%s({%s})' % (s.__class__.__name__, listrepr[1:-1])
         finally:
             try:
-                del currently_in_repr[set_id]
+                del currently_in_repr[s]
             except:
                 pass
 """, filename=__file__)
diff --git a/pypy/objspace/std/sliceobject.py b/pypy/objspace/std/sliceobject.py
--- a/pypy/objspace/std/sliceobject.py
+++ b/pypy/objspace/std/sliceobject.py
@@ -253,7 +253,7 @@
 
 
 app = gateway.applevel("""
-    from operator import index
+    from _operator import index
 
     def evaluate_slice_index(x):
         try:
diff --git a/pypy/objspace/std/typeobject.py b/pypy/objspace/std/typeobject.py
--- a/pypy/objspace/std/typeobject.py
+++ b/pypy/objspace/std/typeobject.py
@@ -1087,7 +1087,7 @@
     return w_name.text_w(space)
 
 def create_all_slots(w_self, hasoldstylebase, w_bestbase, force_new_layout):
-    from pypy.objspace.std.listobject import StringSort
+    from pypy.interpreter.miscutils import string_sort
 
     base_layout = w_bestbase.layout
     index_next_extra_slot = base_layout.nslots
@@ -1120,8 +1120,7 @@
             else:
                 newslotnames.append(slot_name)
         # Sort the list of names collected so far
-        sorter = StringSort(newslotnames, len(newslotnames))
-        sorter.sort()
+        string_sort(newslotnames)
         # Try to create all slots in order.  The creation of some of
         # them might silently fail; then we delete the name from the
         # list.  At the end, 'index_next_extra_slot' has been advanced
diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -241,12 +241,14 @@
             zf.close()
         else:
             archive = str(builddir.join(name + '.tar.bz2'))
-            if sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
+            if sys.platform == 'darwin':
                 print >>sys.stderr, """Warning: tar on current platform does not suport overriding the uid and gid
 for its contents. The tarball will contain your uid and gid. If you are
 building the actual release for the PyPy website, you may want to be
 using another platform..."""
                 e = os.system('tar --numeric-owner -cvjf ' + archive + " " + name)
+            elif sys.platform.startswith('freebsd'):
+                e = os.system('tar --uname=root --gname=wheel -cvjf ' + archive + " " + name)
             elif sys.platform == 'cygwin':
                 e = os.system('tar --owner=Administrator --group=Administrators --numeric-owner -cvjf ' + archive + " " + name)
             else:
diff --git a/rpython/jit/backend/llsupport/asmmemmgr.py b/rpython/jit/backend/llsupport/asmmemmgr.py
--- a/rpython/jit/backend/llsupport/asmmemmgr.py
+++ b/rpython/jit/backend/llsupport/asmmemmgr.py
@@ -250,7 +250,7 @@
         return self.rawstart
 
     def overwrite(self, index, char):
-        assert 0 <= index < self.get_relative_pos()
+        assert 0 <= index < self.get_relative_pos(break_basic_block=False)
         block = self._cursubblock
         index -= self._baserelpos
         while index < 0:
@@ -264,7 +264,8 @@
         self.overwrite(index + 2, chr((val >> 16) & 0xff))
         self.overwrite(index + 3, chr((val >> 24) & 0xff))
 
-    def get_relative_pos(self):
+    def get_relative_pos(self, break_basic_block=True):
+        # 'break_basic_block' is only used in x86
         return self._baserelpos + self._cursubindex
 
     def copy_to_raw_memory(self, addr):
@@ -288,7 +289,7 @@
         HEX = '0123456789ABCDEF'
         dump = []
         src = rffi.cast(rffi.CCHARP, addr)
-        end = self.get_relative_pos()
+        end = self.get_relative_pos(break_basic_block=False)
         if count != -1:
             end = offset + count
         for p in range(offset, end):
@@ -336,17 +337,20 @@
 
     def _become_a_plain_block_builder(self):
         # hack purely for speed of tests
-        self._data = []
-        self.writechar = self._data.append
-        self.overwrite = self._data.__setitem__
-        self.get_relative_pos = self._data.__len__
+        self._data = _data = []
+        self.writechar = _data.append
+        self.overwrite = _data.__setitem__
+        def get_relative_pos(break_basic_block=True):
+            return len(_data)
+        self.get_relative_pos = get_relative_pos
         def plain_copy_to_raw_memory(addr):
             dst = rffi.cast(rffi.CCHARP, addr)
-            for i, c in enumerate(self._data):
+            for i, c in enumerate(_data):
                 dst[i] = c
         self._copy_to_raw_memory = plain_copy_to_raw_memory
 
     def insert_gcroot_marker(self, mark):
         if self.gcroot_markers is None:
             self.gcroot_markers = []
-        self.gcroot_markers.append((self.get_relative_pos(), mark))
+        self.gcroot_markers.append(
+            (self.get_relative_pos(break_basic_block=False), mark))
diff --git a/rpython/jit/backend/llsupport/assembler.py b/rpython/jit/backend/llsupport/assembler.py
--- a/rpython/jit/backend/llsupport/assembler.py
+++ b/rpython/jit/backend/llsupport/assembler.py
@@ -265,14 +265,16 @@
 
     def enter_portal_frame(self, op):
         if self.cpu.HAS_CODEMAP:
+            pos = self.mc.get_relative_pos(break_basic_block=False)
             self.codemap_builder.enter_portal_frame(op.getarg(0).getint(),
                                                     op.getarg(1).getint(),
-                                                    self.mc.get_relative_pos())
+                                                    pos)
 
     def leave_portal_frame(self, op):
         if self.cpu.HAS_CODEMAP:
+            pos = self.mc.get_relative_pos(break_basic_block=False)
             self.codemap_builder.leave_portal_frame(op.getarg(0).getint(),
-                                                    self.mc.get_relative_pos())
+                                                    pos)
 
     def call_assembler(self, op, argloc, vloc, result_loc, tmploc):
         """
diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -76,6 +76,7 @@
         BaseAssembler.setup(self, looptoken)
         assert self.memcpy_addr != 0, "setup_once() not called?"
         self.current_clt = looptoken.compiled_loop_token
+        self.pending_slowpaths = []
         self.pending_guard_tokens = []
         if WORD == 8:
             self.pending_memoryerror_trampoline_from = []
@@ -95,6 +96,7 @@
             self.pending_memoryerror_trampoline_from = None
         self.mc = None
         self.current_clt = None
+        self.frame_depth_to_patch = None
 
     def _build_float_constants(self):
         # 0x80000000000000008000000000000000
@@ -181,6 +183,7 @@
         """ This builds a general call slowpath, for whatever call happens to
         come.
         """
+        self.pending_slowpaths = []
         mc = codebuf.MachineCodeBlockWrapper()
         # copy registers to the frame, with the exception of the
         # 'cond_call_register_arguments' and eax, because these have already

From pypy.commits at gmail.com  Thu Apr 20 10:03:00 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Thu, 20 Apr 2017 07:03:00 -0700 (PDT)
Subject: [pypy-commit] pypy vmprof-0.4.4: implement #123,
 vmprof.get_profile_path and vmprof.is_enabled, test is_enabled
Message-ID: <58f8bf94.cc9bdf0a.b2b4d.c442@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: vmprof-0.4.4
Changeset: r91097:a5a64f8ac679
Date: 2017-04-20 09:54 -0400
http://bitbucket.org/pypy/pypy/changeset/a5a64f8ac679/

Log:	implement #123, vmprof.get_profile_path and vmprof.is_enabled, test
	is_enabled

diff --git a/pypy/module/_vmprof/__init__.py b/pypy/module/_vmprof/__init__.py
--- a/pypy/module/_vmprof/__init__.py
+++ b/pypy/module/_vmprof/__init__.py
@@ -12,6 +12,8 @@
         'enable': 'interp_vmprof.enable',
         'disable': 'interp_vmprof.disable',
         'write_all_code_objects': 'interp_vmprof.write_all_code_objects',
+        'is_enabled': 'interp_vmprof.is_enabled',
+        'get_profile_path': 'interp_vmprof.get_profile_path',
         'VMProfError': 'space.fromcache(interp_vmprof.Cache).w_VMProfError',
     }
 
diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -4,6 +4,7 @@
 from pypy.interpreter.pycode import PyCode
 from pypy.interpreter.baseobjspace import W_Root
 from rpython.rlib import rvmprof, jit
+from pypy.interpreter.error import oefmt
 
 # ____________________________________________________________
 
@@ -82,3 +83,16 @@
         rvmprof.disable()
     except rvmprof.VMProfError as e:
         raise VMProfError(space, e)
+
+def is_enabled(space):
+    return space.newbool(rvmprof.is_enabled())
+
+def get_profile_path(space):
+    path = rvmprof.get_profile_path(space)
+    if path is None:
+        # profiling is not enabled
+        return space.w_None
+    if path == "":
+        # Indicates an error! Assume platform does not implement the function call
+        raise oefmt(space.w_NotImplementedError, "platform not implemented")
+    return space.newtext(path)
diff --git a/pypy/module/_vmprof/test/test__vmprof.py b/pypy/module/_vmprof/test/test__vmprof.py
--- a/pypy/module/_vmprof/test/test__vmprof.py
+++ b/pypy/module/_vmprof/test/test__vmprof.py
@@ -94,3 +94,12 @@
         raises(_vmprof.VMProfError, _vmprof.enable, 2, 1e300 * 1e300, 0, 0, 0)
         NaN = (1e300*1e300) / (1e300*1e300)
         raises(_vmprof.VMProfError, _vmprof.enable, 2, NaN, 0, 0, 0)
+
+    def test_is_enabled(self):
+        import _vmprof
+        tmpfile = open(self.tmpfilename, 'wb')
+        assert _vmprof.is_enabled() is False
+        _vmprof.enable(tmpfile.fileno(), 0.01, 0, 0, 0)
+        assert _vmprof.is_enabled() is True
+        _vmprof.disable()
+        assert _vmprof.is_enabled() is False
diff --git a/rpython/rlib/rvmprof/__init__.py b/rpython/rlib/rvmprof/__init__.py
--- a/rpython/rlib/rvmprof/__init__.py
+++ b/rpython/rlib/rvmprof/__init__.py
@@ -3,6 +3,7 @@
 from rpython.rlib.rvmprof.rvmprof import vmprof_execute_code, MAX_FUNC_NAME
 from rpython.rlib.rvmprof.rvmprof import _was_registered
 from rpython.rlib.rvmprof.cintf import VMProfPlatformUnsupported
+from rpython.rtyper.lltypesystem import rffi
 
 #
 # See README.txt.
@@ -37,3 +38,22 @@
 
 def disable():
     _get_vmprof().disable()
+
+def is_enabled():
+    vmp = _get_vmprof()
+    return vmp.is_enabled
+
+def get_profile_path(space):
+    vmp = _get_vmprof()
+    if not vmp.is_enabled:
+        return None
+
+    buflen = 4096
+    with rffi.scoped_alloc_buffer(buflen) as buf:
+        length = vmp.cintf.vmprof_get_profile_path(buf, buflen)
+        if length == -1:
+            return ""
+        return rffi.charp2strn(buf, length)
+
+    return None
+
diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -107,6 +107,10 @@
                                   lltype.Signed, compilation_info=eci,
                                   _nowrapper=True)
 
+    vmprof_get_profile_path = rffi.llexternal("vmprof_get_profile_path", [rffi.CCHARP, lltype.Signed],
+                                              lltype.Signed, compilation_info=eci,
+                                              _nowrapper=True)
+
     return CInterface(locals())
 
 
diff --git a/rpython/rlib/rvmprof/rvmprof.py b/rpython/rlib/rvmprof/rvmprof.py
--- a/rpython/rlib/rvmprof/rvmprof.py
+++ b/rpython/rlib/rvmprof/rvmprof.py
@@ -178,23 +178,6 @@
     arguments given to the decorated function.
 
     'result_class' is ignored (backward compatibility).
-
-    ====================================
-    TRANSLATION NOTE CALL THIS ONLY ONCE
-    ====================================
-
-    This function can only be called once during translation.
-    It generates a C function called __vmprof_eval_vmprof which is used by
-    the vmprof C source code and is bound as an extern function.
-    This is necessary while walking the native stack.
-    If you see __vmprof_eval_vmprof defined twice during
-    translation, read on:
-
-    To remove this restriction do the following:
-
-    *) Extend the macro IS_VMPROF_EVAL in the vmprof source repo to check several
-       sybmols.
-    *) Give each function provided to this decorator a unique symbol name in C
     """
     if _hack_update_stack_untranslated:
         from rpython.rtyper.annlowlevel import llhelper

From pypy.commits at gmail.com  Thu Apr 20 10:03:02 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Thu, 20 Apr 2017 07:03:02 -0700 (PDT)
Subject: [pypy-commit] pypy vmprof-0.4.4: test and fix get_profile_path for
 pypy
Message-ID: <58f8bf96.d2571c0a.4d670.dd5c@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: vmprof-0.4.4
Changeset: r91098:b289c381ebfa
Date: 2017-04-20 10:01 -0400
http://bitbucket.org/pypy/pypy/changeset/b289c381ebfa/

Log:	test and fix get_profile_path for pypy

diff --git a/pypy/module/_vmprof/test/test__vmprof.py b/pypy/module/_vmprof/test/test__vmprof.py
--- a/pypy/module/_vmprof/test/test__vmprof.py
+++ b/pypy/module/_vmprof/test/test__vmprof.py
@@ -103,3 +103,15 @@
         assert _vmprof.is_enabled() is True
         _vmprof.disable()
         assert _vmprof.is_enabled() is False
+
+    def test_get_profile_path(self):
+        import _vmprof
+        tmpfile = open(self.tmpfilename, 'wb')
+        assert _vmprof.get_profile_path() is None
+        _vmprof.enable(tmpfile.fileno(), 0.01, 0, 0, 0)
+        path = _vmprof.get_profile_path()
+        if path != tmpfile.name:
+            with open(path, "rb") as fd1:
+                assert fd1.read() == tmpfile.read()
+        _vmprof.disable()
+        assert _vmprof.get_profile_path() is None
diff --git a/rpython/rlib/rvmprof/__init__.py b/rpython/rlib/rvmprof/__init__.py
--- a/rpython/rlib/rvmprof/__init__.py
+++ b/rpython/rlib/rvmprof/__init__.py
@@ -48,12 +48,11 @@
     if not vmp.is_enabled:
         return None
 
-    buflen = 4096
-    with rffi.scoped_alloc_buffer(buflen) as buf:
-        length = vmp.cintf.vmprof_get_profile_path(buf, buflen)
+    with rffi.scoped_alloc_buffer(4096) as buf:
+        length = vmp.cintf.vmprof_get_profile_path(buf.raw, buf.size) 
         if length == -1:
             return ""
-        return rffi.charp2strn(buf, length)
+        return buf.str(length)
 
     return None
 
diff --git a/rpython/rlib/rvmprof/src/rvmprof.c b/rpython/rlib/rvmprof/src/rvmprof.c
--- a/rpython/rlib/rvmprof/src/rvmprof.c
+++ b/rpython/rlib/rvmprof/src/rvmprof.c
@@ -29,3 +29,9 @@
     return ptr == __vmprof_eval_vmprof;
 }
 #endif
+
+
+long vmprof_get_profile_path(const char * buffer, long size)
+{
+    return vmp_fd_to_path(vmp_profile_fileno(), buffer, size);
+}
diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -35,6 +35,7 @@
 RPY_EXTERN long vmprof_stack_pop(void*);
 RPY_EXTERN void vmprof_stack_free(void*);
 RPY_EXTERN intptr_t vmprof_get_traceback(void *, void *, intptr_t*, intptr_t);
+RPY_EXTERN long vmprof_get_profile_path(const char *, long);
 
 long vmprof_write_header_for_jit_addr(intptr_t *result, long n,
                                       intptr_t addr, int max_depth);

From pypy.commits at gmail.com  Thu Apr 20 10:02:58 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Thu, 20 Apr 2017 07:02:58 -0700 (PDT)
Subject: [pypy-commit] pypy vmprof-0.4.4: copy over changes made to
 vmprof-python (a54ccd2e6f0)
Message-ID: <58f8bf92.9d451c0a.39fba.fb3b@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: vmprof-0.4.4
Changeset: r91096:f4b0b92eb6b1
Date: 2017-04-20 09:33 -0400
http://bitbucket.org/pypy/pypy/changeset/f4b0b92eb6b1/

Log:	copy over changes made to vmprof-python (a54ccd2e6f0)

diff --git a/rpython/rlib/rvmprof/src/shared/_vmprof.c b/rpython/rlib/rvmprof/src/shared/_vmprof.c
--- a/rpython/rlib/rvmprof/src/shared/_vmprof.c
+++ b/rpython/rlib/rvmprof/src/shared/_vmprof.c
@@ -1,8 +1,7 @@
-/*[clinic input]
-module _vmprof
-[clinic start generated code]*/
-/*[clinic end generated code: output=da39a3ee5e6b4b0d input=b443489e38f2be7d]*/
-
+/**
+ * This file is the CPython module _vmprof. It does not share code
+ * with PyPy. PyPy's _vmprof module is included in the main repo.
+ */
 #define _GNU_SOURCE 1
 
 #include <Python.h>
@@ -14,7 +13,7 @@
 static volatile int is_enabled = 0;
 static destructor Original_code_dealloc = 0;
 static PyObject* (*_default_eval_loop)(PyFrameObject *, int) = 0;
-void dump_native_symbols(int fileno);
+void vmp_scan_profile(int fileno, int dump_native, void *all_code_uids);
 
 #if VMPROF_UNIX
 #include "trampoline.h"
@@ -109,6 +108,33 @@
     return 0;
 }
 
+static int _look_for_code_object_seen(PyObject *o, void *all_codes)
+{
+    if (PyCode_Check(o) && PySet_GET_SIZE(all_codes)) {
+        Py_ssize_t i;
+        PyCodeObject *co = (PyCodeObject *)o;
+        PyObject *uid_co = PyLong_FromVoidPtr((void*)CODE_ADDR_TO_UID(co));
+        int check = PySet_Discard(all_codes, uid_co);
+
+        Py_CLEAR(uid_co);
+
+        if (check < 0)
+            return -1;
+
+        if (check && emit_code_object(co) < 0)
+            return -1;
+
+        i = PyTuple_Size(co->co_consts);
+        while (i > 0) {
+            --i;
+            if (_look_for_code_object(PyTuple_GET_ITEM(co->co_consts, i),
+                                      all_codes) < 0)
+                return -1;
+        }
+    }
+    return 0;
+}
+
 static void emit_all_code_objects(void)
 {
     PyObject *gc_module = NULL, *lst = NULL, *all_codes = NULL;
@@ -118,6 +144,48 @@
     if (gc_module == NULL)
         goto error;
 
+    // lst contains all objects that are known by the gc
+    lst = PyObject_CallMethod(gc_module, "get_objects", "");
+    if (lst == NULL || !PyList_Check(lst))
+        goto error;
+
+    // the set only includes the code objects found in the profile
+    all_codes = PySet_New(NULL);
+    if (all_codes == NULL)
+        goto error;
+
+    size = PyList_GET_SIZE(lst);
+    for (i = 0; i < size; i++) {
+        PyObject *o = PyList_GET_ITEM(lst, i);
+        if (o->ob_type->tp_traverse &&
+            o->ob_type->tp_traverse(o, _look_for_code_object, (void *)all_codes)
+                < 0)
+            goto error;
+    }
+
+ error:
+    Py_XDECREF(all_codes);
+    Py_XDECREF(lst);
+    Py_XDECREF(gc_module);
+}
+
+static int add_code_addr(void *all_code_uids, void *addr)
+{
+    PyObject *co_uid = PyLong_FromVoidPtr(addr);
+    int check = PySet_Add((PyObject*) all_code_uids, co_uid);
+    Py_CLEAR(co_uid);
+    return check;
+}
+
+static void emit_all_code_objects_seen(int fileno)
+{
+    PyObject *gc_module = NULL, *lst = NULL, *all_codes = NULL;
+    Py_ssize_t i, size;
+
+    gc_module = PyImport_ImportModuleNoBlock("gc");
+    if (gc_module == NULL)
+        goto error;
+
     lst = PyObject_CallMethod(gc_module, "get_objects", "");
     if (lst == NULL || !PyList_Check(lst))
         goto error;
@@ -126,16 +194,21 @@
     if (all_codes == NULL)
         goto error;
 
+    // fill up all_codes with every code object found in the profile
+    vmp_scan_profile(fileno, 0, all_codes);
+
+    // intersect the list with the set and dump only the code objects
+    // found in the set!
     size = PyList_GET_SIZE(lst);
     for (i = 0; i < size; i++) {
         PyObject *o = PyList_GET_ITEM(lst, i);
         if (o->ob_type->tp_traverse &&
-            o->ob_type->tp_traverse(o, _look_for_code_object, (void *)all_codes)
-                < 0)
+                o->ob_type->tp_traverse(o, _look_for_code_object_seen, (void *) all_codes)
+            < 0)
             goto error;
     }
 
- error:
+    error:
     Py_XDECREF(all_codes);
     Py_XDECREF(lst);
     Py_XDECREF(gc_module);
@@ -162,8 +235,16 @@
     if (!PyArg_ParseTuple(args, "id|iii", &fd, &interval, &memory, &lines, &native)) {
         return NULL;
     }
-    assert(fd >= 0 && "file descripter provided to vmprof must not" \
-                      " be less then zero.");
+
+    if (write(fd, NULL, 0) != 0) {
+        PyErr_SetString(PyExc_ValueError, "file descriptor must be writeable");
+        return NULL;
+    }
+
+    if ((read(fd, NULL, 0) != 0) && (native != 0)) {
+        PyErr_SetString(PyExc_ValueError, "file descriptor must be readable for native profiling");
+        return NULL;
+    }
 
     if (is_enabled) {
         PyErr_SetString(PyExc_ValueError, "vmprof is already enabled");
@@ -194,16 +275,53 @@
     return Py_None;
 }
 
+static PyObject * vmp_is_enabled(PyObject *module, PyObject *noargs) {
+    if (is_enabled) {
+        Py_RETURN_TRUE;
+    }
+    Py_RETURN_FALSE;
+}
+
 static PyObject *
-disable_vmprof(PyObject *module, PyObject *noarg)
+disable_vmprof(PyObject *module, PyObject *args)
 {
+    int fd = vmp_profile_fileno();
+    int only_needed = 0;
+
+    if (!PyArg_ParseTuple(args, "|i", &only_needed)) {
+        return NULL;
+    }
+
+#if VMPROF_UNIX
+    if ((read(fd, NULL, 0) != 0) && (only_needed != 0)) {
+        PyErr_SetString(PyExc_ValueError,
+                        "file descriptor must be readable to save only needed code objects");
+        return NULL;
+    }
+#else
+    if (only_needed) {
+        PyErr_SetString(PyExc_ValueError,
+                        "saving only needed code objects is not supported for windows");
+        return NULL;
+    }
+#endif
+
     if (!is_enabled) {
         PyErr_SetString(PyExc_ValueError, "vmprof is not enabled");
         return NULL;
     }
+
     is_enabled = 0;
     vmprof_ignore_signals(1);
+
+#if VMPROF_UNIX
+    if (only_needed)
+        emit_all_code_objects_seen(fd);
+    else
+        emit_all_code_objects();
+#else
     emit_all_code_objects();
+#endif
 
     if (vmprof_disable() < 0) {
         PyErr_SetFromErrno(PyExc_OSError);
@@ -320,15 +438,35 @@
 }
 #endif
 
+#ifdef VMPROF_UNIX
+static PyObject * vmp_get_profile_path(PyObject *module, PyObject *noargs) {
+    PyObject * o;
+    if (is_enabled) {
+        char * buffer[4096];
+        ssize_t buffer_len = vmp_fd_to_path(vmp_profile_fileno(), buffer, 4096);
+        if (buffer_len == -1) {
+            PyErr_Format(PyExc_NotImplementedError, "not implemented platform %s", vmp_machine_os_name());
+            return NULL;
+        }
+        return PyStr_n_NEW(buffer, buffer_len);
+    }
+    Py_RETURN_NONE;
+}
+#endif
+
 static PyMethodDef VMProfMethods[] = {
     {"enable",  enable_vmprof, METH_VARARGS, "Enable profiling."},
-    {"disable", disable_vmprof, METH_NOARGS, "Disable profiling."},
+    {"disable", disable_vmprof, METH_VARARGS, "Disable profiling."},
     {"write_all_code_objects", write_all_code_objects, METH_NOARGS,
      "Write eagerly all the IDs of code objects"},
     {"sample_stack_now", sample_stack_now, METH_VARARGS, "Sample the stack now"},
 #ifdef VMP_SUPPORTS_NATIVE_PROFILING
     {"resolve_addr", resolve_addr, METH_VARARGS, "Return the name of the addr"},
 #endif
+    {"is_enabled", vmp_is_enabled, METH_NOARGS, "Indicates if vmprof is currently sampling."},
+#ifdef VMPROF_UNIX
+    {"get_profile_path", vmp_get_profile_path, METH_NOARGS, "Profile path the profiler logs to."},
+#endif
     {NULL, NULL, 0, NULL}        /* Sentinel */
 };
 
diff --git a/rpython/rlib/rvmprof/src/shared/compat.h b/rpython/rlib/rvmprof/src/shared/compat.h
--- a/rpython/rlib/rvmprof/src/shared/compat.h
+++ b/rpython/rlib/rvmprof/src/shared/compat.h
@@ -7,11 +7,13 @@
       #define PyStr_AS_STRING PyBytes_AS_STRING
       #define PyStr_GET_SIZE PyBytes_GET_SIZE
       #define PyStr_NEW      PyUnicode_FromString
+      #define PyStr_n_NEW      PyUnicode_FromStringAndSize
       #define PyLong_NEW     PyLong_FromSsize_t
 #  else
       #define PyStr_AS_STRING PyString_AS_STRING
       #define PyStr_GET_SIZE PyString_GET_SIZE
       #define PyStr_NEW      PyString_FromString
+      #define PyStr_n_NEW      PyString_FromStringAndSize
       #define PyLong_NEW     PyInt_FromSsize_t
       #define PyLong_AsLong  PyInt_AsLong
 #  endif
diff --git a/rpython/rlib/rvmprof/src/shared/machine.c b/rpython/rlib/rvmprof/src/shared/machine.c
--- a/rpython/rlib/rvmprof/src/shared/machine.c
+++ b/rpython/rlib/rvmprof/src/shared/machine.c
@@ -27,3 +27,12 @@
 #endif
 }
 
+long vmp_fd_to_path(int fd, char * buffer, long buffer_len)
+{
+#ifdef VMPROF_LINUX
+    char proffs[24];
+    (void)snprintf(proffs, 24, "/proc/self/fd/%d", fd);
+    return readlink(proffs, buffer, buffer_len);
+#endif
+    return -1;
+}
diff --git a/rpython/rlib/rvmprof/src/shared/machine.h b/rpython/rlib/rvmprof/src/shared/machine.h
--- a/rpython/rlib/rvmprof/src/shared/machine.h
+++ b/rpython/rlib/rvmprof/src/shared/machine.h
@@ -10,3 +10,9 @@
  */
 const char * vmp_machine_os_name(void);
 
+/**
+ * Writes the filename into buffer. Returns -1 if the platform is not
+ * implemented.
+ */
+long vmp_fd_to_path(int fd, char * buffer, long buffer_len);
+
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c b/rpython/rlib/rvmprof/src/shared/symboltable.c
--- a/rpython/rlib/rvmprof/src/shared/symboltable.c
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.c
@@ -3,11 +3,15 @@
 #include "vmprof.h"
 #include "machine.h"
 
+#include "khash.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <assert.h>
 #include <dlfcn.h>
+
 #if defined(VMPROF_LINUX)
 #include <link.h>
 #endif
@@ -206,15 +210,20 @@
 struct backtrace_state * bstate = NULL;
 int vmp_resolve_addr(void * addr, char * name, int name_len, int * lineno, char * srcfile, int srcfile_len) {
 #ifdef __APPLE__
-    Dl_info info;
-    if (dladdr((const void*)addr, &info) == 0) {
+    Dl_info dlinfo;
+    if (dladdr((const void*)addr, &dlinfo) == 0) {
         return 1;
     }
-    if (info.dli_sname != NULL) {
-        (void)strncpy(name, info.dli_sname, name_len-1);
+    if (dlinfo.dli_sname != NULL) {
+        (void)strncpy(name, dlinfo.dli_sname, name_len-1);
         name[name_len-1] = 0;
     }
-    lookup_vmprof_debug_info(name, info.dli_fbase, srcfile, srcfile_len, lineno);
+    lookup_vmprof_debug_info(name, dlinfo.dli_fbase, srcfile, srcfile_len, lineno);
+    // copy the shared object name to the source file name if source cannot be determined
+    if (srcfile[0] == 0 && dlinfo.dli_fname != NULL) {
+        (void)strncpy(srcfile, dlinfo.dli_fname, srcfile_len-1);
+        srcfile[srcfile_len-1] = 0;
+    }
 #elif defined(VMPROF_LINUX)
     if (bstate == NULL) {
         bstate = backtrace_create_state (NULL, 1, backtrace_error_cb, NULL);
@@ -238,6 +247,18 @@
             (void)strncpy(info.name, dlinfo.dli_sname, info.name_len-1);
             name[name_len-1] = 0;
         }
+
+    }
+
+    // copy the shared object name to the source file name if source cannot be determined
+    if (srcfile[0] == 0) {
+        Dl_info dlinfo;
+        dlinfo.dli_fname = NULL;
+        (void)dladdr((const void*)addr, &dlinfo);
+        if (dlinfo.dli_fname != NULL) {
+            (void)strncpy(srcfile, dlinfo.dli_fname, srcfile_len-1);
+            srcfile[srcfile_len-1] = 0;
+        }
     }
 #endif
     return 0;
@@ -338,8 +359,9 @@
     return 0;
 }
 
+KHASH_MAP_INIT_INT(ptr, intptr_t)
 
-void dump_native_symbols(int fileno)
+void vmp_scan_profile(int fileno, int dump_nat_sym, void *all_code_uids)
 {
     off_t orig_pos, cur_pos;
     char marker;
@@ -350,6 +372,9 @@
     fsync(fileno);
     orig_pos = lseek(fileno, 0, SEEK_CUR);
 
+    khash_t(ptr) * nat_syms = kh_init(ptr);
+    khiter_t it;
+
     lseek(fileno, 5*WORD_SIZE, SEEK_SET);
 
     while (1) {
@@ -363,11 +388,17 @@
             case MARKER_HEADER: {
                 LOG("header 0x%llx\n", cur_pos);
                 if (_skip_header(fileno, &version, &flags) != 0) {
+                    kh_destroy(ptr, nat_syms);
                     return;
                 }
                 memory = (flags & PROFILE_MEMORY) != 0;
                 native = (flags & PROFILE_NATIVE) != 0;
                 lines = (flags & PROFILE_LINES) != 0;
+                if (!native && dump_nat_sym) {
+                    lseek(fileno, 0, SEEK_END);
+                    kh_destroy(ptr, nat_syms);
+                    return;
+                }
                 break;
             } case MARKER_META: {
                 LOG("meta 0x%llx\n", cur_pos);
@@ -400,19 +431,46 @@
 #else
                 for (i = 0; i < depth; i++) {
                     void * addr = _read_addr(fileno);
+                    if (lines && i % 2 == 0) {
+                        continue;
+                    }
                     if (((intptr_t)addr & 0x1) == 1) {
 #endif
-                        LOG("found kind %p\n", addr);
-                        char name[MAXLEN];
-                        char srcfile[MAXLEN];
-                        name[0] = 0;
-                        srcfile[0] = 0;
-                        int lineno = 0;
-                        if (vmp_resolve_addr(addr, name, MAXLEN, &lineno, srcfile, MAXLEN) == 0) {
-                            LOG("dumping add %p, name %s, %s:%d\n", addr, name, srcfile, lineno);
-                            _dump_native_symbol(fileno, addr, name, lineno, srcfile);
+                        /* dump the native symbol to disk */
+                        if (dump_nat_sym) {
+                            LOG("found kind %p\n", addr);
+
+                            // if the address has already been dumped,
+                            // do not log it again!
+                            it = kh_get(ptr, nat_syms, (intptr_t)addr);
+                            if (it == kh_end(nat_syms)) {
+                                char name[MAXLEN];
+                                char srcfile[MAXLEN];
+                                name[0] = 0;
+                                srcfile[0] = 0;
+                                int lineno = 0;
+                                if (vmp_resolve_addr(addr, name, MAXLEN, &lineno, srcfile, MAXLEN) == 0) {
+                                    LOG("dumping add %p, name %s, %s:%d\n", addr, name, srcfile, lineno);
+                                    _dump_native_symbol(fileno, addr, name, lineno, srcfile);
+                                    int ret;
+                                    it = kh_put(ptr, nat_syms, (intptr_t)addr, &ret);
+                                    kh_value(nat_syms, it) = 1;
+                                }
+                            }
+                        }
+#ifdef RPYTHON_VMPROF
+                    }
+#else
+                    } else {
+                        // cpython adds all addresses into a set to get the intersection
+                        // of all gc known code addresses
+                        if (all_code_uids != NULL) {
+                            PyObject *co_uid = PyLong_FromVoidPtr(addr);
+                            int check = PySet_Add(all_code_uids, co_uid);
+                            Py_CLEAR(co_uid);
                         }
                     }
+#endif
                 }
                 LOG("passed  memory %d \n", memory);
 
@@ -427,6 +485,7 @@
             } default: {
                 fprintf(stderr, "unknown marker 0x%x\n", marker);
                 lseek(fileno, 0, SEEK_END);
+                kh_destroy(ptr, nat_syms);
                 return;
             }
         }
@@ -437,5 +496,11 @@
         }
     }
 
+    kh_destroy(ptr, nat_syms);
     lseek(fileno, 0, SEEK_END);
 }
+
+void dump_native_symbols(int fileno)
+{
+    vmp_scan_profile(fileno, 1, NULL);
+}
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_main.h b/rpython/rlib/rvmprof/src/shared/vmprof_main.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof_main.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof_main.h
@@ -218,7 +218,7 @@
         if (p == NULL) {
             /* ignore this signal: there are no free buffers right now */
         } else {
-#ifdef RPYTHON_VMPORF
+#ifdef RPYTHON_VMPROF
             commit = _vmprof_sample_stack(p, NULL, (ucontext_t*)ucontext);
 #else
             commit = _vmprof_sample_stack(p, tstate, (ucontext_t*)ucontext);

From pypy.commits at gmail.com  Thu Apr 20 10:09:34 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Thu, 20 Apr 2017 07:09:34 -0700 (PDT)
Subject: [pypy-commit] pypy vmprof-0.4.4: add missing files (e.g. khash) and
 copy over real changes in 93f28d0b9b79
Message-ID: <58f8c11e.5aa5df0a.56cc9.c919@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: vmprof-0.4.4
Changeset: r91099:d8992e4740ea
Date: 2017-04-20 10:08 -0400
http://bitbucket.org/pypy/pypy/changeset/d8992e4740ea/

Log:	add missing files (e.g. khash) and copy over real changes in
	93f28d0b9b79

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -49,6 +49,11 @@
 ^rpython/translator/goal/target.+-c$
 ^rpython/translator/goal/.+\.exe$
 ^rpython/translator/goal/.+\.dll$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.guess$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.h$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.log$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.status$
 ^pypy/goal/pypy-translation-snapshot$
 ^pypy/goal/pypy-c
 ^pypy/goal/.+\.exe$
diff --git a/rpython/rlib/rvmprof/src/shared/_vmprof.c b/rpython/rlib/rvmprof/src/shared/_vmprof.c
--- a/rpython/rlib/rvmprof/src/shared/_vmprof.c
+++ b/rpython/rlib/rvmprof/src/shared/_vmprof.c
@@ -442,7 +442,8 @@
 static PyObject * vmp_get_profile_path(PyObject *module, PyObject *noargs) {
     PyObject * o;
     if (is_enabled) {
-        char * buffer[4096];
+        char buffer[4096];
+        buffer[0] = 0;
         ssize_t buffer_len = vmp_fd_to_path(vmp_profile_fileno(), buffer, 4096);
         if (buffer_len == -1) {
             PyErr_Format(PyExc_NotImplementedError, "not implemented platform %s", vmp_machine_os_name());
diff --git a/rpython/rlib/rvmprof/src/shared/khash.h b/rpython/rlib/rvmprof/src/shared/khash.h
new file mode 100644
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/khash.h
@@ -0,0 +1,627 @@
+/* The MIT License
+
+   Copyright (c) 2008, 2009, 2011 by Attractive Chaos <attractor at live.co.uk>
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+*/
+
+/*
+  An example:
+
+#include "khash.h"
+KHASH_MAP_INIT_INT(32, char)
+int main() {
+	int ret, is_missing;
+	khiter_t k;
+	khash_t(32) *h = kh_init(32);
+	k = kh_put(32, h, 5, &ret);
+	kh_value(h, k) = 10;
+	k = kh_get(32, h, 10);
+	is_missing = (k == kh_end(h));
+	k = kh_get(32, h, 5);
+	kh_del(32, h, k);
+	for (k = kh_begin(h); k != kh_end(h); ++k)
+		if (kh_exist(h, k)) kh_value(h, k) = 1;
+	kh_destroy(32, h);
+	return 0;
+}
+*/
+
+/*
+  2013-05-02 (0.2.8):
+
+	* Use quadratic probing. When the capacity is power of 2, stepping function
+	  i*(i+1)/2 guarantees to traverse each bucket. It is better than double
+	  hashing on cache performance and is more robust than linear probing.
+
+	  In theory, double hashing should be more robust than quadratic probing.
+	  However, my implementation is probably not for large hash tables, because
+	  the second hash function is closely tied to the first hash function,
+	  which reduce the effectiveness of double hashing.
+
+	Reference: http://research.cs.vt.edu/AVresearch/hashing/quadratic.php
+
+  2011-12-29 (0.2.7):
+
+    * Minor code clean up; no actual effect.
+
+  2011-09-16 (0.2.6):
+
+	* The capacity is a power of 2. This seems to dramatically improve the
+	  speed for simple keys. Thank Zilong Tan for the suggestion. Reference:
+
+	   - http://code.google.com/p/ulib/
+	   - http://nothings.org/computer/judy/
+
+	* Allow to optionally use linear probing which usually has better
+	  performance for random input. Double hashing is still the default as it
+	  is more robust to certain non-random input.
+
+	* Added Wang's integer hash function (not used by default). This hash
+	  function is more robust to certain non-random input.
+
+  2011-02-14 (0.2.5):
+
+    * Allow to declare global functions.
+
+  2009-09-26 (0.2.4):
+
+    * Improve portability
+
+  2008-09-19 (0.2.3):
+
+	* Corrected the example
+	* Improved interfaces
+
+  2008-09-11 (0.2.2):
+
+	* Improved speed a little in kh_put()
+
+  2008-09-10 (0.2.1):
+
+	* Added kh_clear()
+	* Fixed a compiling error
+
+  2008-09-02 (0.2.0):
+
+	* Changed to token concatenation which increases flexibility.
+
+  2008-08-31 (0.1.2):
+
+	* Fixed a bug in kh_get(), which has not been tested previously.
+
+  2008-08-31 (0.1.1):
+
+	* Added destructor
+*/
+
+
+#ifndef __AC_KHASH_H
+#define __AC_KHASH_H
+
+/*!
+  @header
+
+  Generic hash table library.
+ */
+
+#define AC_VERSION_KHASH_H "0.2.8"
+
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+/* compiler specific configuration */
+
+#if UINT_MAX == 0xffffffffu
+typedef unsigned int khint32_t;
+#elif ULONG_MAX == 0xffffffffu
+typedef unsigned long khint32_t;
+#endif
+
+#if ULONG_MAX == ULLONG_MAX
+typedef unsigned long khint64_t;
+#else
+typedef unsigned long long khint64_t;
+#endif
+
+#ifndef kh_inline
+#ifdef _MSC_VER
+#define kh_inline __inline
+#else
+#define kh_inline inline
+#endif
+#endif /* kh_inline */
+
+#ifndef klib_unused
+#if (defined __clang__ && __clang_major__ >= 3) || (defined __GNUC__ && __GNUC__ >= 3)
+#define klib_unused __attribute__ ((__unused__))
+#else
+#define klib_unused
+#endif
+#endif /* klib_unused */
+
+typedef khint32_t khint_t;
+typedef khint_t khiter_t;
+
+#define __ac_isempty(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&2)
+#define __ac_isdel(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&1)
+#define __ac_iseither(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&3)
+#define __ac_set_isdel_false(flag, i) (flag[i>>4]&=~(1ul<<((i&0xfU)<<1)))
+#define __ac_set_isempty_false(flag, i) (flag[i>>4]&=~(2ul<<((i&0xfU)<<1)))
+#define __ac_set_isboth_false(flag, i) (flag[i>>4]&=~(3ul<<((i&0xfU)<<1)))
+#define __ac_set_isdel_true(flag, i) (flag[i>>4]|=1ul<<((i&0xfU)<<1))
+
+#define __ac_fsize(m) ((m) < 16? 1 : (m)>>4)
+
+#ifndef kroundup32
+#define kroundup32(x) (--(x), (x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16, ++(x))
+#endif
+
+#ifndef kcalloc
+#define kcalloc(N,Z) calloc(N,Z)
+#endif
+#ifndef kmalloc
+#define kmalloc(Z) malloc(Z)
+#endif
+#ifndef krealloc
+#define krealloc(P,Z) realloc(P,Z)
+#endif
+#ifndef kfree
+#define kfree(P) free(P)
+#endif
+
+static const double __ac_HASH_UPPER = 0.77;
+
+#define __KHASH_TYPE(name, khkey_t, khval_t) \
+	typedef struct kh_##name##_s { \
+		khint_t n_buckets, size, n_occupied, upper_bound; \
+		khint32_t *flags; \
+		khkey_t *keys; \
+		khval_t *vals; \
+	} kh_##name##_t;
+
+#define __KHASH_PROTOTYPES(name, khkey_t, khval_t)	 					\
+	extern kh_##name##_t *kh_init_##name(void);							\
+	extern void kh_destroy_##name(kh_##name##_t *h);					\
+	extern void kh_clear_##name(kh_##name##_t *h);						\
+	extern khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); 	\
+	extern int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
+	extern khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \
+	extern void kh_del_##name(kh_##name##_t *h, khint_t x);
+
+#define __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	SCOPE kh_##name##_t *kh_init_##name(void) {							\
+		return (kh_##name##_t*)kcalloc(1, sizeof(kh_##name##_t));		\
+	}																	\
+	SCOPE void kh_destroy_##name(kh_##name##_t *h)						\
+	{																	\
+		if (h) {														\
+			kfree((void *)h->keys); kfree(h->flags);					\
+			kfree((void *)h->vals);										\
+			kfree(h);													\
+		}																\
+	}																	\
+	SCOPE void kh_clear_##name(kh_##name##_t *h)						\
+	{																	\
+		if (h && h->flags) {											\
+			memset(h->flags, 0xaa, __ac_fsize(h->n_buckets) * sizeof(khint32_t)); \
+			h->size = h->n_occupied = 0;								\
+		}																\
+	}																	\
+	SCOPE khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) 	\
+	{																	\
+		if (h->n_buckets) {												\
+			khint_t k, i, last, mask, step = 0; \
+			mask = h->n_buckets - 1;									\
+			k = __hash_func(key); i = k & mask;							\
+			last = i; \
+			while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
+				i = (i + (++step)) & mask; \
+				if (i == last) return h->n_buckets;						\
+			}															\
+			return __ac_iseither(h->flags, i)? h->n_buckets : i;		\
+		} else return 0;												\
+	}																	\
+	SCOPE int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
+	{ /* This function uses 0.25*n_buckets bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets. */ \
+		khint32_t *new_flags = 0;										\
+		khint_t j = 1;													\
+		{																\
+			kroundup32(new_n_buckets); 									\
+			if (new_n_buckets < 4) new_n_buckets = 4;					\
+			if (h->size >= (khint_t)(new_n_buckets * __ac_HASH_UPPER + 0.5)) j = 0;	/* requested size is too small */ \
+			else { /* hash table size to be changed (shrink or expand); rehash */ \
+				new_flags = (khint32_t*)kmalloc(__ac_fsize(new_n_buckets) * sizeof(khint32_t));	\
+				if (!new_flags) return -1;								\
+				memset(new_flags, 0xaa, __ac_fsize(new_n_buckets) * sizeof(khint32_t)); \
+				if (h->n_buckets < new_n_buckets) {	/* expand */		\
+					khkey_t *new_keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
+					if (!new_keys) { kfree(new_flags); return -1; }		\
+					h->keys = new_keys;									\
+					if (kh_is_map) {									\
+						khval_t *new_vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \
+						if (!new_vals) { kfree(new_flags); return -1; }	\
+						h->vals = new_vals;								\
+					}													\
+				} /* otherwise shrink */								\
+			}															\
+		}																\
+		if (j) { /* rehashing is needed */								\
+			for (j = 0; j != h->n_buckets; ++j) {						\
+				if (__ac_iseither(h->flags, j) == 0) {					\
+					khkey_t key = h->keys[j];							\
+					khval_t val;										\
+					khint_t new_mask;									\
+					new_mask = new_n_buckets - 1; 						\
+					if (kh_is_map) val = h->vals[j];					\
+					__ac_set_isdel_true(h->flags, j);					\
+					while (1) { /* kick-out process; sort of like in Cuckoo hashing */ \
+						khint_t k, i, step = 0; \
+						k = __hash_func(key);							\
+						i = k & new_mask;								\
+						while (!__ac_isempty(new_flags, i)) i = (i + (++step)) & new_mask; \
+						__ac_set_isempty_false(new_flags, i);			\
+						if (i < h->n_buckets && __ac_iseither(h->flags, i) == 0) { /* kick out the existing element */ \
+							{ khkey_t tmp = h->keys[i]; h->keys[i] = key; key = tmp; } \
+							if (kh_is_map) { khval_t tmp = h->vals[i]; h->vals[i] = val; val = tmp; } \
+							__ac_set_isdel_true(h->flags, i); /* mark it as deleted in the old hash table */ \
+						} else { /* write the element and jump out of the loop */ \
+							h->keys[i] = key;							\
+							if (kh_is_map) h->vals[i] = val;			\
+							break;										\
+						}												\
+					}													\
+				}														\
+			}															\
+			if (h->n_buckets > new_n_buckets) { /* shrink the hash table */ \
+				h->keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
+				if (kh_is_map) h->vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \
+			}															\
+			kfree(h->flags); /* free the working space */				\
+			h->flags = new_flags;										\
+			h->n_buckets = new_n_buckets;								\
+			h->n_occupied = h->size;									\
+			h->upper_bound = (khint_t)(h->n_buckets * __ac_HASH_UPPER + 0.5); \
+		}																\
+		return 0;														\
+	}																	\
+	SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \
+	{																	\
+		khint_t x;														\
+		if (h->n_occupied >= h->upper_bound) { /* update the hash table */ \
+			if (h->n_buckets > (h->size<<1)) {							\
+				if (kh_resize_##name(h, h->n_buckets - 1) < 0) { /* clear "deleted" elements */ \
+					*ret = -1; return h->n_buckets;						\
+				}														\
+			} else if (kh_resize_##name(h, h->n_buckets + 1) < 0) { /* expand the hash table */ \
+				*ret = -1; return h->n_buckets;							\
+			}															\
+		} /* TODO: to implement automatically shrinking; resize() already support shrinking */ \
+		{																\
+			khint_t k, i, site, last, mask = h->n_buckets - 1, step = 0; \
+			x = site = h->n_buckets; k = __hash_func(key); i = k & mask; \
+			if (__ac_isempty(h->flags, i)) x = i; /* for speed up */	\
+			else {														\
+				last = i; \
+				while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
+					if (__ac_isdel(h->flags, i)) site = i;				\
+					i = (i + (++step)) & mask; \
+					if (i == last) { x = site; break; }					\
+				}														\
+				if (x == h->n_buckets) {								\
+					if (__ac_isempty(h->flags, i) && site != h->n_buckets) x = site; \
+					else x = i;											\
+				}														\
+			}															\
+		}																\
+		if (__ac_isempty(h->flags, x)) { /* not present at all */		\
+			h->keys[x] = key;											\
+			__ac_set_isboth_false(h->flags, x);							\
+			++h->size; ++h->n_occupied;									\
+			*ret = 1;													\
+		} else if (__ac_isdel(h->flags, x)) { /* deleted */				\
+			h->keys[x] = key;											\
+			__ac_set_isboth_false(h->flags, x);							\
+			++h->size;													\
+			*ret = 2;													\
+		} else *ret = 0; /* Don't touch h->keys[x] if present and not deleted */ \
+		return x;														\
+	}																	\
+	SCOPE void kh_del_##name(kh_##name##_t *h, khint_t x)				\
+	{																	\
+		if (x != h->n_buckets && !__ac_iseither(h->flags, x)) {			\
+			__ac_set_isdel_true(h->flags, x);							\
+			--h->size;													\
+		}																\
+	}
+
+#define KHASH_DECLARE(name, khkey_t, khval_t)		 					\
+	__KHASH_TYPE(name, khkey_t, khval_t) 								\
+	__KHASH_PROTOTYPES(name, khkey_t, khval_t)
+
+#define KHASH_INIT2(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	__KHASH_TYPE(name, khkey_t, khval_t) 								\
+	__KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal)
+
+#define KHASH_INIT(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	KHASH_INIT2(name, static kh_inline klib_unused, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal)
+
+/* --- BEGIN OF HASH FUNCTIONS --- */
+
+/*! @function
+  @abstract     Integer hash function
+  @param  key   The integer [khint32_t]
+  @return       The hash value [khint_t]
+ */
+#define kh_int_hash_func(key) (khint32_t)(key)
+/*! @function
+  @abstract     Integer comparison function
+ */
+#define kh_int_hash_equal(a, b) ((a) == (b))
+/*! @function
+  @abstract     64-bit integer hash function
+  @param  key   The integer [khint64_t]
+  @return       The hash value [khint_t]
+ */
+#define kh_int64_hash_func(key) (khint32_t)((key)>>33^(key)^(key)<<11)
+/*! @function
+  @abstract     64-bit integer comparison function
+ */
+#define kh_int64_hash_equal(a, b) ((a) == (b))
+/*! @function
+  @abstract     const char* hash function
+  @param  s     Pointer to a null terminated string
+  @return       The hash value
+ */
+static kh_inline khint_t __ac_X31_hash_string(const char *s)
+{
+	khint_t h = (khint_t)*s;
+	if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)*s;
+	return h;
+}
+/*! @function
+  @abstract     Another interface to const char* hash function
+  @param  key   Pointer to a null terminated string [const char*]
+  @return       The hash value [khint_t]
+ */
+#define kh_str_hash_func(key) __ac_X31_hash_string(key)
+/*! @function
+  @abstract     Const char* comparison function
+ */
+#define kh_str_hash_equal(a, b) (strcmp(a, b) == 0)
+
+static kh_inline khint_t __ac_Wang_hash(khint_t key)
+{
+    key += ~(key << 15);
+    key ^=  (key >> 10);
+    key +=  (key << 3);
+    key ^=  (key >> 6);
+    key += ~(key << 11);
+    key ^=  (key >> 16);
+    return key;
+}
+#define kh_int_hash_func2(key) __ac_Wang_hash((khint_t)key)
+
+/* --- END OF HASH FUNCTIONS --- */
+
+/* Other convenient macros... */
+
+/*!
+  @abstract Type of the hash table.
+  @param  name  Name of the hash table [symbol]
+ */
+#define khash_t(name) kh_##name##_t
+
+/*! @function
+  @abstract     Initiate a hash table.
+  @param  name  Name of the hash table [symbol]
+  @return       Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_init(name) kh_init_##name()
+
+/*! @function
+  @abstract     Destroy a hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_destroy(name, h) kh_destroy_##name(h)
+
+/*! @function
+  @abstract     Reset a hash table without deallocating memory.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_clear(name, h) kh_clear_##name(h)
+
+/*! @function
+  @abstract     Resize a hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  s     New size [khint_t]
+ */
+#define kh_resize(name, h, s) kh_resize_##name(h, s)
+
+/*! @function
+  @abstract     Insert a key to the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Key [type of keys]
+  @param  r     Extra return code: -1 if the operation failed;
+                0 if the key is present in the hash table;
+                1 if the bucket is empty (never used); 2 if the element in
+				the bucket has been deleted [int*]
+  @return       Iterator to the inserted element [khint_t]
+ */
+#define kh_put(name, h, k, r) kh_put_##name(h, k, r)
+
+/*! @function
+  @abstract     Retrieve a key from the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Key [type of keys]
+  @return       Iterator to the found element, or kh_end(h) if the element is absent [khint_t]
+ */
+#define kh_get(name, h, k) kh_get_##name(h, k)
+
+/*! @function
+  @abstract     Remove a key from the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Iterator to the element to be deleted [khint_t]
+ */
+#define kh_del(name, h, k) kh_del_##name(h, k)
+
+/*! @function
+  @abstract     Test whether a bucket contains data.
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       1 if containing data; 0 otherwise [int]
+ */
+#define kh_exist(h, x) (!__ac_iseither((h)->flags, (x)))
+
+/*! @function
+  @abstract     Get key given an iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       Key [type of keys]
+ */
+#define kh_key(h, x) ((h)->keys[x])
+
+/*! @function
+  @abstract     Get value given an iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       Value [type of values]
+  @discussion   For hash sets, calling this results in segfault.
+ */
+#define kh_val(h, x) ((h)->vals[x])
+
+/*! @function
+  @abstract     Alias of kh_val()
+ */
+#define kh_value(h, x) ((h)->vals[x])
+
+/*! @function
+  @abstract     Get the start iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       The start iterator [khint_t]
+ */
+#define kh_begin(h) (khint_t)(0)
+
+/*! @function
+  @abstract     Get the end iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       The end iterator [khint_t]
+ */
+#define kh_end(h) ((h)->n_buckets)
+
+/*! @function
+  @abstract     Get the number of elements in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       Number of elements in the hash table [khint_t]
+ */
+#define kh_size(h) ((h)->size)
+
+/*! @function
+  @abstract     Get the number of buckets in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       Number of buckets in the hash table [khint_t]
+ */
+#define kh_n_buckets(h) ((h)->n_buckets)
+
+/*! @function
+  @abstract     Iterate over the entries in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  kvar  Variable to which key will be assigned
+  @param  vvar  Variable to which value will be assigned
+  @param  code  Block of code to execute
+ */
+#define kh_foreach(h, kvar, vvar, code) { khint_t __i;		\
+	for (__i = kh_begin(h); __i != kh_end(h); ++__i) {		\
+		if (!kh_exist(h,__i)) continue;						\
+		(kvar) = kh_key(h,__i);								\
+		(vvar) = kh_val(h,__i);								\
+		code;												\
+	} }
+
+/*! @function
+  @abstract     Iterate over the values in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  vvar  Variable to which value will be assigned
+  @param  code  Block of code to execute
+ */
+#define kh_foreach_value(h, vvar, code) { khint_t __i;		\
+	for (__i = kh_begin(h); __i != kh_end(h); ++__i) {		\
+		if (!kh_exist(h,__i)) continue;						\
+		(vvar) = kh_val(h,__i);								\
+		code;												\
+	} }
+
+/* More conenient interfaces */
+
+/*! @function
+  @abstract     Instantiate a hash set containing integer keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_INT(name)										\
+	KHASH_INIT(name, khint32_t, char, 0, kh_int_hash_func, kh_int_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing integer keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_INT(name, khval_t)								\
+	KHASH_INIT(name, khint32_t, khval_t, 1, kh_int_hash_func, kh_int_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing 64-bit integer keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_INT64(name)										\
+	KHASH_INIT(name, khint64_t, char, 0, kh_int64_hash_func, kh_int64_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing 64-bit integer keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_INT64(name, khval_t)								\
+	KHASH_INIT(name, khint64_t, khval_t, 1, kh_int64_hash_func, kh_int64_hash_equal)
+
+typedef const char *kh_cstr_t;
+/*! @function
+  @abstract     Instantiate a hash map containing const char* keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_STR(name)										\
+	KHASH_INIT(name, kh_cstr_t, char, 0, kh_str_hash_func, kh_str_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing const char* keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_STR(name, khval_t)								\
+	KHASH_INIT(name, kh_cstr_t, khval_t, 1, kh_str_hash_func, kh_str_hash_equal)
+
+#endif /* __AC_KHASH_H */
diff --git a/rpython/rlib/rvmprof/src/shared/machine.c b/rpython/rlib/rvmprof/src/shared/machine.c
--- a/rpython/rlib/rvmprof/src/shared/machine.c
+++ b/rpython/rlib/rvmprof/src/shared/machine.c
@@ -3,6 +3,11 @@
 #include "vmprof.h"
 #include <stdio.h>
 
+#ifdef VMPROF_UNIX
+#include <unistd.h>
+#include <fcntl.h>
+#endif
+
 int vmp_machine_bits(void)
 {
     return sizeof(void*)*8;
@@ -33,6 +38,9 @@
     char proffs[24];
     (void)snprintf(proffs, 24, "/proc/self/fd/%d", fd);
     return readlink(proffs, buffer, buffer_len);
+#elif defined(VMPROF_UNIX)
+    fcntl(fd, F_GETPATH, buffer);
+    return strlen(buffer);
 #endif
     return -1;
 }
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.h b/rpython/rlib/rvmprof/src/shared/symboltable.h
--- a/rpython/rlib/rvmprof/src/shared/symboltable.h
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.h
@@ -17,5 +17,7 @@
  */
 void dump_all_known_symbols(int fd);
 
+void dump_native_symbols(int fd);
+
 int vmp_resolve_addr(void * addr, char * name, int name_len, int * lineno,
                       char * srcfile, int srcfile_len);

From pypy.commits at gmail.com  Thu Apr 20 10:42:02 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 20 Apr 2017 07:42:02 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Don't crash when calling
 getarg_w('w*') on a read-only buffer; add ArrayBuffer.as_binary_rw()
Message-ID: <58f8c8ba.92a1df0a.8bdeb.cf0a@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91100:9cb1ffa41c92
Date: 2017-04-20 15:41 +0100
http://bitbucket.org/pypy/pypy/changeset/9cb1ffa41c92/

Log:	Don't crash when calling getarg_w('w*') on a read-only buffer; add
	ArrayBuffer.as_binary_rw()

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -10,7 +10,8 @@
 from rpython.rlib.rarithmetic import r_uint, SHRT_MIN, SHRT_MAX, \
     INT_MIN, INT_MAX, UINT_MAX, USHRT_MAX
 
-from pypy.interpreter.buffer import SimpleBuffer, StringBuffer
+from pypy.interpreter.buffer import (
+    BufferInterfaceNotFound, SimpleBuffer, StringBuffer)
 from pypy.interpreter.executioncontext import (ExecutionContext, ActionFlag,
     make_finalizer_queue)
 from pypy.interpreter.error import OperationError, new_exception_class, oefmt
@@ -374,9 +375,6 @@
 class DescrMismatch(Exception):
     pass
 
-class BufferInterfaceNotFound(Exception):
-    pass
-
 @specialize.memo()
 def wrappable_class_name(Class):
     try:
diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -5,6 +5,9 @@
 
 from pypy.interpreter.error import oefmt
 
+class BufferInterfaceNotFound(Exception):
+    pass
+
 
 class PyBuffer(object):
     """Abstract base class for buffers."""
@@ -41,7 +44,7 @@
 
     def as_binary_rw(self):
         """Return a writable BinaryBuffer sharing the same data as `self`."""
-        raise NotImplementedError
+        raise BufferInterfaceNotFound
 
     def getformat(self):
         raise NotImplementedError
diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -924,6 +924,10 @@
     def as_binary(self):
         return self.data
 
+    def as_binary_rw(self):
+        assert not self.readonly
+        return self.data
+
 
 unpack_driver = jit.JitDriver(name='unpack_array',
                               greens=['selfclass', 'tp'],

From pypy.commits at gmail.com  Thu Apr 20 12:36:57 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 20 Apr 2017 09:36:57 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Kill unused W_Root methods
 .readbuf_w() and .writebuf_w()
Message-ID: <58f8e3a9.153f1c0a.512ad.2367@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91101:ca4e5b0e8cdb
Date: 2017-04-20 16:11 +0100
http://bitbucket.org/pypy/pypy/changeset/ca4e5b0e8cdb/

Log:	Kill unused W_Root methods .readbuf_w() and .writebuf_w()

diff --git a/pypy/module/mmap/interp_mmap.py b/pypy/module/mmap/interp_mmap.py
--- a/pypy/module/mmap/interp_mmap.py
+++ b/pypy/module/mmap/interp_mmap.py
@@ -26,10 +26,6 @@
             raise oefmt(space.w_BufferError, "Object is not writable.")
         return SimpleBuffer(MMapBuffer(self.space, self.mmap, readonly))
 
-    def writebuf_w(self, space):
-        self.check_writeable()
-        return MMapBuffer(self.space, self.mmap, False)
-
     def close(self):
         self.mmap.close()
 
diff --git a/pypy/objspace/std/bytesobject.py b/pypy/objspace/std/bytesobject.py
--- a/pypy/objspace/std/bytesobject.py
+++ b/pypy/objspace/std/bytesobject.py
@@ -421,13 +421,6 @@
         space.check_buf_flags(flags, True)
         return SimpleBuffer(StringBuffer(self._value))
 
-    def readbuf_w(self, space):
-        return StringBuffer(self._value)
-
-    def writebuf_w(self, space):
-        raise oefmt(space.w_TypeError,
-                    "Cannot use bytes as modifiable buffer")
-
     def descr_getbuffer(self, space, w_flags):
         #from pypy.objspace.std.bufferobject import W_Buffer
         #return W_Buffer(StringBuffer(self._value))

From pypy.commits at gmail.com  Thu Apr 20 12:36:59 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 20 Apr 2017 09:36:59 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Merge space.getarg_w('w*') and
 space.writebuf_w()
Message-ID: <58f8e3ab.13b7df0a.4f2c.faa5@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91102:32eda5f71241
Date: 2017-04-20 17:36 +0100
http://bitbucket.org/pypy/pypy/changeset/32eda5f71241/

Log:	Merge space.getarg_w('w*') and space.writebuf_w()

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1483,10 +1483,9 @@
     def writebuf_w(self, w_obj):
         # Old buffer interface, returns a writeable buffer (PyObject_AsWriteBuffer)
         try:
-            return w_obj.buffer_w(self, self.BUF_WRITABLE)
-        except BufferInterfaceNotFound:
-            raise oefmt(self.w_TypeError,
-                        "expected an object with a writable buffer interface")
+            return w_obj.buffer_w(self, self.BUF_WRITABLE).as_binary_rw()
+        except (BufferInterfaceNotFound, OperationError):
+            self._getarg_error("read-write bytes-like object", w_obj)
 
     def charbuf_w(self, w_obj):
         # Old buffer interface, returns a character buffer (PyObject_AsCharBuffer)
@@ -1537,13 +1536,7 @@
             except BufferInterfaceNotFound:
                 self._getarg_error("bytes or read-only buffer", w_obj)
         elif code == 'w*':
-            try:
-                return w_obj.buffer_w(self, self.BUF_WRITABLE).as_binary_rw()
-            except OperationError:
-                pass
-            except BufferInterfaceNotFound:
-                pass
-            self._getarg_error("read-write buffer", w_obj)
+            return self.writebuf_w(w_obj)
         elif code == 'y*':
             try:
                 return w_obj.buffer_w(self, self.BUF_SIMPLE).as_binary()
diff --git a/pypy/module/_cffi_backend/func.py b/pypy/module/_cffi_backend/func.py
--- a/pypy/module/_cffi_backend/func.py
+++ b/pypy/module/_cffi_backend/func.py
@@ -116,13 +116,7 @@
     return buf.as_binary()
 
 def _fetch_as_write_buffer(space, w_x):
-    try:
-        buf = space.writebuf_w(w_x)
-    except OperationError as e:
-        if not e.match(space, space.w_TypeError):
-            raise
-        buf = space.buffer_w(w_x, space.BUF_WRITABLE)
-    return buf.as_binary()
+    return space.writebuf_w(w_x)
 
 @unwrap_spec(w_ctype=ctypeobj.W_CType)
 def from_buffer(space, w_ctype, w_x):
diff --git a/pypy/module/fcntl/interp_fcntl.py b/pypy/module/fcntl/interp_fcntl.py
--- a/pypy/module/fcntl/interp_fcntl.py
+++ b/pypy/module/fcntl/interp_fcntl.py
@@ -209,7 +209,7 @@
     op = rffi.cast(rffi.INT, op)        # C long => C int
 
     try:
-        rwbuffer = space.writebuf_w(w_arg).as_binary()
+        rwbuffer = space.writebuf_w(w_arg)
     except OperationError as e:
         if not (e.match(space, space.w_TypeError) or
                 e.match(space, space.w_BufferError)):
diff --git a/pypy/module/struct/test/test_struct.py b/pypy/module/struct/test/test_struct.py
--- a/pypy/module/struct/test/test_struct.py
+++ b/pypy/module/struct/test/test_struct.py
@@ -365,8 +365,8 @@
         assert self.struct.unpack("ii", b) == (62, 12)
         raises(self.struct.error, self.struct.unpack, "i", b)
 
-    def test_pack_unpack_buffer(self):
-        import array
+    def test_pack_buffer(self):
+        import array, sys
         b = array.array('b', b'\x00' * 19)
         sz = self.struct.calcsize("ii")
         for offset in [2, -17]:
@@ -379,10 +379,16 @@
         assert bytes(b2) == self.struct.pack("ii", 17, 42) + (b'\x00' * 11)
 
         exc = raises(TypeError, self.struct.pack_into, "ii", b'test', 0, 17, 42)
-        assert str(exc.value) == "a read-write buffer is required, not bytes"
+        if '__pypy__' in sys.modules:
+            assert str(exc.value) == "a read-write bytes-like object is required, not bytes"
         exc = raises(self.struct.error, self.struct.pack_into, "ii", b[0:1], 0, 17, 42)
         assert str(exc.value) == "pack_into requires a buffer of at least 8 bytes"
 
+    def test_unpack_buffer(self):
+        import array
+        b = array.array('b', b'\x00' * 19)
+        for offset in [2, -17]:
+            self.struct.pack_into("ii", b, offset, 17, 42)
         assert self.struct.unpack_from("ii", b, 2) == (17, 42)
         assert self.struct.unpack_from("ii", b, -17) == (17, 42)
         assert self.struct.unpack_from("ii", memoryview(b)[2:]) == (17, 42)

From pypy.commits at gmail.com  Thu Apr 20 13:46:47 2017
From: pypy.commits at gmail.com (mattip)
Date: Thu, 20 Apr 2017 10:46:47 -0700 (PDT)
Subject: [pypy-commit] cffi find-vcvars: fix for importing setuptools on
 win32
Message-ID: <58f8f407.898e1c0a.7cd65.4876@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: find-vcvars
Changeset: r2926:6a9f7c5744cc
Date: 2017-04-20 20:45 +0300
http://bitbucket.org/cffi/cffi/changeset/6a9f7c5744cc/

Log:	fix for importing setuptools on win32

diff --git a/cffi/ffiplatform.py b/cffi/ffiplatform.py
--- a/cffi/ffiplatform.py
+++ b/cffi/ffiplatform.py
@@ -113,3 +113,16 @@
     f = cStringIO.StringIO()
     _flatten(x, f)
     return f.getvalue()
+
+def _hack_at_distutils():
+    # Windows-only workaround for some configurations: see
+    # https://bugs.python.org/issue23246 (Python 2.7 with 
+    # a specific MS compiler suite download)
+    if sys.platform == "win32":
+        try:
+            import setuptools    # for side-effects, patches distutils
+        except ImportError:
+            pass
+
+# this must be done before get_extension() and before compile()
+_hack_at_distutils()
diff --git a/cffi/verifier.py b/cffi/verifier.py
--- a/cffi/verifier.py
+++ b/cffi/verifier.py
@@ -26,16 +26,6 @@
                 s = s.encode('ascii')
             super(NativeIO, self).write(s)
 
-def _hack_at_distutils():
-    # Windows-only workaround for some configurations: see
-    # https://bugs.python.org/issue23246 (Python 2.7 with 
-    # a specific MS compiler suite download)
-    if sys.platform == "win32":
-        try:
-            import setuptools    # for side-effects, patches distutils
-        except ImportError:
-            pass
-
 
 class Verifier(object):
 
@@ -126,7 +116,7 @@
         return basename
 
     def get_extension(self):
-        _hack_at_distutils() # backward compatibility hack
+        ffiplatform._hack_at_distutils() # backward compatibility hack
         if not self._has_source:
             with self.ffi._lock:
                 if not self._has_source:

From pypy.commits at gmail.com  Thu Apr 20 13:58:01 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 20 Apr 2017 10:58:01 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Replace getarg_w() with writebuf_w()
 where appropriate
Message-ID: <58f8f6a9.8d4a1c0a.fe88.5442@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91103:08c44d310db7
Date: 2017-04-20 17:46 +0100
http://bitbucket.org/pypy/pypy/changeset/08c44d310db7/

Log:	Replace getarg_w() with writebuf_w() where appropriate

diff --git a/pypy/module/_io/interp_bufferedio.py b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -117,7 +117,7 @@
         return self._readinto(space, w_buffer, "read1")
 
     def _readinto(self, space, w_buffer, methodname):
-        rwbuffer = space.getarg_w('w*', w_buffer)
+        rwbuffer = space.writebuf_w(w_buffer)
         length = rwbuffer.getlength()
         w_data = space.call_method(self, methodname, space.newint(length))
 
diff --git a/pypy/module/_io/interp_bytesio.py b/pypy/module/_io/interp_bytesio.py
--- a/pypy/module/_io/interp_bytesio.py
+++ b/pypy/module/_io/interp_bytesio.py
@@ -88,7 +88,7 @@
 
     def readinto_w(self, space, w_buffer):
         self._check_closed(space)
-        rwbuffer = space.getarg_w('w*', w_buffer)
+        rwbuffer = space.writebuf_w(w_buffer)
         size = rwbuffer.getlength()
 
         output = self.read(size)
diff --git a/pypy/module/_io/interp_fileio.py b/pypy/module/_io/interp_fileio.py
--- a/pypy/module/_io/interp_fileio.py
+++ b/pypy/module/_io/interp_fileio.py
@@ -449,7 +449,7 @@
     def readinto_w(self, space, w_buffer):
         self._check_closed(space)
         self._check_readable(space)
-        rwbuffer = space.getarg_w('w*', w_buffer)
+        rwbuffer = space.writebuf_w(w_buffer)
         length = rwbuffer.getlength()
 
         target_address = lltype.nullptr(rffi.CCHARP.TO)
diff --git a/pypy/module/_socket/interp_socket.py b/pypy/module/_socket/interp_socket.py
--- a/pypy/module/_socket/interp_socket.py
+++ b/pypy/module/_socket/interp_socket.py
@@ -559,7 +559,7 @@
 
         See recv() for documentation about the flags.
         """
-        rwbuffer = space.getarg_w('w*', w_buffer)
+        rwbuffer = space.writebuf_w(w_buffer)
         lgt = rwbuffer.getlength()
         if nbytes < 0:
             raise oefmt(space.w_ValueError, "negative buffersize in recv_into")
@@ -581,7 +581,7 @@
 
         Like recv_into(buffer[, nbytes[, flags]]) but also return the sender's address info.
         """
-        rwbuffer = space.getarg_w('w*', w_buffer)
+        rwbuffer = space.writebuf_w(w_buffer)
         lgt = rwbuffer.getlength()
         if nbytes == 0:
             nbytes = lgt
diff --git a/pypy/module/struct/interp_struct.py b/pypy/module/struct/interp_struct.py
--- a/pypy/module/struct/interp_struct.py
+++ b/pypy/module/struct/interp_struct.py
@@ -85,7 +85,7 @@
 Write the packed bytes into the writable buffer buf starting at offset
     """
     res = _pack(space, format, args_w)
-    buf = space.getarg_w('w*', w_buffer)
+    buf = space.writebuf_w(w_buffer)
     if offset < 0:
         offset += buf.getlength()
     size = len(res)

From pypy.commits at gmail.com  Thu Apr 20 13:58:03 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 20 Apr 2017 10:58:03 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Merge space.getarg_w('y*') and
 space.readbuf_w()
Message-ID: <58f8f6ab.ee86df0a.d805b.12e7@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91104:f8384c7210fb
Date: 2017-04-20 18:57 +0100
http://bitbucket.org/pypy/pypy/changeset/f8384c7210fb/

Log:	Merge space.getarg_w('y*') and space.readbuf_w()

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -11,7 +11,7 @@
     INT_MIN, INT_MAX, UINT_MAX, USHRT_MAX
 
 from pypy.interpreter.buffer import (
-    BufferInterfaceNotFound, SimpleBuffer, StringBuffer)
+    BufferInterfaceNotFound, StringBuffer)
 from pypy.interpreter.executioncontext import (ExecutionContext, ActionFlag,
     make_finalizer_queue)
 from pypy.interpreter.error import OperationError, new_exception_class, oefmt
@@ -1475,10 +1475,9 @@
     def readbuf_w(self, w_obj):
         # Old buffer interface, returns a readonly buffer (PyObject_AsReadBuffer)
         try:
-            return w_obj.buffer_w(self, self.BUF_SIMPLE)
+            return w_obj.buffer_w(self, self.BUF_SIMPLE).as_binary()
         except BufferInterfaceNotFound:
-            raise oefmt(self.w_TypeError,
-                        "expected an object with a buffer interface")
+            self._getarg_error("bytes-like object", w_obj)
 
     def writebuf_w(self, w_obj):
         # Old buffer interface, returns a writeable buffer (PyObject_AsWriteBuffer)
@@ -1538,10 +1537,7 @@
         elif code == 'w*':
             return self.writebuf_w(w_obj)
         elif code == 'y*':
-            try:
-                return w_obj.buffer_w(self, self.BUF_SIMPLE).as_binary()
-            except BufferInterfaceNotFound:
-                self._getarg_error("bytes-like object", w_obj)
+            return self.readbuf_w(w_obj)
         elif code == 'y#':
             if self.isinstance_w(w_obj, self.w_bytes):
                 return w_obj.bytes_w(self)
diff --git a/pypy/module/_cffi_backend/func.py b/pypy/module/_cffi_backend/func.py
--- a/pypy/module/_cffi_backend/func.py
+++ b/pypy/module/_cffi_backend/func.py
@@ -105,15 +105,7 @@
 # ____________________________________________________________
 
 def _fetch_as_read_buffer(space, w_x):
-    # xxx do we really need to implement the same mess as in CPython 2.7
-    # w.r.t. buffers and memoryviews??
-    try:
-        buf = space.readbuf_w(w_x)
-    except OperationError as e:
-        if not e.match(space, space.w_TypeError):
-            raise
-        buf = space.buffer_w(w_x, space.BUF_SIMPLE)
-    return buf.as_binary()
+    return space.readbuf_w(w_x)
 
 def _fetch_as_write_buffer(space, w_x):
     return space.writebuf_w(w_x)
diff --git a/pypy/module/_io/interp_bufferedio.py b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -769,7 +769,7 @@
 
     def write_w(self, space, w_data):
         self._check_closed(space, "write to closed file")
-        data = space.getarg_w('y*', w_data).as_str()
+        data = space.readbuf_w(w_data).as_str()
         size = len(data)
 
         with self.lock:
diff --git a/pypy/module/_io/interp_fileio.py b/pypy/module/_io/interp_fileio.py
--- a/pypy/module/_io/interp_fileio.py
+++ b/pypy/module/_io/interp_fileio.py
@@ -410,7 +410,7 @@
     def write_w(self, space, w_data):
         self._check_closed(space)
         self._check_writable(space)
-        data = space.getarg_w('y*', w_data).as_str()
+        data = space.readbuf_w(w_data).as_str()
 
         while True:
             try:
diff --git a/pypy/module/_sre/interp_sre.py b/pypy/module/_sre/interp_sre.py
--- a/pypy/module/_sre/interp_sre.py
+++ b/pypy/module/_sre/interp_sre.py
@@ -164,7 +164,7 @@
             string = space.bytes_w(w_string)
             length = len(string)
         else:
-            buf = space.readbuf_w(w_string).as_binary()
+            buf = space.readbuf_w(w_string)
             length = buf.getlength()
             assert length >= 0
         return (length, unicodestr, string, buf)
diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -402,7 +402,7 @@
         machine values, as if it had been read from a file using the
         fromfile() method).
         """
-        buf = space.getarg_w('y*', w_s)
+        buf = space.readbuf_w(w_s)
         s = buf.as_str()
         self._frombytes(space, s)
 
diff --git a/pypy/module/marshal/interp_marshal.py b/pypy/module/marshal/interp_marshal.py
--- a/pypy/module/marshal/interp_marshal.py
+++ b/pypy/module/marshal/interp_marshal.py
@@ -444,7 +444,7 @@
     # Unmarshaller with inlined buffer string
     def __init__(self, space, w_str):
         Unmarshaller.__init__(self, space, None)
-        self.buf = space.getarg_w('y*', w_str)
+        self.buf = space.readbuf_w(w_str)
         self.bufpos = 0
         self.limit = self.buf.getlength()
 
diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -285,7 +285,7 @@
 def write(space, fd, w_data):
     """Write a string to a file descriptor.  Return the number of bytes
 actually written, which may be smaller than len(data)."""
-    data = space.getarg_w('y*', w_data)
+    data = space.readbuf_w(w_data)
     while True:
         try:
             res = os.write(fd, data.as_str())
@@ -392,7 +392,7 @@
 def pwrite(space, fd, w_data, offset):
     """Write a string to a file descriptor at a given offset.
     """
-    data = space.getarg_w('y*', w_data)
+    data = space.readbuf_w(w_data)
     while True:
         try:
             res = rposix.pwrite(fd, data.as_str(), offset)
diff --git a/pypy/module/struct/interp_struct.py b/pypy/module/struct/interp_struct.py
--- a/pypy/module/struct/interp_struct.py
+++ b/pypy/module/struct/interp_struct.py
@@ -112,7 +112,7 @@
     return do_unpack(space, format, w_str)
 
 def do_unpack(space, format, w_str):
-    buf = space.getarg_w('y*', w_str)
+    buf = space.readbuf_w(w_str)
     return _unpack(space, format, buf)
 
 

From pypy.commits at gmail.com  Thu Apr 20 22:25:14 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 20 Apr 2017 19:25:14 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Merge space.getarg_w('y#') and
 space.charbuf_w()
Message-ID: <58f96d8a.0a301c0a.4b1f5.1cef@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91105:2a6cbf8c6e27
Date: 2017-04-21 03:10 +0100
http://bitbucket.org/pypy/pypy/changeset/2a6cbf8c6e27/

Log:	Merge space.getarg_w('y#') and space.charbuf_w()

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1488,13 +1488,10 @@
 
     def charbuf_w(self, w_obj):
         # Old buffer interface, returns a character buffer (PyObject_AsCharBuffer)
-        try:
-            buf = w_obj.buffer_w(self, self.BUF_SIMPLE)
-        except BufferInterfaceNotFound:
-            raise oefmt(self.w_TypeError,
-                        "expected an object with a buffer interface")
+        if self.isinstance_w(w_obj, self.w_bytes):  # XXX: is this shortcut useful?
+            return w_obj.bytes_w(self)
         else:
-            return buf.as_str()
+            return self.readbuf_w(w_obj).as_str()
 
     def _getarg_error(self, expected, w_obj):
         if self.is_none(w_obj):
@@ -1539,12 +1536,7 @@
         elif code == 'y*':
             return self.readbuf_w(w_obj)
         elif code == 'y#':
-            if self.isinstance_w(w_obj, self.w_bytes):
-                return w_obj.bytes_w(self)
-            try:
-                return w_obj.buffer_w(self, self.BUF_SIMPLE).as_str()
-            except BufferInterfaceNotFound:
-                self._getarg_error("bytes-like object", w_obj)
+            return self.charbuf_w(w_obj)
         else:
             assert False
 
diff --git a/pypy/module/_codecs/interp_codecs.py b/pypy/module/_codecs/interp_codecs.py
--- a/pypy/module/_codecs/interp_codecs.py
+++ b/pypy/module/_codecs/interp_codecs.py
@@ -955,7 +955,7 @@
     if space.isinstance_w(w_string, space.w_unicode):
         return space.newtuple([w_string, space.len(w_string)])
 
-    string = space.readbuf_w(w_string).as_str()
+    string = space.charbuf_w(w_string)
     space.warn(space.newtext("unicode_internal codec has been deprecated"),
                space.w_DeprecationWarning)
 
@@ -983,7 +983,7 @@
         return space.newtuple([space.newbytes(result), space.newint(len(uni))])
     else:
         # special case for this codec: bytes are returned as is
-        string = space.readbuf_w(w_uni).as_str()
+        string = space.charbuf_w(w_uni)
         return space.newtuple([space.newbytes(string), space.newint(len(string))])
 
 # ____________________________________________________________
diff --git a/pypy/module/_io/interp_bufferedio.py b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -769,7 +769,7 @@
 
     def write_w(self, space, w_data):
         self._check_closed(space, "write to closed file")
-        data = space.readbuf_w(w_data).as_str()
+        data = space.charbuf_w(w_data)
         size = len(data)
 
         with self.lock:
diff --git a/pypy/module/_io/interp_fileio.py b/pypy/module/_io/interp_fileio.py
--- a/pypy/module/_io/interp_fileio.py
+++ b/pypy/module/_io/interp_fileio.py
@@ -410,7 +410,7 @@
     def write_w(self, space, w_data):
         self._check_closed(space)
         self._check_writable(space)
-        data = space.readbuf_w(w_data).as_str()
+        data = space.charbuf_w(w_data)
 
         while True:
             try:
diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -402,8 +402,7 @@
         machine values, as if it had been read from a file using the
         fromfile() method).
         """
-        buf = space.readbuf_w(w_s)
-        s = buf.as_str()
+        s = space.charbuf_w(w_s)
         self._frombytes(space, s)
 
     def _frombytes(self, space, s):
diff --git a/pypy/module/mmap/interp_mmap.py b/pypy/module/mmap/interp_mmap.py
--- a/pypy/module/mmap/interp_mmap.py
+++ b/pypy/module/mmap/interp_mmap.py
@@ -52,7 +52,7 @@
     def find(self, w_tofind, w_start=None, w_end=None):
         self.check_valid()
         space = self.space
-        tofind = space.getarg_w('y#', w_tofind)
+        tofind = space.charbuf_w(w_tofind)
         if w_start is None:
             start = self.mmap.pos
         else:
@@ -66,7 +66,7 @@
     def rfind(self, w_tofind, w_start=None, w_end=None):
         self.check_valid()
         space = self.space
-        tofind = space.getarg_w('y#', w_tofind)
+        tofind = space.charbuf_w(w_tofind)
         if w_start is None:
             start = self.mmap.pos
         else:
@@ -98,7 +98,7 @@
 
     def write(self, w_data):
         self.check_valid()
-        data = self.space.getarg_w('y#', w_data)
+        data = self.space.charbuf_w(w_data)
         self.check_writeable()
         try:
             self.mmap.write(data)
diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -285,10 +285,10 @@
 def write(space, fd, w_data):
     """Write a string to a file descriptor.  Return the number of bytes
 actually written, which may be smaller than len(data)."""
-    data = space.readbuf_w(w_data)
+    data = space.charbuf_w(w_data)
     while True:
         try:
-            res = os.write(fd, data.as_str())
+            res = os.write(fd, data)
         except OSError as e:
             wrap_oserror(space, e, eintr_retry=True)
         else:
@@ -392,10 +392,10 @@
 def pwrite(space, fd, w_data, offset):
     """Write a string to a file descriptor at a given offset.
     """
-    data = space.readbuf_w(w_data)
+    data = space.charbuf_w(w_data)
     while True:
         try:
-            res = rposix.pwrite(fd, data.as_str(), offset)
+            res = rposix.pwrite(fd, data, offset)
         except OSError as e:
             wrap_oserror(space, e, eintr_retry=True)
         else:

From pypy.commits at gmail.com  Thu Apr 20 22:25:17 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 20 Apr 2017 19:25:17 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: space.bufferstr_w() with a single
 argument is just space.charbuf_w()
Message-ID: <58f96d8d.90d21c0a.23dc1.084a@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91106:97530758eddd
Date: 2017-04-21 03:24 +0100
http://bitbucket.org/pypy/pypy/changeset/97530758eddd/

Log:	space.bufferstr_w() with a single argument is just space.charbuf_w()

diff --git a/pypy/interpreter/gateway.py b/pypy/interpreter/gateway.py
--- a/pypy/interpreter/gateway.py
+++ b/pypy/interpreter/gateway.py
@@ -303,7 +303,7 @@
                              % (self.scopenext(), ))
 
     def visit_bufferstr(self, typ):
-        self.run_args.append("space.bufferstr_w(%s)" % (self.scopenext(),))
+        self.run_args.append("space.charbuf_w(%s)" % (self.scopenext(),))
 
     def visit_text_or_none(self, typ):
         self.run_args.append("space.text_or_none_w(%s)" % (self.scopenext(),))
diff --git a/pypy/module/_socket/interp_socket.py b/pypy/module/_socket/interp_socket.py
--- a/pypy/module/_socket/interp_socket.py
+++ b/pypy/module/_socket/interp_socket.py
@@ -482,7 +482,7 @@
         Like send(data, flags) but allows specifying the destination address.
         For IP sockets, the address is a pair (hostaddr, port).
         """
-        data = space.bufferstr_w(w_data)
+        data = space.charbuf_w(w_data)
         if w_param3 is None:
             # 2 args version
             flags = 0
diff --git a/pypy/module/_sre/interp_sre.py b/pypy/module/_sre/interp_sre.py
--- a/pypy/module/_sre/interp_sre.py
+++ b/pypy/module/_sre/interp_sre.py
@@ -468,7 +468,7 @@
     # Type check
     if not (space.is_none(w_pattern) or
             space.isinstance_w(w_pattern, space.w_unicode)):
-        space.bufferstr_w(w_pattern)
+        space.readbuf_w(w_pattern)
     srepat.w_pattern = w_pattern      # the original uncompiled pattern
     srepat.flags = flags
     srepat.code = code
diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -59,7 +59,7 @@
             a.descr_fromlist(space, w_initializer)
         else:
             try:
-                buf = space.bufferstr_w(w_initializer)
+                buf = space.charbuf_w(w_initializer)
             except OperationError as e:
                 if not e.match(space, space.w_TypeError):
                     raise
diff --git a/pypy/module/binascii/interp_binascii.py b/pypy/module/binascii/interp_binascii.py
--- a/pypy/module/binascii/interp_binascii.py
+++ b/pypy/module/binascii/interp_binascii.py
@@ -20,5 +20,5 @@
     def unwrap(self, space, w_value):
         if space.isinstance_w(w_value, space.w_unicode):
             w_value = space.call_method(w_value, "encode", space.newtext("ascii"))
-        return space.bufferstr_w(w_value)
+        return space.charbuf_w(w_value)
 
diff --git a/pypy/module/exceptions/interp_exceptions.py b/pypy/module/exceptions/interp_exceptions.py
--- a/pypy/module/exceptions/interp_exceptions.py
+++ b/pypy/module/exceptions/interp_exceptions.py
@@ -894,7 +894,7 @@
     def descr_init(self, space, w_encoding, w_object, w_start, w_end, w_reason):
         # typechecking
         if space.isinstance_w(w_object, space.w_bytearray):
-            w_bytes = space.newbytes(space.bufferstr_w(w_object))
+            w_bytes = space.newbytes(space.charbuf_w(w_object))
         else:
             w_bytes = w_object
         space.realtext_w(w_encoding)
diff --git a/pypy/module/operator/tscmp.py b/pypy/module/operator/tscmp.py
--- a/pypy/module/operator/tscmp.py
+++ b/pypy/module/operator/tscmp.py
@@ -57,8 +57,8 @@
 
 
 def compare_digest_buffer(space, w_a, w_b):
-    a = space.bufferstr_w(w_a)
-    b = space.bufferstr_w(w_b)
+    a = space.charbuf_w(w_a)
+    b = space.charbuf_w(w_b)
     with rffi.scoped_nonmovingbuffer(a) as a_buf:
         with rffi.scoped_nonmovingbuffer(b) as b_buf:
             result = pypy_tscmp(a_buf, b_buf, len(a), len(b))
diff --git a/pypy/module/pyexpat/interp_pyexpat.py b/pypy/module/pyexpat/interp_pyexpat.py
--- a/pypy/module/pyexpat/interp_pyexpat.py
+++ b/pypy/module/pyexpat/interp_pyexpat.py
@@ -644,7 +644,7 @@
             # Explicitly set UTF-8 encoding. Return code ignored.
             XML_SetEncoding(self.itself, "utf-8")
         else:
-            data = space.bufferstr_w(w_data)
+            data = space.charbuf_w(w_data)
         isfinal = bool(isfinal)
         res = XML_Parse(self.itself, data, len(data), isfinal)
         if self._exc_info:
diff --git a/pypy/module/zlib/interp_zlib.py b/pypy/module/zlib/interp_zlib.py
--- a/pypy/module/zlib/interp_zlib.py
+++ b/pypy/module/zlib/interp_zlib.py
@@ -202,7 +202,7 @@
     if space.is_none(w_zdict):
         zdict = None
     else:
-        zdict = space.bufferstr_w(w_zdict)
+        zdict = space.charbuf_w(w_zdict)
     stream = space.allocate_instance(Compress, w_subtype)
     stream = space.interp_w(Compress, stream)
     Compress.__init__(stream, space, level,
@@ -330,7 +330,7 @@
     if space.is_none(w_zdict):
         zdict = None
     else:
-        zdict = space.bufferstr_w(w_zdict)
+        zdict = space.charbuf_w(w_zdict)
     stream = space.allocate_instance(Decompress, w_subtype)
     stream = space.interp_w(Decompress, stream)
     Decompress.__init__(stream, space, wbits, zdict)
diff --git a/pypy/objspace/std/intobject.py b/pypy/objspace/std/intobject.py
--- a/pypy/objspace/std/intobject.py
+++ b/pypy/objspace/std/intobject.py
@@ -875,7 +875,7 @@
         elif (space.isinstance_w(w_value, space.w_bytearray) or
               space.isinstance_w(w_value, space.w_bytes)):
             return _string_to_int_or_long(space, w_inttype, w_value,
-                                          space.bufferstr_w(w_value))
+                                          space.charbuf_w(w_value))
         else:
             # If object supports the buffer interface
             try:
@@ -901,7 +901,7 @@
             s = unicode_to_decimal_w(space, w_value, allow_surrogates=True)
         elif (space.isinstance_w(w_value, space.w_bytes) or
               space.isinstance_w(w_value, space.w_bytearray)):
-            s = space.bufferstr_w(w_value)
+            s = space.charbuf_w(w_value)
         else:
             raise oefmt(space.w_TypeError,
                         "int() can't convert non-string with explicit base")

From pypy.commits at gmail.com  Thu Apr 20 22:39:00 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 20 Apr 2017 19:39:00 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: kill space.bufferstr_w()
Message-ID: <58f970c4.53851c0a.32dca.0a05@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91107:ae6739e57be0
Date: 2017-04-21 03:38 +0100
http://bitbucket.org/pypy/pypy/changeset/ae6739e57be0/

Log:	kill space.bufferstr_w()

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1540,23 +1540,6 @@
         else:
             assert False
 
-    # XXX rename/replace with code more like CPython getargs for buffers
-    def bufferstr_w(self, w_obj, flags=BUF_SIMPLE):
-        # Directly returns an interp-level str.  Note that if w_obj is a
-        # unicode string, this is different from str_w(buffer(w_obj)):
-        # indeed, the latter returns a string with the raw bytes from
-        # the underlying unicode buffer, but bufferstr_w() just converts
-        # the unicode to an ascii string.  This inconsistency is kind of
-        # needed because CPython has the same issue.  (Well, it's
-        # unclear if there is any use at all for getting the bytes in
-        # the unicode buffer.)
-        try:
-            return self.bytes_w(w_obj)
-        except OperationError as e:
-            if not e.match(self, self.w_TypeError):
-                raise
-        return self.buffer_w(w_obj, flags).as_str()
-
     def text_or_none_w(self, w_obj):
         return None if self.is_none(w_obj) else self.text_w(w_obj)
 
@@ -1686,7 +1669,12 @@
         from rpython.rlib import rstring
         if self.isinstance_w(w_obj, self.w_unicode):
             w_obj = self.fsencode(w_obj)
-        result = self.bufferstr_w(w_obj, self.BUF_FULL_RO)
+        try:
+            result = self.bytes_w(w_obj)
+        except OperationError as e:
+            if not e.match(self, self.w_TypeError):
+                raise
+            result = self.buffer_w(w_obj, self.BUF_FULL_RO).as_str()
         if '\x00' in result:
             raise oefmt(self.w_ValueError,
                         "argument must be a string without NUL characters")
diff --git a/pypy/interpreter/gateway.py b/pypy/interpreter/gateway.py
--- a/pypy/interpreter/gateway.py
+++ b/pypy/interpreter/gateway.py
@@ -471,7 +471,7 @@
                            % (self.nextarg()), )
 
     def visit_bufferstr(self, typ):
-        self.unwrap.append("space.bufferstr_w(%s)" % (self.nextarg(),))
+        self.unwrap.append("space.charbuf_w(%s)" % (self.nextarg(),))
 
     def visit_text_or_none(self, typ):
         self.unwrap.append("space.text_or_none_w(%s)" % (self.nextarg(),))

From pypy.commits at gmail.com  Thu Apr 20 23:11:58 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 20 Apr 2017 20:11:58 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Optimise the common case of slicing a
 SimpleBuffer (fixes #2516?)
Message-ID: <58f9787e.8bb2df0a.cbdee.971d@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91108:dce1ad161087
Date: 2017-04-21 04:11 +0100
http://bitbucket.org/pypy/pypy/changeset/dce1ad161087/

Log:	Optimise the common case of slicing a SimpleBuffer (fixes #2516?)

diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -5,7 +5,7 @@
 
 from rpython.rlib.objectmodel import compute_hash
 from pypy.interpreter.baseobjspace import W_Root
-from pypy.interpreter.buffer import PyBuffer, SubBuffer
+from pypy.interpreter.buffer import PyBuffer, SimpleBuffer, SubBuffer
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.gateway import interp2app
 from pypy.interpreter.typedef import TypeDef, GetSetProperty,  make_weakref_descr
@@ -166,7 +166,10 @@
             raise TypeError("memoryview: invalid slice key")
 
     def new_slice(self, start, stop, step, slicelength, dim):
-        sliced = BufferSlice(self.buf, start, step, slicelength)
+        if step == 1 and isinstance(self.buf, SimpleBuffer):
+            sliced = SimpleBuffer(SubBuffer(self.buf.data, start, slicelength))
+        else:
+            sliced = BufferSlice(self.buf, start, step, slicelength)
         return W_MemoryView(sliced)
 
     def init_len(self):

From pypy.commits at gmail.com  Thu Apr 20 23:25:14 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 20 Apr 2017 20:25:14 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: fix translation
Message-ID: <58f97b9a.172e1c0a.64b77.1048@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91109:015c3a23c327
Date: 2017-04-21 04:24 +0100
http://bitbucket.org/pypy/pypy/changeset/015c3a23c327/

Log:	fix translation

diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -166,10 +166,11 @@
             raise TypeError("memoryview: invalid slice key")
 
     def new_slice(self, start, stop, step, slicelength, dim):
-        if step == 1 and isinstance(self.buf, SimpleBuffer):
-            sliced = SimpleBuffer(SubBuffer(self.buf.data, start, slicelength))
+        pybuf = self.buf
+        if step == 1 and isinstance(pybuf, SimpleBuffer):
+            sliced = SimpleBuffer(SubBuffer(pybuf.data, start, slicelength))
         else:
-            sliced = BufferSlice(self.buf, start, step, slicelength)
+            sliced = BufferSlice(pybuf, start, step, slicelength)
         return W_MemoryView(sliced)
 
     def init_len(self):

From pypy.commits at gmail.com  Fri Apr 21 07:53:41 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Fri, 21 Apr 2017 04:53:41 -0700 (PDT)
Subject: [pypy-commit] pypy default: merge vmprof-0.4.4
Message-ID: <58f9f2c5.b4abdf0a.69bd9.2d33@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r91110:dd0dc2131308
Date: 2017-04-21 07:51 -0400
http://bitbucket.org/pypy/pypy/changeset/dd0dc2131308/

Log:	merge vmprof-0.4.4

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -49,6 +49,11 @@
 ^rpython/translator/goal/target.+-c$
 ^rpython/translator/goal/.+\.exe$
 ^rpython/translator/goal/.+\.dll$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.guess$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.h$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.log$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.status$
 ^pypy/goal/pypy-translation-snapshot$
 ^pypy/goal/pypy-c
 ^pypy/goal/.+\.exe$
diff --git a/pypy/module/_vmprof/__init__.py b/pypy/module/_vmprof/__init__.py
--- a/pypy/module/_vmprof/__init__.py
+++ b/pypy/module/_vmprof/__init__.py
@@ -12,6 +12,8 @@
         'enable': 'interp_vmprof.enable',
         'disable': 'interp_vmprof.disable',
         'write_all_code_objects': 'interp_vmprof.write_all_code_objects',
+        'is_enabled': 'interp_vmprof.is_enabled',
+        'get_profile_path': 'interp_vmprof.get_profile_path',
         'VMProfError': 'space.fromcache(interp_vmprof.Cache).w_VMProfError',
     }
 
diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -4,6 +4,7 @@
 from pypy.interpreter.pycode import PyCode
 from pypy.interpreter.baseobjspace import W_Root
 from rpython.rlib import rvmprof, jit
+from pypy.interpreter.error import oefmt
 
 # ____________________________________________________________
 
@@ -82,3 +83,16 @@
         rvmprof.disable()
     except rvmprof.VMProfError as e:
         raise VMProfError(space, e)
+
+def is_enabled(space):
+    return space.newbool(rvmprof.is_enabled())
+
+def get_profile_path(space):
+    path = rvmprof.get_profile_path(space)
+    if path is None:
+        # profiling is not enabled
+        return space.w_None
+    if path == "":
+        # Indicates an error! Assume platform does not implement the function call
+        raise oefmt(space.w_NotImplementedError, "platform not implemented")
+    return space.newtext(path)
diff --git a/pypy/module/_vmprof/test/test__vmprof.py b/pypy/module/_vmprof/test/test__vmprof.py
--- a/pypy/module/_vmprof/test/test__vmprof.py
+++ b/pypy/module/_vmprof/test/test__vmprof.py
@@ -94,3 +94,24 @@
         raises(_vmprof.VMProfError, _vmprof.enable, 2, 1e300 * 1e300, 0, 0, 0)
         NaN = (1e300*1e300) / (1e300*1e300)
         raises(_vmprof.VMProfError, _vmprof.enable, 2, NaN, 0, 0, 0)
+
+    def test_is_enabled(self):
+        import _vmprof
+        tmpfile = open(self.tmpfilename, 'wb')
+        assert _vmprof.is_enabled() is False
+        _vmprof.enable(tmpfile.fileno(), 0.01, 0, 0, 0)
+        assert _vmprof.is_enabled() is True
+        _vmprof.disable()
+        assert _vmprof.is_enabled() is False
+
+    def test_get_profile_path(self):
+        import _vmprof
+        tmpfile = open(self.tmpfilename, 'wb')
+        assert _vmprof.get_profile_path() is None
+        _vmprof.enable(tmpfile.fileno(), 0.01, 0, 0, 0)
+        path = _vmprof.get_profile_path()
+        if path != tmpfile.name:
+            with open(path, "rb") as fd1:
+                assert fd1.read() == tmpfile.read()
+        _vmprof.disable()
+        assert _vmprof.get_profile_path() is None
diff --git a/rpython/rlib/rvmprof/__init__.py b/rpython/rlib/rvmprof/__init__.py
--- a/rpython/rlib/rvmprof/__init__.py
+++ b/rpython/rlib/rvmprof/__init__.py
@@ -3,6 +3,7 @@
 from rpython.rlib.rvmprof.rvmprof import vmprof_execute_code, MAX_FUNC_NAME
 from rpython.rlib.rvmprof.rvmprof import _was_registered
 from rpython.rlib.rvmprof.cintf import VMProfPlatformUnsupported
+from rpython.rtyper.lltypesystem import rffi
 
 #
 # See README.txt.
@@ -37,3 +38,21 @@
 
 def disable():
     _get_vmprof().disable()
+
+def is_enabled():
+    vmp = _get_vmprof()
+    return vmp.is_enabled
+
+def get_profile_path(space):
+    vmp = _get_vmprof()
+    if not vmp.is_enabled:
+        return None
+
+    with rffi.scoped_alloc_buffer(4096) as buf:
+        length = vmp.cintf.vmprof_get_profile_path(buf.raw, buf.size) 
+        if length == -1:
+            return ""
+        return buf.str(length)
+
+    return None
+
diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -107,6 +107,10 @@
                                   lltype.Signed, compilation_info=eci,
                                   _nowrapper=True)
 
+    vmprof_get_profile_path = rffi.llexternal("vmprof_get_profile_path", [rffi.CCHARP, lltype.Signed],
+                                              lltype.Signed, compilation_info=eci,
+                                              _nowrapper=True)
+
     return CInterface(locals())
 
 
diff --git a/rpython/rlib/rvmprof/rvmprof.py b/rpython/rlib/rvmprof/rvmprof.py
--- a/rpython/rlib/rvmprof/rvmprof.py
+++ b/rpython/rlib/rvmprof/rvmprof.py
@@ -178,23 +178,6 @@
     arguments given to the decorated function.
 
     'result_class' is ignored (backward compatibility).
-
-    ====================================
-    TRANSLATION NOTE CALL THIS ONLY ONCE
-    ====================================
-
-    This function can only be called once during translation.
-    It generates a C function called __vmprof_eval_vmprof which is used by
-    the vmprof C source code and is bound as an extern function.
-    This is necessary while walking the native stack.
-    If you see __vmprof_eval_vmprof defined twice during
-    translation, read on:
-
-    To remove this restriction do the following:
-
-    *) Extend the macro IS_VMPROF_EVAL in the vmprof source repo to check several
-       sybmols.
-    *) Give each function provided to this decorator a unique symbol name in C
     """
     if _hack_update_stack_untranslated:
         from rpython.rtyper.annlowlevel import llhelper
diff --git a/rpython/rlib/rvmprof/src/rvmprof.c b/rpython/rlib/rvmprof/src/rvmprof.c
--- a/rpython/rlib/rvmprof/src/rvmprof.c
+++ b/rpython/rlib/rvmprof/src/rvmprof.c
@@ -29,3 +29,9 @@
     return ptr == __vmprof_eval_vmprof;
 }
 #endif
+
+
+long vmprof_get_profile_path(const char * buffer, long size)
+{
+    return vmp_fd_to_path(vmp_profile_fileno(), buffer, size);
+}
diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -35,6 +35,7 @@
 RPY_EXTERN long vmprof_stack_pop(void*);
 RPY_EXTERN void vmprof_stack_free(void*);
 RPY_EXTERN intptr_t vmprof_get_traceback(void *, void *, intptr_t*, intptr_t);
+RPY_EXTERN long vmprof_get_profile_path(const char *, long);
 
 long vmprof_write_header_for_jit_addr(intptr_t *result, long n,
                                       intptr_t addr, int max_depth);
diff --git a/rpython/rlib/rvmprof/src/shared/_vmprof.c b/rpython/rlib/rvmprof/src/shared/_vmprof.c
--- a/rpython/rlib/rvmprof/src/shared/_vmprof.c
+++ b/rpython/rlib/rvmprof/src/shared/_vmprof.c
@@ -1,8 +1,7 @@
-/*[clinic input]
-module _vmprof
-[clinic start generated code]*/
-/*[clinic end generated code: output=da39a3ee5e6b4b0d input=b443489e38f2be7d]*/
-
+/**
+ * This file is the CPython module _vmprof. It does not share code
+ * with PyPy. PyPy's _vmprof module is included in the main repo.
+ */
 #define _GNU_SOURCE 1
 
 #include <Python.h>
@@ -14,7 +13,7 @@
 static volatile int is_enabled = 0;
 static destructor Original_code_dealloc = 0;
 static PyObject* (*_default_eval_loop)(PyFrameObject *, int) = 0;
-void dump_native_symbols(int fileno);
+void vmp_scan_profile(int fileno, int dump_native, void *all_code_uids);
 
 #if VMPROF_UNIX
 #include "trampoline.h"
@@ -109,6 +108,33 @@
     return 0;
 }
 
+static int _look_for_code_object_seen(PyObject *o, void *all_codes)
+{
+    if (PyCode_Check(o) && PySet_GET_SIZE(all_codes)) {
+        Py_ssize_t i;
+        PyCodeObject *co = (PyCodeObject *)o;
+        PyObject *uid_co = PyLong_FromVoidPtr((void*)CODE_ADDR_TO_UID(co));
+        int check = PySet_Discard(all_codes, uid_co);
+
+        Py_CLEAR(uid_co);
+
+        if (check < 0)
+            return -1;
+
+        if (check && emit_code_object(co) < 0)
+            return -1;
+
+        i = PyTuple_Size(co->co_consts);
+        while (i > 0) {
+            --i;
+            if (_look_for_code_object(PyTuple_GET_ITEM(co->co_consts, i),
+                                      all_codes) < 0)
+                return -1;
+        }
+    }
+    return 0;
+}
+
 static void emit_all_code_objects(void)
 {
     PyObject *gc_module = NULL, *lst = NULL, *all_codes = NULL;
@@ -118,6 +144,48 @@
     if (gc_module == NULL)
         goto error;
 
+    // lst contains all objects that are known by the gc
+    lst = PyObject_CallMethod(gc_module, "get_objects", "");
+    if (lst == NULL || !PyList_Check(lst))
+        goto error;
+
+    // the set only includes the code objects found in the profile
+    all_codes = PySet_New(NULL);
+    if (all_codes == NULL)
+        goto error;
+
+    size = PyList_GET_SIZE(lst);
+    for (i = 0; i < size; i++) {
+        PyObject *o = PyList_GET_ITEM(lst, i);
+        if (o->ob_type->tp_traverse &&
+            o->ob_type->tp_traverse(o, _look_for_code_object, (void *)all_codes)
+                < 0)
+            goto error;
+    }
+
+ error:
+    Py_XDECREF(all_codes);
+    Py_XDECREF(lst);
+    Py_XDECREF(gc_module);
+}
+
+static int add_code_addr(void *all_code_uids, void *addr)
+{
+    PyObject *co_uid = PyLong_FromVoidPtr(addr);
+    int check = PySet_Add((PyObject*) all_code_uids, co_uid);
+    Py_CLEAR(co_uid);
+    return check;
+}
+
+static void emit_all_code_objects_seen(int fileno)
+{
+    PyObject *gc_module = NULL, *lst = NULL, *all_codes = NULL;
+    Py_ssize_t i, size;
+
+    gc_module = PyImport_ImportModuleNoBlock("gc");
+    if (gc_module == NULL)
+        goto error;
+
     lst = PyObject_CallMethod(gc_module, "get_objects", "");
     if (lst == NULL || !PyList_Check(lst))
         goto error;
@@ -126,16 +194,21 @@
     if (all_codes == NULL)
         goto error;
 
+    // fill up all_codes with every code object found in the profile
+    vmp_scan_profile(fileno, 0, all_codes);
+
+    // intersect the list with the set and dump only the code objects
+    // found in the set!
     size = PyList_GET_SIZE(lst);
     for (i = 0; i < size; i++) {
         PyObject *o = PyList_GET_ITEM(lst, i);
         if (o->ob_type->tp_traverse &&
-            o->ob_type->tp_traverse(o, _look_for_code_object, (void *)all_codes)
-                < 0)
+                o->ob_type->tp_traverse(o, _look_for_code_object_seen, (void *) all_codes)
+            < 0)
             goto error;
     }
 
- error:
+    error:
     Py_XDECREF(all_codes);
     Py_XDECREF(lst);
     Py_XDECREF(gc_module);
@@ -162,8 +235,16 @@
     if (!PyArg_ParseTuple(args, "id|iii", &fd, &interval, &memory, &lines, &native)) {
         return NULL;
     }
-    assert(fd >= 0 && "file descripter provided to vmprof must not" \
-                      " be less then zero.");
+
+    if (write(fd, NULL, 0) != 0) {
+        PyErr_SetString(PyExc_ValueError, "file descriptor must be writeable");
+        return NULL;
+    }
+
+    if ((read(fd, NULL, 0) != 0) && (native != 0)) {
+        PyErr_SetString(PyExc_ValueError, "file descriptor must be readable for native profiling");
+        return NULL;
+    }
 
     if (is_enabled) {
         PyErr_SetString(PyExc_ValueError, "vmprof is already enabled");
@@ -194,16 +275,53 @@
     return Py_None;
 }
 
+static PyObject * vmp_is_enabled(PyObject *module, PyObject *noargs) {
+    if (is_enabled) {
+        Py_RETURN_TRUE;
+    }
+    Py_RETURN_FALSE;
+}
+
 static PyObject *
-disable_vmprof(PyObject *module, PyObject *noarg)
+disable_vmprof(PyObject *module, PyObject *args)
 {
+    int fd = vmp_profile_fileno();
+    int only_needed = 0;
+
+    if (!PyArg_ParseTuple(args, "|i", &only_needed)) {
+        return NULL;
+    }
+
+#if VMPROF_UNIX
+    if ((read(fd, NULL, 0) != 0) && (only_needed != 0)) {
+        PyErr_SetString(PyExc_ValueError,
+                        "file descriptor must be readable to save only needed code objects");
+        return NULL;
+    }
+#else
+    if (only_needed) {
+        PyErr_SetString(PyExc_ValueError,
+                        "saving only needed code objects is not supported for windows");
+        return NULL;
+    }
+#endif
+
     if (!is_enabled) {
         PyErr_SetString(PyExc_ValueError, "vmprof is not enabled");
         return NULL;
     }
+
     is_enabled = 0;
     vmprof_ignore_signals(1);
+
+#if VMPROF_UNIX
+    if (only_needed)
+        emit_all_code_objects_seen(fd);
+    else
+        emit_all_code_objects();
+#else
     emit_all_code_objects();
+#endif
 
     if (vmprof_disable() < 0) {
         PyErr_SetFromErrno(PyExc_OSError);
@@ -320,15 +438,36 @@
 }
 #endif
 
+#ifdef VMPROF_UNIX
+static PyObject * vmp_get_profile_path(PyObject *module, PyObject *noargs) {
+    PyObject * o;
+    if (is_enabled) {
+        char buffer[4096];
+        buffer[0] = 0;
+        ssize_t buffer_len = vmp_fd_to_path(vmp_profile_fileno(), buffer, 4096);
+        if (buffer_len == -1) {
+            PyErr_Format(PyExc_NotImplementedError, "not implemented platform %s", vmp_machine_os_name());
+            return NULL;
+        }
+        return PyStr_n_NEW(buffer, buffer_len);
+    }
+    Py_RETURN_NONE;
+}
+#endif
+
 static PyMethodDef VMProfMethods[] = {
     {"enable",  enable_vmprof, METH_VARARGS, "Enable profiling."},
-    {"disable", disable_vmprof, METH_NOARGS, "Disable profiling."},
+    {"disable", disable_vmprof, METH_VARARGS, "Disable profiling."},
     {"write_all_code_objects", write_all_code_objects, METH_NOARGS,
      "Write eagerly all the IDs of code objects"},
     {"sample_stack_now", sample_stack_now, METH_VARARGS, "Sample the stack now"},
 #ifdef VMP_SUPPORTS_NATIVE_PROFILING
     {"resolve_addr", resolve_addr, METH_VARARGS, "Return the name of the addr"},
 #endif
+    {"is_enabled", vmp_is_enabled, METH_NOARGS, "Indicates if vmprof is currently sampling."},
+#ifdef VMPROF_UNIX
+    {"get_profile_path", vmp_get_profile_path, METH_NOARGS, "Profile path the profiler logs to."},
+#endif
     {NULL, NULL, 0, NULL}        /* Sentinel */
 };
 
diff --git a/rpython/rlib/rvmprof/src/shared/compat.h b/rpython/rlib/rvmprof/src/shared/compat.h
--- a/rpython/rlib/rvmprof/src/shared/compat.h
+++ b/rpython/rlib/rvmprof/src/shared/compat.h
@@ -7,11 +7,13 @@
       #define PyStr_AS_STRING PyBytes_AS_STRING
       #define PyStr_GET_SIZE PyBytes_GET_SIZE
       #define PyStr_NEW      PyUnicode_FromString
+      #define PyStr_n_NEW      PyUnicode_FromStringAndSize
       #define PyLong_NEW     PyLong_FromSsize_t
 #  else
       #define PyStr_AS_STRING PyString_AS_STRING
       #define PyStr_GET_SIZE PyString_GET_SIZE
       #define PyStr_NEW      PyString_FromString
+      #define PyStr_n_NEW      PyString_FromStringAndSize
       #define PyLong_NEW     PyInt_FromSsize_t
       #define PyLong_AsLong  PyInt_AsLong
 #  endif
diff --git a/rpython/rlib/rvmprof/src/shared/khash.h b/rpython/rlib/rvmprof/src/shared/khash.h
new file mode 100644
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/khash.h
@@ -0,0 +1,627 @@
+/* The MIT License
+
+   Copyright (c) 2008, 2009, 2011 by Attractive Chaos <attractor at live.co.uk>
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+*/
+
+/*
+  An example:
+
+#include "khash.h"
+KHASH_MAP_INIT_INT(32, char)
+int main() {
+	int ret, is_missing;
+	khiter_t k;
+	khash_t(32) *h = kh_init(32);
+	k = kh_put(32, h, 5, &ret);
+	kh_value(h, k) = 10;
+	k = kh_get(32, h, 10);
+	is_missing = (k == kh_end(h));
+	k = kh_get(32, h, 5);
+	kh_del(32, h, k);
+	for (k = kh_begin(h); k != kh_end(h); ++k)
+		if (kh_exist(h, k)) kh_value(h, k) = 1;
+	kh_destroy(32, h);
+	return 0;
+}
+*/
+
+/*
+  2013-05-02 (0.2.8):
+
+	* Use quadratic probing. When the capacity is power of 2, stepping function
+	  i*(i+1)/2 guarantees to traverse each bucket. It is better than double
+	  hashing on cache performance and is more robust than linear probing.
+
+	  In theory, double hashing should be more robust than quadratic probing.
+	  However, my implementation is probably not for large hash tables, because
+	  the second hash function is closely tied to the first hash function,
+	  which reduce the effectiveness of double hashing.
+
+	Reference: http://research.cs.vt.edu/AVresearch/hashing/quadratic.php
+
+  2011-12-29 (0.2.7):
+
+    * Minor code clean up; no actual effect.
+
+  2011-09-16 (0.2.6):
+
+	* The capacity is a power of 2. This seems to dramatically improve the
+	  speed for simple keys. Thank Zilong Tan for the suggestion. Reference:
+
+	   - http://code.google.com/p/ulib/
+	   - http://nothings.org/computer/judy/
+
+	* Allow to optionally use linear probing which usually has better
+	  performance for random input. Double hashing is still the default as it
+	  is more robust to certain non-random input.
+
+	* Added Wang's integer hash function (not used by default). This hash
+	  function is more robust to certain non-random input.
+
+  2011-02-14 (0.2.5):
+
+    * Allow to declare global functions.
+
+  2009-09-26 (0.2.4):
+
+    * Improve portability
+
+  2008-09-19 (0.2.3):
+
+	* Corrected the example
+	* Improved interfaces
+
+  2008-09-11 (0.2.2):
+
+	* Improved speed a little in kh_put()
+
+  2008-09-10 (0.2.1):
+
+	* Added kh_clear()
+	* Fixed a compiling error
+
+  2008-09-02 (0.2.0):
+
+	* Changed to token concatenation which increases flexibility.
+
+  2008-08-31 (0.1.2):
+
+	* Fixed a bug in kh_get(), which has not been tested previously.
+
+  2008-08-31 (0.1.1):
+
+	* Added destructor
+*/
+
+
+#ifndef __AC_KHASH_H
+#define __AC_KHASH_H
+
+/*!
+  @header
+
+  Generic hash table library.
+ */
+
+#define AC_VERSION_KHASH_H "0.2.8"
+
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+/* compiler specific configuration */
+
+#if UINT_MAX == 0xffffffffu
+typedef unsigned int khint32_t;
+#elif ULONG_MAX == 0xffffffffu
+typedef unsigned long khint32_t;
+#endif
+
+#if ULONG_MAX == ULLONG_MAX
+typedef unsigned long khint64_t;
+#else
+typedef unsigned long long khint64_t;
+#endif
+
+#ifndef kh_inline
+#ifdef _MSC_VER
+#define kh_inline __inline
+#else
+#define kh_inline inline
+#endif
+#endif /* kh_inline */
+
+#ifndef klib_unused
+#if (defined __clang__ && __clang_major__ >= 3) || (defined __GNUC__ && __GNUC__ >= 3)
+#define klib_unused __attribute__ ((__unused__))
+#else
+#define klib_unused
+#endif
+#endif /* klib_unused */
+
+typedef khint32_t khint_t;
+typedef khint_t khiter_t;
+
+#define __ac_isempty(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&2)
+#define __ac_isdel(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&1)
+#define __ac_iseither(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&3)
+#define __ac_set_isdel_false(flag, i) (flag[i>>4]&=~(1ul<<((i&0xfU)<<1)))
+#define __ac_set_isempty_false(flag, i) (flag[i>>4]&=~(2ul<<((i&0xfU)<<1)))
+#define __ac_set_isboth_false(flag, i) (flag[i>>4]&=~(3ul<<((i&0xfU)<<1)))
+#define __ac_set_isdel_true(flag, i) (flag[i>>4]|=1ul<<((i&0xfU)<<1))
+
+#define __ac_fsize(m) ((m) < 16? 1 : (m)>>4)
+
+#ifndef kroundup32
+#define kroundup32(x) (--(x), (x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16, ++(x))
+#endif
+
+#ifndef kcalloc
+#define kcalloc(N,Z) calloc(N,Z)
+#endif
+#ifndef kmalloc
+#define kmalloc(Z) malloc(Z)
+#endif
+#ifndef krealloc
+#define krealloc(P,Z) realloc(P,Z)
+#endif
+#ifndef kfree
+#define kfree(P) free(P)
+#endif
+
+static const double __ac_HASH_UPPER = 0.77;
+
+#define __KHASH_TYPE(name, khkey_t, khval_t) \
+	typedef struct kh_##name##_s { \
+		khint_t n_buckets, size, n_occupied, upper_bound; \
+		khint32_t *flags; \
+		khkey_t *keys; \
+		khval_t *vals; \
+	} kh_##name##_t;
+
+#define __KHASH_PROTOTYPES(name, khkey_t, khval_t)	 					\
+	extern kh_##name##_t *kh_init_##name(void);							\
+	extern void kh_destroy_##name(kh_##name##_t *h);					\
+	extern void kh_clear_##name(kh_##name##_t *h);						\
+	extern khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); 	\
+	extern int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
+	extern khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \
+	extern void kh_del_##name(kh_##name##_t *h, khint_t x);
+
+#define __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	SCOPE kh_##name##_t *kh_init_##name(void) {							\
+		return (kh_##name##_t*)kcalloc(1, sizeof(kh_##name##_t));		\
+	}																	\
+	SCOPE void kh_destroy_##name(kh_##name##_t *h)						\
+	{																	\
+		if (h) {														\
+			kfree((void *)h->keys); kfree(h->flags);					\
+			kfree((void *)h->vals);										\
+			kfree(h);													\
+		}																\
+	}																	\
+	SCOPE void kh_clear_##name(kh_##name##_t *h)						\
+	{																	\
+		if (h && h->flags) {											\
+			memset(h->flags, 0xaa, __ac_fsize(h->n_buckets) * sizeof(khint32_t)); \
+			h->size = h->n_occupied = 0;								\
+		}																\
+	}																	\
+	SCOPE khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) 	\
+	{																	\
+		if (h->n_buckets) {												\
+			khint_t k, i, last, mask, step = 0; \
+			mask = h->n_buckets - 1;									\
+			k = __hash_func(key); i = k & mask;							\
+			last = i; \
+			while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
+				i = (i + (++step)) & mask; \
+				if (i == last) return h->n_buckets;						\
+			}															\
+			return __ac_iseither(h->flags, i)? h->n_buckets : i;		\
+		} else return 0;												\
+	}																	\
+	SCOPE int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
+	{ /* This function uses 0.25*n_buckets bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets. */ \
+		khint32_t *new_flags = 0;										\
+		khint_t j = 1;													\
+		{																\
+			kroundup32(new_n_buckets); 									\
+			if (new_n_buckets < 4) new_n_buckets = 4;					\
+			if (h->size >= (khint_t)(new_n_buckets * __ac_HASH_UPPER + 0.5)) j = 0;	/* requested size is too small */ \
+			else { /* hash table size to be changed (shrink or expand); rehash */ \
+				new_flags = (khint32_t*)kmalloc(__ac_fsize(new_n_buckets) * sizeof(khint32_t));	\
+				if (!new_flags) return -1;								\
+				memset(new_flags, 0xaa, __ac_fsize(new_n_buckets) * sizeof(khint32_t)); \
+				if (h->n_buckets < new_n_buckets) {	/* expand */		\
+					khkey_t *new_keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
+					if (!new_keys) { kfree(new_flags); return -1; }		\
+					h->keys = new_keys;									\
+					if (kh_is_map) {									\
+						khval_t *new_vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \
+						if (!new_vals) { kfree(new_flags); return -1; }	\
+						h->vals = new_vals;								\
+					}													\
+				} /* otherwise shrink */								\
+			}															\
+		}																\
+		if (j) { /* rehashing is needed */								\
+			for (j = 0; j != h->n_buckets; ++j) {						\
+				if (__ac_iseither(h->flags, j) == 0) {					\
+					khkey_t key = h->keys[j];							\
+					khval_t val;										\
+					khint_t new_mask;									\
+					new_mask = new_n_buckets - 1; 						\
+					if (kh_is_map) val = h->vals[j];					\
+					__ac_set_isdel_true(h->flags, j);					\
+					while (1) { /* kick-out process; sort of like in Cuckoo hashing */ \
+						khint_t k, i, step = 0; \
+						k = __hash_func(key);							\
+						i = k & new_mask;								\
+						while (!__ac_isempty(new_flags, i)) i = (i + (++step)) & new_mask; \
+						__ac_set_isempty_false(new_flags, i);			\
+						if (i < h->n_buckets && __ac_iseither(h->flags, i) == 0) { /* kick out the existing element */ \
+							{ khkey_t tmp = h->keys[i]; h->keys[i] = key; key = tmp; } \
+							if (kh_is_map) { khval_t tmp = h->vals[i]; h->vals[i] = val; val = tmp; } \
+							__ac_set_isdel_true(h->flags, i); /* mark it as deleted in the old hash table */ \
+						} else { /* write the element and jump out of the loop */ \
+							h->keys[i] = key;							\
+							if (kh_is_map) h->vals[i] = val;			\
+							break;										\
+						}												\
+					}													\
+				}														\
+			}															\
+			if (h->n_buckets > new_n_buckets) { /* shrink the hash table */ \
+				h->keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
+				if (kh_is_map) h->vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \
+			}															\
+			kfree(h->flags); /* free the working space */				\
+			h->flags = new_flags;										\
+			h->n_buckets = new_n_buckets;								\
+			h->n_occupied = h->size;									\
+			h->upper_bound = (khint_t)(h->n_buckets * __ac_HASH_UPPER + 0.5); \
+		}																\
+		return 0;														\
+	}																	\
+	SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \
+	{																	\
+		khint_t x;														\
+		if (h->n_occupied >= h->upper_bound) { /* update the hash table */ \
+			if (h->n_buckets > (h->size<<1)) {							\
+				if (kh_resize_##name(h, h->n_buckets - 1) < 0) { /* clear "deleted" elements */ \
+					*ret = -1; return h->n_buckets;						\
+				}														\
+			} else if (kh_resize_##name(h, h->n_buckets + 1) < 0) { /* expand the hash table */ \
+				*ret = -1; return h->n_buckets;							\
+			}															\
+		} /* TODO: to implement automatically shrinking; resize() already support shrinking */ \
+		{																\
+			khint_t k, i, site, last, mask = h->n_buckets - 1, step = 0; \
+			x = site = h->n_buckets; k = __hash_func(key); i = k & mask; \
+			if (__ac_isempty(h->flags, i)) x = i; /* for speed up */	\
+			else {														\
+				last = i; \
+				while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
+					if (__ac_isdel(h->flags, i)) site = i;				\
+					i = (i + (++step)) & mask; \
+					if (i == last) { x = site; break; }					\
+				}														\
+				if (x == h->n_buckets) {								\
+					if (__ac_isempty(h->flags, i) && site != h->n_buckets) x = site; \
+					else x = i;											\
+				}														\
+			}															\
+		}																\
+		if (__ac_isempty(h->flags, x)) { /* not present at all */		\
+			h->keys[x] = key;											\
+			__ac_set_isboth_false(h->flags, x);							\
+			++h->size; ++h->n_occupied;									\
+			*ret = 1;													\
+		} else if (__ac_isdel(h->flags, x)) { /* deleted */				\
+			h->keys[x] = key;											\
+			__ac_set_isboth_false(h->flags, x);							\
+			++h->size;													\
+			*ret = 2;													\
+		} else *ret = 0; /* Don't touch h->keys[x] if present and not deleted */ \
+		return x;														\
+	}																	\
+	SCOPE void kh_del_##name(kh_##name##_t *h, khint_t x)				\
+	{																	\
+		if (x != h->n_buckets && !__ac_iseither(h->flags, x)) {			\
+			__ac_set_isdel_true(h->flags, x);							\
+			--h->size;													\
+		}																\
+	}
+
+#define KHASH_DECLARE(name, khkey_t, khval_t)		 					\
+	__KHASH_TYPE(name, khkey_t, khval_t) 								\
+	__KHASH_PROTOTYPES(name, khkey_t, khval_t)
+
+#define KHASH_INIT2(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	__KHASH_TYPE(name, khkey_t, khval_t) 								\
+	__KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal)
+
+#define KHASH_INIT(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	KHASH_INIT2(name, static kh_inline klib_unused, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal)
+
+/* --- BEGIN OF HASH FUNCTIONS --- */
+
+/*! @function
+  @abstract     Integer hash function
+  @param  key   The integer [khint32_t]
+  @return       The hash value [khint_t]
+ */
+#define kh_int_hash_func(key) (khint32_t)(key)
+/*! @function
+  @abstract     Integer comparison function
+ */
+#define kh_int_hash_equal(a, b) ((a) == (b))
+/*! @function
+  @abstract     64-bit integer hash function
+  @param  key   The integer [khint64_t]
+  @return       The hash value [khint_t]
+ */
+#define kh_int64_hash_func(key) (khint32_t)((key)>>33^(key)^(key)<<11)
+/*! @function
+  @abstract     64-bit integer comparison function
+ */
+#define kh_int64_hash_equal(a, b) ((a) == (b))
+/*! @function
+  @abstract     const char* hash function
+  @param  s     Pointer to a null terminated string
+  @return       The hash value
+ */
+static kh_inline khint_t __ac_X31_hash_string(const char *s)
+{
+	khint_t h = (khint_t)*s;
+	if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)*s;
+	return h;
+}
+/*! @function
+  @abstract     Another interface to const char* hash function
+  @param  key   Pointer to a null terminated string [const char*]
+  @return       The hash value [khint_t]
+ */
+#define kh_str_hash_func(key) __ac_X31_hash_string(key)
+/*! @function
+  @abstract     Const char* comparison function
+ */
+#define kh_str_hash_equal(a, b) (strcmp(a, b) == 0)
+
+static kh_inline khint_t __ac_Wang_hash(khint_t key)
+{
+    key += ~(key << 15);
+    key ^=  (key >> 10);
+    key +=  (key << 3);
+    key ^=  (key >> 6);
+    key += ~(key << 11);
+    key ^=  (key >> 16);
+    return key;
+}
+#define kh_int_hash_func2(key) __ac_Wang_hash((khint_t)key)
+
+/* --- END OF HASH FUNCTIONS --- */
+
+/* Other convenient macros... */
+
+/*!
+  @abstract Type of the hash table.
+  @param  name  Name of the hash table [symbol]
+ */
+#define khash_t(name) kh_##name##_t
+
+/*! @function
+  @abstract     Initiate a hash table.
+  @param  name  Name of the hash table [symbol]
+  @return       Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_init(name) kh_init_##name()
+
+/*! @function
+  @abstract     Destroy a hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_destroy(name, h) kh_destroy_##name(h)
+
+/*! @function
+  @abstract     Reset a hash table without deallocating memory.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_clear(name, h) kh_clear_##name(h)
+
+/*! @function
+  @abstract     Resize a hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  s     New size [khint_t]
+ */
+#define kh_resize(name, h, s) kh_resize_##name(h, s)
+
+/*! @function
+  @abstract     Insert a key to the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Key [type of keys]
+  @param  r     Extra return code: -1 if the operation failed;
+                0 if the key is present in the hash table;
+                1 if the bucket is empty (never used); 2 if the element in
+				the bucket has been deleted [int*]
+  @return       Iterator to the inserted element [khint_t]
+ */
+#define kh_put(name, h, k, r) kh_put_##name(h, k, r)
+
+/*! @function
+  @abstract     Retrieve a key from the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Key [type of keys]
+  @return       Iterator to the found element, or kh_end(h) if the element is absent [khint_t]
+ */
+#define kh_get(name, h, k) kh_get_##name(h, k)
+
+/*! @function
+  @abstract     Remove a key from the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Iterator to the element to be deleted [khint_t]
+ */
+#define kh_del(name, h, k) kh_del_##name(h, k)
+
+/*! @function
+  @abstract     Test whether a bucket contains data.
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       1 if containing data; 0 otherwise [int]
+ */
+#define kh_exist(h, x) (!__ac_iseither((h)->flags, (x)))
+
+/*! @function
+  @abstract     Get key given an iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       Key [type of keys]
+ */
+#define kh_key(h, x) ((h)->keys[x])
+
+/*! @function
+  @abstract     Get value given an iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       Value [type of values]
+  @discussion   For hash sets, calling this results in segfault.
+ */
+#define kh_val(h, x) ((h)->vals[x])
+
+/*! @function
+  @abstract     Alias of kh_val()
+ */
+#define kh_value(h, x) ((h)->vals[x])
+
+/*! @function
+  @abstract     Get the start iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       The start iterator [khint_t]
+ */
+#define kh_begin(h) (khint_t)(0)
+
+/*! @function
+  @abstract     Get the end iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       The end iterator [khint_t]
+ */
+#define kh_end(h) ((h)->n_buckets)
+
+/*! @function
+  @abstract     Get the number of elements in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       Number of elements in the hash table [khint_t]
+ */
+#define kh_size(h) ((h)->size)
+
+/*! @function
+  @abstract     Get the number of buckets in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       Number of buckets in the hash table [khint_t]
+ */
+#define kh_n_buckets(h) ((h)->n_buckets)
+
+/*! @function
+  @abstract     Iterate over the entries in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  kvar  Variable to which key will be assigned
+  @param  vvar  Variable to which value will be assigned
+  @param  code  Block of code to execute
+ */
+#define kh_foreach(h, kvar, vvar, code) { khint_t __i;		\
+	for (__i = kh_begin(h); __i != kh_end(h); ++__i) {		\
+		if (!kh_exist(h,__i)) continue;						\
+		(kvar) = kh_key(h,__i);								\
+		(vvar) = kh_val(h,__i);								\
+		code;												\
+	} }
+
+/*! @function
+  @abstract     Iterate over the values in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  vvar  Variable to which value will be assigned
+  @param  code  Block of code to execute
+ */
+#define kh_foreach_value(h, vvar, code) { khint_t __i;		\
+	for (__i = kh_begin(h); __i != kh_end(h); ++__i) {		\
+		if (!kh_exist(h,__i)) continue;						\
+		(vvar) = kh_val(h,__i);								\
+		code;												\
+	} }
+
+/* More conenient interfaces */
+
+/*! @function
+  @abstract     Instantiate a hash set containing integer keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_INT(name)										\
+	KHASH_INIT(name, khint32_t, char, 0, kh_int_hash_func, kh_int_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing integer keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_INT(name, khval_t)								\
+	KHASH_INIT(name, khint32_t, khval_t, 1, kh_int_hash_func, kh_int_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing 64-bit integer keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_INT64(name)										\
+	KHASH_INIT(name, khint64_t, char, 0, kh_int64_hash_func, kh_int64_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing 64-bit integer keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_INT64(name, khval_t)								\
+	KHASH_INIT(name, khint64_t, khval_t, 1, kh_int64_hash_func, kh_int64_hash_equal)
+
+typedef const char *kh_cstr_t;
+/*! @function
+  @abstract     Instantiate a hash map containing const char* keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_STR(name)										\
+	KHASH_INIT(name, kh_cstr_t, char, 0, kh_str_hash_func, kh_str_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing const char* keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_STR(name, khval_t)								\
+	KHASH_INIT(name, kh_cstr_t, khval_t, 1, kh_str_hash_func, kh_str_hash_equal)
+
+#endif /* __AC_KHASH_H */
diff --git a/rpython/rlib/rvmprof/src/shared/machine.c b/rpython/rlib/rvmprof/src/shared/machine.c
--- a/rpython/rlib/rvmprof/src/shared/machine.c
+++ b/rpython/rlib/rvmprof/src/shared/machine.c
@@ -3,6 +3,11 @@
 #include "vmprof.h"
 #include <stdio.h>
 
+#ifdef VMPROF_UNIX
+#include <unistd.h>
+#include <fcntl.h>
+#endif
+
 int vmp_machine_bits(void)
 {
     return sizeof(void*)*8;
@@ -27,3 +32,15 @@
 #endif
 }
 
+long vmp_fd_to_path(int fd, char * buffer, long buffer_len)
+{
+#ifdef VMPROF_LINUX
+    char proffs[24];
+    (void)snprintf(proffs, 24, "/proc/self/fd/%d", fd);
+    return readlink(proffs, buffer, buffer_len);
+#elif defined(VMPROF_UNIX)
+    fcntl(fd, F_GETPATH, buffer);
+    return strlen(buffer);
+#endif
+    return -1;
+}
diff --git a/rpython/rlib/rvmprof/src/shared/machine.h b/rpython/rlib/rvmprof/src/shared/machine.h
--- a/rpython/rlib/rvmprof/src/shared/machine.h
+++ b/rpython/rlib/rvmprof/src/shared/machine.h
@@ -10,3 +10,9 @@
  */
 const char * vmp_machine_os_name(void);
 
+/**
+ * Writes the filename into buffer. Returns -1 if the platform is not
+ * implemented.
+ */
+long vmp_fd_to_path(int fd, char * buffer, long buffer_len);
+
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c b/rpython/rlib/rvmprof/src/shared/symboltable.c
--- a/rpython/rlib/rvmprof/src/shared/symboltable.c
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.c
@@ -3,11 +3,15 @@
 #include "vmprof.h"
 #include "machine.h"
 
+#include "khash.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <assert.h>
 #include <dlfcn.h>
+
 #if defined(VMPROF_LINUX)
 #include <link.h>
 #endif
@@ -206,15 +210,20 @@
 struct backtrace_state * bstate = NULL;
 int vmp_resolve_addr(void * addr, char * name, int name_len, int * lineno, char * srcfile, int srcfile_len) {
 #ifdef __APPLE__
-    Dl_info info;
-    if (dladdr((const void*)addr, &info) == 0) {
+    Dl_info dlinfo;
+    if (dladdr((const void*)addr, &dlinfo) == 0) {
         return 1;
     }
-    if (info.dli_sname != NULL) {
-        (void)strncpy(name, info.dli_sname, name_len-1);
+    if (dlinfo.dli_sname != NULL) {
+        (void)strncpy(name, dlinfo.dli_sname, name_len-1);
         name[name_len-1] = 0;
     }
-    lookup_vmprof_debug_info(name, info.dli_fbase, srcfile, srcfile_len, lineno);
+    lookup_vmprof_debug_info(name, dlinfo.dli_fbase, srcfile, srcfile_len, lineno);
+    // copy the shared object name to the source file name if source cannot be determined
+    if (srcfile[0] == 0 && dlinfo.dli_fname != NULL) {
+        (void)strncpy(srcfile, dlinfo.dli_fname, srcfile_len-1);
+        srcfile[srcfile_len-1] = 0;
+    }
 #elif defined(VMPROF_LINUX)
     if (bstate == NULL) {
         bstate = backtrace_create_state (NULL, 1, backtrace_error_cb, NULL);
@@ -238,6 +247,18 @@
             (void)strncpy(info.name, dlinfo.dli_sname, info.name_len-1);
             name[name_len-1] = 0;
         }
+
+    }
+
+    // copy the shared object name to the source file name if source cannot be determined
+    if (srcfile[0] == 0) {
+        Dl_info dlinfo;
+        dlinfo.dli_fname = NULL;
+        (void)dladdr((const void*)addr, &dlinfo);
+        if (dlinfo.dli_fname != NULL) {
+            (void)strncpy(srcfile, dlinfo.dli_fname, srcfile_len-1);
+            srcfile[srcfile_len-1] = 0;
+        }
     }
 #endif
     return 0;
@@ -338,8 +359,9 @@
     return 0;
 }
 
+KHASH_MAP_INIT_INT(ptr, intptr_t)
 
-void dump_native_symbols(int fileno)
+void vmp_scan_profile(int fileno, int dump_nat_sym, void *all_code_uids)
 {
     off_t orig_pos, cur_pos;
     char marker;
@@ -350,6 +372,9 @@
     fsync(fileno);
     orig_pos = lseek(fileno, 0, SEEK_CUR);
 
+    khash_t(ptr) * nat_syms = kh_init(ptr);
+    khiter_t it;
+
     lseek(fileno, 5*WORD_SIZE, SEEK_SET);
 
     while (1) {
@@ -363,11 +388,17 @@
             case MARKER_HEADER: {
                 LOG("header 0x%llx\n", cur_pos);
                 if (_skip_header(fileno, &version, &flags) != 0) {
+                    kh_destroy(ptr, nat_syms);
                     return;
                 }
                 memory = (flags & PROFILE_MEMORY) != 0;
                 native = (flags & PROFILE_NATIVE) != 0;
                 lines = (flags & PROFILE_LINES) != 0;
+                if (!native && dump_nat_sym) {
+                    lseek(fileno, 0, SEEK_END);
+                    kh_destroy(ptr, nat_syms);
+                    return;
+                }
                 break;
             } case MARKER_META: {
                 LOG("meta 0x%llx\n", cur_pos);
@@ -400,19 +431,46 @@
 #else
                 for (i = 0; i < depth; i++) {
                     void * addr = _read_addr(fileno);
+                    if (lines && i % 2 == 0) {
+                        continue;
+                    }
                     if (((intptr_t)addr & 0x1) == 1) {
 #endif
-                        LOG("found kind %p\n", addr);
-                        char name[MAXLEN];
-                        char srcfile[MAXLEN];
-                        name[0] = 0;
-                        srcfile[0] = 0;
-                        int lineno = 0;
-                        if (vmp_resolve_addr(addr, name, MAXLEN, &lineno, srcfile, MAXLEN) == 0) {
-                            LOG("dumping add %p, name %s, %s:%d\n", addr, name, srcfile, lineno);
-                            _dump_native_symbol(fileno, addr, name, lineno, srcfile);
+                        /* dump the native symbol to disk */
+                        if (dump_nat_sym) {
+                            LOG("found kind %p\n", addr);
+
+                            // if the address has already been dumped,
+                            // do not log it again!
+                            it = kh_get(ptr, nat_syms, (intptr_t)addr);
+                            if (it == kh_end(nat_syms)) {
+                                char name[MAXLEN];
+                                char srcfile[MAXLEN];
+                                name[0] = 0;
+                                srcfile[0] = 0;
+                                int lineno = 0;
+                                if (vmp_resolve_addr(addr, name, MAXLEN, &lineno, srcfile, MAXLEN) == 0) {
+                                    LOG("dumping add %p, name %s, %s:%d\n", addr, name, srcfile, lineno);
+                                    _dump_native_symbol(fileno, addr, name, lineno, srcfile);
+                                    int ret;
+                                    it = kh_put(ptr, nat_syms, (intptr_t)addr, &ret);
+                                    kh_value(nat_syms, it) = 1;
+                                }
+                            }
+                        }
+#ifdef RPYTHON_VMPROF
+                    }
+#else
+                    } else {
+                        // cpython adds all addresses into a set to get the intersection
+                        // of all gc known code addresses
+                        if (all_code_uids != NULL) {
+                            PyObject *co_uid = PyLong_FromVoidPtr(addr);
+                            int check = PySet_Add(all_code_uids, co_uid);
+                            Py_CLEAR(co_uid);
                         }
                     }
+#endif
                 }
                 LOG("passed  memory %d \n", memory);
 
@@ -427,6 +485,7 @@
             } default: {
                 fprintf(stderr, "unknown marker 0x%x\n", marker);
                 lseek(fileno, 0, SEEK_END);
+                kh_destroy(ptr, nat_syms);
                 return;
             }
         }
@@ -437,5 +496,11 @@
         }
     }
 
+    kh_destroy(ptr, nat_syms);
     lseek(fileno, 0, SEEK_END);
 }
+
+void dump_native_symbols(int fileno)
+{
+    vmp_scan_profile(fileno, 1, NULL);
+}
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.h b/rpython/rlib/rvmprof/src/shared/symboltable.h
--- a/rpython/rlib/rvmprof/src/shared/symboltable.h
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.h
@@ -17,5 +17,7 @@
  */
 void dump_all_known_symbols(int fd);
 
+void dump_native_symbols(int fd);
+
 int vmp_resolve_addr(void * addr, char * name, int name_len, int * lineno,
                       char * srcfile, int srcfile_len);
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_main.h b/rpython/rlib/rvmprof/src/shared/vmprof_main.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof_main.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof_main.h
@@ -218,7 +218,7 @@
         if (p == NULL) {
             /* ignore this signal: there are no free buffers right now */
         } else {
-#ifdef RPYTHON_VMPORF
+#ifdef RPYTHON_VMPROF
             commit = _vmprof_sample_stack(p, NULL, (ucontext_t*)ucontext);
 #else
             commit = _vmprof_sample_stack(p, tstate, (ucontext_t*)ucontext);

From pypy.commits at gmail.com  Fri Apr 21 07:53:43 2017
From: pypy.commits at gmail.com (plan_rich)
Date: Fri, 21 Apr 2017 04:53:43 -0700 (PDT)
Subject: [pypy-commit] pypy default: document branch
Message-ID: <58f9f2c7.051a1c0a.67f76.9959@mx.google.com>

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r91111:00d6de106be5
Date: 2017-04-21 07:52 -0400
http://bitbucket.org/pypy/pypy/changeset/00d6de106be5/

Log:	document branch

diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -28,3 +28,5 @@
 Performance tweaks in the x86 JIT-generated machine code: rarely taken
 blocks are moved off-line.  Also, the temporary register used to contain
 large constants is reused across instructions.
+
+.. branch: vmprof-0.4.4

From pypy.commits at gmail.com  Fri Apr 21 08:54:11 2017
From: pypy.commits at gmail.com (mattip)
Date: Fri, 21 Apr 2017 05:54:11 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: update external win32 libraries,
 adjust cffi build scripts
Message-ID: <58fa00f3.9d451c0a.394d0.a7b6@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.5
Changeset: r91112:8a8a6257682e
Date: 2017-04-21 15:52 +0300
http://bitbucket.org/pypy/pypy/changeset/8a8a6257682e/

Log:	update external win32 libraries, adjust cffi build scripts

diff --git a/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py b/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
--- a/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
+++ b/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
@@ -63,6 +63,12 @@
 */
 
 #ifdef _WIN32
+#ifdef _MSC_VER
+#ifdef inline
+#undef inline
+#endif
+#define inline __inline
+#endif
 #include <Windows.h>
 typedef CRITICAL_SECTION mutex1_t;
 static inline void mutex1_init(mutex1_t *mutex) {
diff --git a/lib_pypy/_lzma_build.py b/lib_pypy/_lzma_build.py
--- a/lib_pypy/_lzma_build.py
+++ b/lib_pypy/_lzma_build.py
@@ -235,6 +235,9 @@
 """)
 
 ffi.set_source('_lzma_cffi', """
+#ifdef _MSC_VER
+#define LZMA_API_STATIC
+#endif
 #include <lzma.h>
 #include <stdlib.h>
 void _pylzma_stream_init(lzma_stream *strm) {
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -27,7 +27,7 @@
 made it available as the `Microsoft Visual C++ Compiler for Python 2.7`_ (the link
 was checked in Nov 2016). Note that the compiler suite will be installed in
 ``C:\Users\<user name>\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python``.
-Using a current version of ``setuptools`` will be able to find it there. For
+A current version of ``setuptools`` will be able to find it there. For
 Windows 10, you must right-click the download, and under ``Properties`` ->
 ``Compatibility`` mark it as ``Run run this program in comatibility mode for``
 ``Previous version...``. Also, you must download and install the ``.Net Framework 3.5``,
@@ -40,8 +40,9 @@
 Translating PyPy with Visual Studio
 -----------------------------------
 
-We routinely test translation using Visual Studio 2008, Express
-Edition.  Other configurations may work as well.
+We routinely test translation using v9, also known as Visual Studio 2008.
+Our buildbot is still using the Express Edition, not the compiler noted above.
+Other configurations may work as well.
 
 The translation scripts will set up the appropriate environment variables
 for the compiler, so you do not need to run vcvars before translation.
@@ -117,6 +118,8 @@
 -----------------------------------------------------------
 
 Download the versions of all the external packages from
+https://bitbucket.org/pypy/pypy/downloads/local_5.8.zip
+(for post-5.7.1 builds) or
 https://bitbucket.org/pypy/pypy/downloads/local_2.4.zip
 (for 2.4 release and later) or
 https://bitbucket.org/pypy/pypy/downloads/local.zip
@@ -173,13 +176,14 @@
 The zlib compression library
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Download http://www.gzip.org/zlib/zlib-1.2.3.tar.gz and extract it in
-the base directory.  Then compile as a static library::
+Download http://www.gzip.org/zlib/zlib-1.2.11.tar.gz and extract it in
+the base directory.  Then compile::
 
-    cd zlib-1.2.3
+    cd zlib-1.2.11
     nmake -f win32\Makefile.msc
     copy zlib.lib <somewhere in LIB>
     copy zlib.h zconf.h <somewhere in INCLUDE>
+    copy zlib1.dll <in PATH> # (needed for tests via ll2ctypes)
 
 
 The bz2 compression library
@@ -198,22 +202,23 @@
 
 PyPy uses cffi to interact with sqlite3.dll. Only the dll is needed, the cffi
 wrapper is compiled when the module is imported for the first time.
-The sqlite3.dll should be version 3.6.21 for CPython2.7 compatablility.
+The sqlite3.dll should be version 3.8.11 for CPython2.7 compatablility.
 
 
 The expat XML parser
 ~~~~~~~~~~~~~~~~~~~~
 
 Download the source code of expat on sourceforge:
-http://sourceforge.net/projects/expat/ and extract it in the base directory.
-Version 2.1.0 is known to pass tests. Then open the project file ``expat.dsw``
+https://github.com/libexpat/libexpat/releases and extract it in the base directory.
+Version 2.1.1 is known to pass tests. Then open the project file ``expat.dsw``
 with Visual Studio; follow the instruction for converting the project files,
 switch to the "Release" configuration, use the ``expat_static`` project,
-reconfigure the runtime for Multi-threaded DLL (/MD) and build.
+reconfigure the runtime for Multi-threaded DLL (/MD) and build. Do the same for
+the ``expat`` project to build the ``expat.dll`` (for tests via ll2ctypes)
 
-Then, copy the file ``win32\bin\release\libexpat.lib`` somewhere in somewhere
-in LIB, and both ``lib\expat.h`` and ``lib\expat_external.h`` somewhere in
-INCLUDE.
+Then, copy the file ``win32\bin\release\libexpat.lib`` into
+LIB, and both ``lib\expat.h`` and ``lib\expat_external.h`` in
+INCLUDE, and ``win32\bin\release\libexpat.dll`` into PATH.
 
 
 The OpenSSL library
@@ -222,15 +227,13 @@
 OpenSSL needs a Perl interpreter to configure its makefile.  You may
 use the one distributed by ActiveState, or the one from cygwin.::
 
-    svn export http://svn.python.org/projects/external/openssl-1.0.1i
-    cd openssl-1.0.1i
+    svn export http://svn.python.org/projects/external/openssl-1.0.2k
+    cd openssl-1.0.2k
     perl Configure VC-WIN32 no-idea no-mdc2
     ms\do_ms.bat
     nmake -f ms\nt.mak install
-
-Then, copy the files ``out32\*.lib`` somewhere in
-somewhere in LIB, and the entire ``include\openssl`` directory as-is somewhere
-in INCLUDE.
+    copy out32\*.lib <somewhere in LIB>
+    xcopy /S include\openssl <somewhere in INCLUDE>
 
 
 TkInter module support
@@ -263,6 +266,9 @@
 http://tukaani.org/xz/xz-5.0.5-windows.zip, check the signature
 http://tukaani.org/xz/xz-5.0.5-windows.zip.sig
 
+Then copy the headers to the include directory, rename ``liblzma.a`` to 
+``lzma.lib`` and copy it to the lib directory
+
 
 Using the mingw compiler
 ------------------------

From pypy.commits at gmail.com  Fri Apr 21 09:04:25 2017
From: pypy.commits at gmail.com (mattip)
Date: Fri, 21 Apr 2017 06:04:25 -0700 (PDT)
Subject: [pypy-commit] pypy default: update for newer external win32
 libraries
Message-ID: <58fa0359.972e1c0a.d5e14.c231@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r91113:01f4f2927769
Date: 2017-04-21 16:03 +0300
http://bitbucket.org/pypy/pypy/changeset/01f4f2927769/

Log:	update for newer external win32 libraries

diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -27,7 +27,7 @@
 made it available as the `Microsoft Visual C++ Compiler for Python 2.7`_ (the link
 was checked in Nov 2016). Note that the compiler suite will be installed in
 ``C:\Users\<user name>\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python``.
-Using a current version of ``setuptools`` will be able to find it there. For
+A current version of ``setuptools`` will be able to find it there. For
 Windows 10, you must right-click the download, and under ``Properties`` ->
 ``Compatibility`` mark it as ``Run run this program in comatibility mode for``
 ``Previous version...``. Also, you must download and install the ``.Net Framework 3.5``,
@@ -40,8 +40,9 @@
 Translating PyPy with Visual Studio
 -----------------------------------
 
-We routinely test translation using Visual Studio 2008, Express
-Edition.  Other configurations may work as well.
+We routinely test translation using v9, also known as Visual Studio 2008.
+Our buildbot is still using the Express Edition, not the compiler noted above.
+Other configurations may work as well.
 
 The translation scripts will set up the appropriate environment variables
 for the compiler, so you do not need to run vcvars before translation.
@@ -117,6 +118,9 @@
 -----------------------------------------------------------
 
 Download the versions of all the external packages from
+https://bitbucket.org/pypy/pypy/downloads/local_5.8.zip
+(for post-5.7.1 builds) with sha256 checksum 
+``cc375a677aabcb46a50b96f23bdebd0b526cbb02202b85a7148845e2849ffd6d`` or
 https://bitbucket.org/pypy/pypy/downloads/local_2.4.zip
 (for 2.4 release and later) or
 https://bitbucket.org/pypy/pypy/downloads/local.zip
@@ -173,13 +177,14 @@
 The zlib compression library
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Download http://www.gzip.org/zlib/zlib-1.2.3.tar.gz and extract it in
-the base directory.  Then compile as a static library::
+Download http://www.gzip.org/zlib/zlib-1.2.11.tar.gz and extract it in
+the base directory.  Then compile::
 
-    cd zlib-1.2.3
+    cd zlib-1.2.11
     nmake -f win32\Makefile.msc
     copy zlib.lib <somewhere in LIB>
     copy zlib.h zconf.h <somewhere in INCLUDE>
+    copy zlib1.dll <in PATH> # (needed for tests via ll2ctypes)
 
 
 The bz2 compression library
@@ -198,22 +203,23 @@
 
 PyPy uses cffi to interact with sqlite3.dll. Only the dll is needed, the cffi
 wrapper is compiled when the module is imported for the first time.
-The sqlite3.dll should be version 3.6.21 for CPython2.7 compatablility.
+The sqlite3.dll should be version 3.8.11 for CPython2.7 compatablility.
 
 
 The expat XML parser
 ~~~~~~~~~~~~~~~~~~~~
 
 Download the source code of expat on sourceforge:
-http://sourceforge.net/projects/expat/ and extract it in the base directory.
-Version 2.1.0 is known to pass tests. Then open the project file ``expat.dsw``
+https://github.com/libexpat/libexpat/releases and extract it in the base directory.
+Version 2.1.1 is known to pass tests. Then open the project file ``expat.dsw``
 with Visual Studio; follow the instruction for converting the project files,
 switch to the "Release" configuration, use the ``expat_static`` project,
-reconfigure the runtime for Multi-threaded DLL (/MD) and build.
+reconfigure the runtime for Multi-threaded DLL (/MD) and build. Do the same for
+the ``expat`` project to build the ``expat.dll`` (for tests via ll2ctypes)
 
-Then, copy the file ``win32\bin\release\libexpat.lib`` somewhere in somewhere
-in LIB, and both ``lib\expat.h`` and ``lib\expat_external.h`` somewhere in
-INCLUDE.
+Then, copy the file ``win32\bin\release\libexpat.lib`` into
+LIB, and both ``lib\expat.h`` and ``lib\expat_external.h`` in
+INCLUDE, and ``win32\bin\release\libexpat.dll`` into PATH.
 
 
 The OpenSSL library
@@ -222,15 +228,13 @@
 OpenSSL needs a Perl interpreter to configure its makefile.  You may
 use the one distributed by ActiveState, or the one from cygwin.::
 
-    svn export http://svn.python.org/projects/external/openssl-1.0.1i
-    cd openssl-1.0.1i
+    svn export http://svn.python.org/projects/external/openssl-1.0.2k
+    cd openssl-1.0.2k
     perl Configure VC-WIN32 no-idea no-mdc2
     ms\do_ms.bat
     nmake -f ms\nt.mak install
-
-Then, copy the files ``out32\*.lib`` somewhere in
-somewhere in LIB, and the entire ``include\openssl`` directory as-is somewhere
-in INCLUDE.
+    copy out32\*.lib <somewhere in LIB>
+    xcopy /S include\openssl <somewhere in INCLUDE>
 
 
 TkInter module support
@@ -263,6 +267,9 @@
 http://tukaani.org/xz/xz-5.0.5-windows.zip, check the signature
 http://tukaani.org/xz/xz-5.0.5-windows.zip.sig
 
+Then copy the headers to the include directory, rename ``liblzma.a`` to 
+``lzma.lib`` and copy it to the lib directory
+
 
 Using the mingw compiler
 ------------------------

From pypy.commits at gmail.com  Fri Apr 21 10:38:47 2017
From: pypy.commits at gmail.com (mattip)
Date: Fri, 21 Apr 2017 07:38:47 -0700 (PDT)
Subject: [pypy-commit] pypy default: update for newer zip
Message-ID: <58fa1977.43cf1c0a.9ae80.c8ed@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r91114:2d815768f073
Date: 2017-04-21 17:35 +0300
http://bitbucket.org/pypy/pypy/changeset/2d815768f073/

Log:	update for newer zip

diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -120,7 +120,7 @@
 Download the versions of all the external packages from
 https://bitbucket.org/pypy/pypy/downloads/local_5.8.zip
 (for post-5.7.1 builds) with sha256 checksum 
-``cc375a677aabcb46a50b96f23bdebd0b526cbb02202b85a7148845e2849ffd6d`` or
+``f1510452293f22e84d6059464e11f4c62ffd0e2ee97a52be9195bec8a70c6dce`` or
 https://bitbucket.org/pypy/pypy/downloads/local_2.4.zip
 (for 2.4 release and later) or
 https://bitbucket.org/pypy/pypy/downloads/local.zip

From pypy.commits at gmail.com  Sat Apr 22 07:13:36 2017
From: pypy.commits at gmail.com (ntruessel)
Date: Sat, 22 Apr 2017 04:13:36 -0700 (PDT)
Subject: [pypy-commit] pypy quad-color-gc: Add import script for qcgc
Message-ID: <58fb3ae0.86e51c0a.a29fe.f4f9@mx.google.com>

Author: Nicolas Truessel <ntruessel at njsm.de>
Branch: quad-color-gc
Changeset: r91115:5d861f5ae857
Date: 2017-04-22 13:00 +0200
http://bitbucket.org/pypy/pypy/changeset/5d861f5ae857/

Log:	Add import script for qcgc

diff --git a/rpython/translator/c/src/qcgc/import_qcgc.py b/rpython/translator/c/src/qcgc/import_qcgc.py
new file mode 100755
--- /dev/null
+++ b/rpython/translator/c/src/qcgc/import_qcgc.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+'''Usage: import_qcgc.py [PATH_TO_QCGC]'''
+import sys
+import py.path
+
+
+# Configuration
+whitelist = ['src', 'config.h', 'qcgc.c', 'qcgc.h']
+
+
+def main(qcgc_dir):
+    qcgc_src = py.path.local(qcgc_dir)
+    include = lambda f: len(set([ x.basename for x in f.parts()]) & set(whitelist)) > 0
+    qcgc_files = qcgc_src.visit(fil=include, rec=include)
+    qcgc_dest = py.path.local(__file__).join('..')
+    for src_file in qcgc_files:
+        dest_file = qcgc_dest.join(src_file.relto(qcgc_src))
+        dest_file.join('..').ensure(dir=True)
+        if dest_file.check():
+            dest_file.remove()
+        src_file.copy(dest_file)
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 2:
+        print(__doc__)
+        sys.exit(2)
+    main(sys.argv[1])

From pypy.commits at gmail.com  Sat Apr 22 15:16:51 2017
From: pypy.commits at gmail.com (arigo)
Date: Sat, 22 Apr 2017 12:16:51 -0700 (PDT)
Subject: [pypy-commit] pypy.org extradoc: update the values
Message-ID: <58fbac23.0b941c0a.ad1f4.668b@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r881:6bdf17522e91
Date: 2017-04-22 21:16 +0200
http://bitbucket.org/pypy/pypy.org/changeset/6bdf17522e91/

Log:	update the values

diff --git a/don1.html b/don1.html
--- a/don1.html
+++ b/don1.html
@@ -15,7 +15,7 @@
 </script>
 
    <!-- Income:PyPy:Donations:Py3k / 0.95 -->
-   $66793 of $105000 (63.6%)
+   $66798 of $105000 (63.6%)
    <div id="progressbar">
    </div>
 
@@ -23,7 +23,7 @@
   <li>
   <span id="donate_text">This donation goes towards supporting Python 3 in PyPy.
   Current status:
-    we have $2601 left
+    we have $2605 left
   in the account.</br> <a href="py3donate.html">Read proposal</a></span>
   </li>
   <li>
diff --git a/don4.html b/don4.html
--- a/don4.html
+++ b/don4.html
@@ -17,7 +17,7 @@
    2nd call:
    <!-- Income:PyPy:Donations:Transactional Memory from April 8, 2014,
    divided by 0.9 -->
-   $59050 of $80000 (73.8%)
+   $59060 of $80000 (73.8%)
    <div id="progressbar">
    </div>
 
@@ -29,7 +29,7 @@
   
   <!--
   Current status:
-    we have $48238 left
+    we have $48246 left
   in the account.</br> <a href="tmdonate2.html">Read proposal (2nd call)</a></span>
   </li>
   <li>

From pypy.commits at gmail.com  Sat Apr 22 17:07:42 2017
From: pypy.commits at gmail.com (mjacob)
Date: Sat, 22 Apr 2017 14:07:42 -0700 (PDT)
Subject: [pypy-commit] pypy default: Fix test to make a bit more sense.
Message-ID: <58fbc61e.5a541c0a.f40a5.6a30@mx.google.com>

Author: Manuel Jacob <me at manueljacob.de>
Branch: 
Changeset: r91116:9ef459636100
Date: 2017-04-22 23:06 +0200
http://bitbucket.org/pypy/pypy/changeset/9ef459636100/

Log:	Fix test to make a bit more sense.

diff --git a/pypy/module/test_lib_pypy/test_md5_extra.py b/pypy/module/test_lib_pypy/test_md5_extra.py
--- a/pypy/module/test_lib_pypy/test_md5_extra.py
+++ b/pypy/module/test_lib_pypy/test_md5_extra.py
@@ -69,7 +69,7 @@
 
         # Update and compare...
         for i in range(len(cases)):
-            message = cases[i][0]
+            message = cases[i]
 
             m1c.update(message)
             d1 = m1c.hexdigest()

From pypy.commits at gmail.com  Sat Apr 22 17:24:37 2017
From: pypy.commits at gmail.com (mjacob)
Date: Sat, 22 Apr 2017 14:24:37 -0700 (PDT)
Subject: [pypy-commit] pypy default: Fix / clean up more tests.
Message-ID: <58fbca15.cfa9df0a.b9938.011b@mx.google.com>

Author: Manuel Jacob <me at manueljacob.de>
Branch: 
Changeset: r91117:b6eb464863f4
Date: 2017-04-22 23:23 +0200
http://bitbucket.org/pypy/pypy/changeset/b6eb464863f4/

Log:	Fix / clean up more tests.

diff --git a/pypy/module/test_lib_pypy/test_md5_extra.py b/pypy/module/test_lib_pypy/test_md5_extra.py
--- a/pypy/module/test_lib_pypy/test_md5_extra.py
+++ b/pypy/module/test_lib_pypy/test_md5_extra.py
@@ -68,9 +68,7 @@
         w_m2c = space.call_method(w_m2, 'copy')
 
         # Update and compare...
-        for i in range(len(cases)):
-            message = cases[i]
-
+        for message in cases:
             m1c.update(message)
             d1 = m1c.hexdigest()
 
@@ -147,13 +145,10 @@
              "57edf4a22be3c955ac49da2e2107b67a"),
             )
 
-        for i in range(len(cases)):
-            res = self.compare(cases[i][0])
+        for message, expectedResult in cases:
+            res = self.compare(message)
             if res is not None:
                 d1, d2 = res
-                message, expectedResult = cases[i][0], None
-                if len(cases[i]) == 2:
-                    expectedResult = cases[i][1]
                 self.print_diff(message, d1, d2, expectedResult)
             assert res is None
 
@@ -182,27 +177,25 @@
             "123456789 123456789 123456789 12345678",
             )
 
-        for i in range(len(cases)):
-            res = self.compare(cases[i][0])
+        for message in cases:
+            res = self.compare(message)
             if res is not None:
                 d1, d2 = res
-                message = cases[i][0]
                 self.print_diff(message, d1, d2)
             assert res is None
 
     def test3(self):
         """Test cases with long messages (can take a while)."""
         cases = (
-            (2**10*'a',),
-            (2**10*'abcd',),
-            #(2**20*'a',),  # 1 MB, takes about 160 sec. on a 233 Mhz Pentium.
+            2**10*'a',
+            2**10*'abcd',
+            #2**20*'a',  # 1 MB, takes about 160 sec. on a 233 Mhz Pentium.
             )
 
-        for i in range(len(cases)):
-            res = self.compare(cases[i][0])
+        for message in cases:
+            res = self.compare(message)
             if res is not None:
                 d1, d2 = res
-                message = cases[i][0]
                 self.print_diff(message, d1, d2)
             assert res is None
 

From pypy.commits at gmail.com  Sat Apr 22 17:48:01 2017
From: pypy.commits at gmail.com (arigo)
Date: Sat, 22 Apr 2017 14:48:01 -0700 (PDT)
Subject: [pypy-commit] pypy default: Crash with a fatal warning when trying
 to translate PyPy with --sandbox.
Message-ID: <58fbcf91.54091c0a.5b57a.7613@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91118:13ba684a8c50
Date: 2017-04-22 23:47 +0200
http://bitbucket.org/pypy/pypy/changeset/13ba684a8c50/

Log:	Crash with a fatal warning when trying to translate PyPy with
	--sandbox. People that really want to play with it can remove the
	"assert 0".

diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -307,6 +307,9 @@
             config.translation.jit = True
 
         if config.translation.sandbox:
+            assert 0, ("--sandbox is not tested nor maintained.  If you "
+                       "really want to try it anyway, remove this line in "
+                       "pypy/goal/targetpypystandalone.py.")
             config.objspace.lonepycfiles = False
 
         if config.objspace.usemodules.cpyext:

From pypy.commits at gmail.com  Sun Apr 23 17:39:52 2017
From: pypy.commits at gmail.com (mjacob)
Date: Sun, 23 Apr 2017 14:39:52 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: hg merge default
Message-ID: <58fd1f28.0e2f1c0a.cba16.afe1@mx.google.com>

Author: Manuel Jacob <me at manueljacob.de>
Branch: py3.5
Changeset: r91119:a9d85e47f5ca
Date: 2017-04-23 23:28 +0200
http://bitbucket.org/pypy/pypy/changeset/a9d85e47f5ca/

Log:	hg merge default

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -51,6 +51,11 @@
 ^rpython/translator/goal/target.+-c$
 ^rpython/translator/goal/.+\.exe$
 ^rpython/translator/goal/.+\.dll$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.guess$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.h$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.log$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.status$
 ^pypy/goal/pypy-translation-snapshot$
 ^pypy/goal/pypy-c
 ^pypy/goal/pypy3-c
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -28,3 +28,5 @@
 Performance tweaks in the x86 JIT-generated machine code: rarely taken
 blocks are moved off-line.  Also, the temporary register used to contain
 large constants is reused across instructions.
+
+.. branch: vmprof-0.4.4
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -119,7 +119,8 @@
 
 Download the versions of all the external packages from
 https://bitbucket.org/pypy/pypy/downloads/local_5.8.zip
-(for post-5.7.1 builds) or
+(for post-5.7.1 builds) with sha256 checksum 
+``f1510452293f22e84d6059464e11f4c62ffd0e2ee97a52be9195bec8a70c6dce`` or
 https://bitbucket.org/pypy/pypy/downloads/local_2.4.zip
 (for 2.4 release and later) or
 https://bitbucket.org/pypy/pypy/downloads/local.zip
diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -321,6 +321,11 @@
         elif config.objspace.usemodules.pypyjit:
             config.translation.jit = True
 
+        if config.translation.sandbox:
+            assert 0, ("--sandbox is not tested nor maintained.  If you "
+                       "really want to try it anyway, remove this line in "
+                       "pypy/goal/targetpypystandalone.py.")
+
         if config.objspace.usemodules.cpyext:
             if config.translation.gc not in ('incminimark', 'boehm'):
                 raise Exception("The 'cpyext' module requires the 'incminimark'"
diff --git a/pypy/module/_vmprof/__init__.py b/pypy/module/_vmprof/__init__.py
--- a/pypy/module/_vmprof/__init__.py
+++ b/pypy/module/_vmprof/__init__.py
@@ -12,6 +12,8 @@
         'enable': 'interp_vmprof.enable',
         'disable': 'interp_vmprof.disable',
         'write_all_code_objects': 'interp_vmprof.write_all_code_objects',
+        'is_enabled': 'interp_vmprof.is_enabled',
+        'get_profile_path': 'interp_vmprof.get_profile_path',
         'VMProfError': 'space.fromcache(interp_vmprof.Cache).w_VMProfError',
     }
 
diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -4,6 +4,7 @@
 from pypy.interpreter.pycode import PyCode
 from pypy.interpreter.baseobjspace import W_Root
 from rpython.rlib import rvmprof, jit
+from pypy.interpreter.error import oefmt
 
 # ____________________________________________________________
 
@@ -82,3 +83,16 @@
         rvmprof.disable()
     except rvmprof.VMProfError as e:
         raise VMProfError(space, e)
+
+def is_enabled(space):
+    return space.newbool(rvmprof.is_enabled())
+
+def get_profile_path(space):
+    path = rvmprof.get_profile_path(space)
+    if path is None:
+        # profiling is not enabled
+        return space.w_None
+    if path == "":
+        # Indicates an error! Assume platform does not implement the function call
+        raise oefmt(space.w_NotImplementedError, "platform not implemented")
+    return space.newtext(path)
diff --git a/pypy/module/_vmprof/test/test__vmprof.py b/pypy/module/_vmprof/test/test__vmprof.py
--- a/pypy/module/_vmprof/test/test__vmprof.py
+++ b/pypy/module/_vmprof/test/test__vmprof.py
@@ -97,3 +97,24 @@
         raises(_vmprof.VMProfError, _vmprof.enable, 2, 1e300 * 1e300, 0, 0, 0)
         NaN = (1e300*1e300) / (1e300*1e300)
         raises(_vmprof.VMProfError, _vmprof.enable, 2, NaN, 0, 0, 0)
+
+    def test_is_enabled(self):
+        import _vmprof
+        tmpfile = open(self.tmpfilename, 'wb')
+        assert _vmprof.is_enabled() is False
+        _vmprof.enable(tmpfile.fileno(), 0.01, 0, 0, 0)
+        assert _vmprof.is_enabled() is True
+        _vmprof.disable()
+        assert _vmprof.is_enabled() is False
+
+    def test_get_profile_path(self):
+        import _vmprof
+        tmpfile = open(self.tmpfilename, 'wb')
+        assert _vmprof.get_profile_path() is None
+        _vmprof.enable(tmpfile.fileno(), 0.01, 0, 0, 0)
+        path = _vmprof.get_profile_path()
+        if path != tmpfile.name:
+            with open(path, "rb") as fd1:
+                assert fd1.read() == tmpfile.read()
+        _vmprof.disable()
+        assert _vmprof.get_profile_path() is None
diff --git a/pypy/module/cpyext/test/issue2482.c b/pypy/module/cpyext/test/issue2482.c
new file mode 100644
--- /dev/null
+++ b/pypy/module/cpyext/test/issue2482.c
@@ -0,0 +1,107 @@
+
+#include "Python.h"
+//#define ISSUE_2482
+
+typedef struct {
+    PyObject_HEAD
+    // Some extra storage:
+    char blank[500];
+} instance;
+
+static PyObject * get_basicsize(PyObject *self, PyObject * arg)
+{
+    return PyLong_FromLong(((PyTypeObject*)arg)->tp_basicsize);
+}
+
+const char *name = "issue2482_object";
+static
+PyObject *make_object_base_type(void) {
+
+    PyHeapTypeObject *heap_type = (PyHeapTypeObject *) PyType_Type.tp_alloc(&PyType_Type, 0);
+    if (!heap_type) return NULL;
+
+    PyTypeObject *type = &heap_type->ht_type;
+    type->tp_name = name;
+#ifdef ISSUE_2482
+    type->tp_base = &PyBaseObject_Type; /*fails */
+#else 
+    type->tp_base = &PyType_Type;
+#endif
+    type->tp_basicsize = sizeof(instance);
+    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
+
+    if (PyType_Ready(type) < 0)
+        return NULL;
+
+    return (PyObject *) heap_type;
+};
+
+static PyMethodDef issue2482_functions[] = {
+    {"get_basicsize", (PyCFunction)get_basicsize, METH_O, NULL},
+    {NULL,        NULL}    /* Sentinel */
+};
+
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef moduledef = {
+    PyModuleDef_HEAD_INIT,
+    "issue2482",
+    "Module Doc",
+    -1,
+    issue2482_functions, 
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+};
+#define INITERROR return NULL
+
+/* Initialize this module. */
+#ifdef __GNUC__
+extern __attribute__((visibility("default")))
+#else
+extern __declspec(dllexport)
+#endif
+
+PyMODINIT_FUNC
+PyInit_issue2482(void)
+
+#else
+
+#define INITERROR return
+
+/* Initialize this module. */
+#ifdef __GNUC__
+extern __attribute__((visibility("default")))
+#else
+extern __declspec(dllexport)
+#endif
+
+PyMODINIT_FUNC
+initissue2482(void)
+#endif
+{
+#if PY_MAJOR_VERSION >= 3
+    PyObject *module = PyModule_Create(&moduledef);
+#else
+    PyObject *module = Py_InitModule("issue2482", issue2482_functions);
+#endif
+    if (module == NULL)
+        INITERROR;
+
+    PyHeapTypeObject *heap_type = (PyHeapTypeObject *) PyType_Type.tp_alloc(&PyType_Type, 0);
+    if (!heap_type) INITERROR;
+
+    PyTypeObject *type = &heap_type->ht_type;
+    type->tp_name = name;
+
+    PyObject *base = make_object_base_type();
+    if (! base) INITERROR;
+    Py_INCREF(base);
+    type->tp_base = (PyTypeObject *) base;
+    type->tp_basicsize = ((PyTypeObject *) base)->tp_basicsize;
+    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE | Py_TPFLAGS_CHECKTYPES;
+
+    if (PyType_Ready(type) < 0) INITERROR;
+
+    PyModule_AddObject(module, name, (PyObject *) type);
+};
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -1210,3 +1210,27 @@
         # doesn't call tp_getattr at all, also on CPython
         raises(AttributeError, type(module.gettype1).__getattribute__,
                                module.gettype1, 'dcBA')
+
+    def test_multiple_inheritance_tp_basicsize(self):
+        module = self.import_module(name='issue2482')
+
+        class PyBase(object):
+            pass
+
+        basesize = module.get_basicsize(PyBase)
+
+        CBase = module.issue2482_object
+        class A(CBase, PyBase):
+            def __init__(self, i):
+                CBase.__init__(self)
+                PyBase.__init__(self)
+
+        class B(PyBase, CBase):
+            def __init__(self, i):
+                PyBase.__init__(self)
+                CBase.__init__(self)
+
+        Asize = module.get_basicsize(A)
+        Bsize = module.get_basicsize(B)
+        assert Asize == Bsize
+        assert Asize > basesize
diff --git a/pypy/module/test_lib_pypy/test_md5_extra.py b/pypy/module/test_lib_pypy/test_md5_extra.py
--- a/pypy/module/test_lib_pypy/test_md5_extra.py
+++ b/pypy/module/test_lib_pypy/test_md5_extra.py
@@ -74,9 +74,7 @@
         w_m2c = space.call_method(w_m2, 'copy')
 
         # Update and compare...
-        for i in range(len(cases)):
-            message = cases[i][0]
-
+        for message in cases:
             m1c.update(message)
             d1 = m1c.hexdigest()
 
@@ -154,13 +152,10 @@
              "57edf4a22be3c955ac49da2e2107b67a"),
             )
 
-        for i in range(len(cases)):
-            res = self.compare(cases[i][0])
+        for message, expectedResult in cases:
+            res = self.compare(message)
             if res is not None:
                 d1, d2 = res
-                message, expectedResult = cases[i][0], None
-                if len(cases[i]) == 2:
-                    expectedResult = cases[i][1]
                 self.print_diff(message, d1, d2, expectedResult)
             assert res is None
 
@@ -189,27 +184,25 @@
             "123456789 123456789 123456789 12345678",
             )
 
-        for i in range(len(cases)):
-            res = self.compare(cases[i][0])
+        for message in cases:
+            res = self.compare(message)
             if res is not None:
                 d1, d2 = res
-                message = cases[i][0]
                 self.print_diff(message, d1, d2)
             assert res is None
 
     def test3(self):
         """Test cases with long messages (can take a while)."""
         cases = (
-            (2**10*'a',),
-            (2**10*'abcd',),
-            #(2**20*'a',),  # 1 MB, takes about 160 sec. on a 233 Mhz Pentium.
+            2**10*'a',
+            2**10*'abcd',
+            #2**20*'a',  # 1 MB, takes about 160 sec. on a 233 Mhz Pentium.
             )
 
-        for i in range(len(cases)):
-            res = self.compare(cases[i][0])
+        for message in cases:
+            res = self.compare(message)
             if res is not None:
                 d1, d2 = res
-                message = cases[i][0]
                 self.print_diff(message, d1, d2)
             assert res is None
 
diff --git a/rpython/rlib/rvmprof/__init__.py b/rpython/rlib/rvmprof/__init__.py
--- a/rpython/rlib/rvmprof/__init__.py
+++ b/rpython/rlib/rvmprof/__init__.py
@@ -3,6 +3,7 @@
 from rpython.rlib.rvmprof.rvmprof import vmprof_execute_code, MAX_FUNC_NAME
 from rpython.rlib.rvmprof.rvmprof import _was_registered
 from rpython.rlib.rvmprof.cintf import VMProfPlatformUnsupported
+from rpython.rtyper.lltypesystem import rffi
 
 #
 # See README.txt.
@@ -37,3 +38,21 @@
 
 def disable():
     _get_vmprof().disable()
+
+def is_enabled():
+    vmp = _get_vmprof()
+    return vmp.is_enabled
+
+def get_profile_path(space):
+    vmp = _get_vmprof()
+    if not vmp.is_enabled:
+        return None
+
+    with rffi.scoped_alloc_buffer(4096) as buf:
+        length = vmp.cintf.vmprof_get_profile_path(buf.raw, buf.size) 
+        if length == -1:
+            return ""
+        return buf.str(length)
+
+    return None
+
diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -107,6 +107,10 @@
                                   lltype.Signed, compilation_info=eci,
                                   _nowrapper=True)
 
+    vmprof_get_profile_path = rffi.llexternal("vmprof_get_profile_path", [rffi.CCHARP, lltype.Signed],
+                                              lltype.Signed, compilation_info=eci,
+                                              _nowrapper=True)
+
     return CInterface(locals())
 
 
diff --git a/rpython/rlib/rvmprof/rvmprof.py b/rpython/rlib/rvmprof/rvmprof.py
--- a/rpython/rlib/rvmprof/rvmprof.py
+++ b/rpython/rlib/rvmprof/rvmprof.py
@@ -178,23 +178,6 @@
     arguments given to the decorated function.
 
     'result_class' is ignored (backward compatibility).
-
-    ====================================
-    TRANSLATION NOTE CALL THIS ONLY ONCE
-    ====================================
-
-    This function can only be called once during translation.
-    It generates a C function called __vmprof_eval_vmprof which is used by
-    the vmprof C source code and is bound as an extern function.
-    This is necessary while walking the native stack.
-    If you see __vmprof_eval_vmprof defined twice during
-    translation, read on:
-
-    To remove this restriction do the following:
-
-    *) Extend the macro IS_VMPROF_EVAL in the vmprof source repo to check several
-       sybmols.
-    *) Give each function provided to this decorator a unique symbol name in C
     """
     if _hack_update_stack_untranslated:
         from rpython.rtyper.annlowlevel import llhelper
diff --git a/rpython/rlib/rvmprof/src/rvmprof.c b/rpython/rlib/rvmprof/src/rvmprof.c
--- a/rpython/rlib/rvmprof/src/rvmprof.c
+++ b/rpython/rlib/rvmprof/src/rvmprof.c
@@ -29,3 +29,9 @@
     return ptr == __vmprof_eval_vmprof;
 }
 #endif
+
+
+long vmprof_get_profile_path(const char * buffer, long size)
+{
+    return vmp_fd_to_path(vmp_profile_fileno(), buffer, size);
+}
diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -37,6 +37,7 @@
 RPY_EXTERN long vmprof_stack_pop(void*);
 RPY_EXTERN void vmprof_stack_free(void*);
 RPY_EXTERN intptr_t vmprof_get_traceback(void *, void *, intptr_t*, intptr_t);
+RPY_EXTERN long vmprof_get_profile_path(const char *, long);
 
 long vmprof_write_header_for_jit_addr(intptr_t *result, long n,
                                       intptr_t addr, int max_depth);
diff --git a/rpython/rlib/rvmprof/src/shared/_vmprof.c b/rpython/rlib/rvmprof/src/shared/_vmprof.c
--- a/rpython/rlib/rvmprof/src/shared/_vmprof.c
+++ b/rpython/rlib/rvmprof/src/shared/_vmprof.c
@@ -1,8 +1,7 @@
-/*[clinic input]
-module _vmprof
-[clinic start generated code]*/
-/*[clinic end generated code: output=da39a3ee5e6b4b0d input=b443489e38f2be7d]*/
-
+/**
+ * This file is the CPython module _vmprof. It does not share code
+ * with PyPy. PyPy's _vmprof module is included in the main repo.
+ */
 #define _GNU_SOURCE 1
 
 #include <Python.h>
@@ -14,7 +13,7 @@
 static volatile int is_enabled = 0;
 static destructor Original_code_dealloc = 0;
 static PyObject* (*_default_eval_loop)(PyFrameObject *, int) = 0;
-void dump_native_symbols(int fileno);
+void vmp_scan_profile(int fileno, int dump_native, void *all_code_uids);
 
 #if VMPROF_UNIX
 #include "trampoline.h"
@@ -109,6 +108,33 @@
     return 0;
 }
 
+static int _look_for_code_object_seen(PyObject *o, void *all_codes)
+{
+    if (PyCode_Check(o) && PySet_GET_SIZE(all_codes)) {
+        Py_ssize_t i;
+        PyCodeObject *co = (PyCodeObject *)o;
+        PyObject *uid_co = PyLong_FromVoidPtr((void*)CODE_ADDR_TO_UID(co));
+        int check = PySet_Discard(all_codes, uid_co);
+
+        Py_CLEAR(uid_co);
+
+        if (check < 0)
+            return -1;
+
+        if (check && emit_code_object(co) < 0)
+            return -1;
+
+        i = PyTuple_Size(co->co_consts);
+        while (i > 0) {
+            --i;
+            if (_look_for_code_object(PyTuple_GET_ITEM(co->co_consts, i),
+                                      all_codes) < 0)
+                return -1;
+        }
+    }
+    return 0;
+}
+
 static void emit_all_code_objects(void)
 {
     PyObject *gc_module = NULL, *lst = NULL, *all_codes = NULL;
@@ -118,6 +144,48 @@
     if (gc_module == NULL)
         goto error;
 
+    // lst contains all objects that are known by the gc
+    lst = PyObject_CallMethod(gc_module, "get_objects", "");
+    if (lst == NULL || !PyList_Check(lst))
+        goto error;
+
+    // the set only includes the code objects found in the profile
+    all_codes = PySet_New(NULL);
+    if (all_codes == NULL)
+        goto error;
+
+    size = PyList_GET_SIZE(lst);
+    for (i = 0; i < size; i++) {
+        PyObject *o = PyList_GET_ITEM(lst, i);
+        if (o->ob_type->tp_traverse &&
+            o->ob_type->tp_traverse(o, _look_for_code_object, (void *)all_codes)
+                < 0)
+            goto error;
+    }
+
+ error:
+    Py_XDECREF(all_codes);
+    Py_XDECREF(lst);
+    Py_XDECREF(gc_module);
+}
+
+static int add_code_addr(void *all_code_uids, void *addr)
+{
+    PyObject *co_uid = PyLong_FromVoidPtr(addr);
+    int check = PySet_Add((PyObject*) all_code_uids, co_uid);
+    Py_CLEAR(co_uid);
+    return check;
+}
+
+static void emit_all_code_objects_seen(int fileno)
+{
+    PyObject *gc_module = NULL, *lst = NULL, *all_codes = NULL;
+    Py_ssize_t i, size;
+
+    gc_module = PyImport_ImportModuleNoBlock("gc");
+    if (gc_module == NULL)
+        goto error;
+
     lst = PyObject_CallMethod(gc_module, "get_objects", "");
     if (lst == NULL || !PyList_Check(lst))
         goto error;
@@ -126,16 +194,21 @@
     if (all_codes == NULL)
         goto error;
 
+    // fill up all_codes with every code object found in the profile
+    vmp_scan_profile(fileno, 0, all_codes);
+
+    // intersect the list with the set and dump only the code objects
+    // found in the set!
     size = PyList_GET_SIZE(lst);
     for (i = 0; i < size; i++) {
         PyObject *o = PyList_GET_ITEM(lst, i);
         if (o->ob_type->tp_traverse &&
-            o->ob_type->tp_traverse(o, _look_for_code_object, (void *)all_codes)
-                < 0)
+                o->ob_type->tp_traverse(o, _look_for_code_object_seen, (void *) all_codes)
+            < 0)
             goto error;
     }
 
- error:
+    error:
     Py_XDECREF(all_codes);
     Py_XDECREF(lst);
     Py_XDECREF(gc_module);
@@ -162,8 +235,16 @@
     if (!PyArg_ParseTuple(args, "id|iii", &fd, &interval, &memory, &lines, &native)) {
         return NULL;
     }
-    assert(fd >= 0 && "file descripter provided to vmprof must not" \
-                      " be less then zero.");
+
+    if (write(fd, NULL, 0) != 0) {
+        PyErr_SetString(PyExc_ValueError, "file descriptor must be writeable");
+        return NULL;
+    }
+
+    if ((read(fd, NULL, 0) != 0) && (native != 0)) {
+        PyErr_SetString(PyExc_ValueError, "file descriptor must be readable for native profiling");
+        return NULL;
+    }
 
     if (is_enabled) {
         PyErr_SetString(PyExc_ValueError, "vmprof is already enabled");
@@ -194,16 +275,53 @@
     return Py_None;
 }
 
+static PyObject * vmp_is_enabled(PyObject *module, PyObject *noargs) {
+    if (is_enabled) {
+        Py_RETURN_TRUE;
+    }
+    Py_RETURN_FALSE;
+}
+
 static PyObject *
-disable_vmprof(PyObject *module, PyObject *noarg)
+disable_vmprof(PyObject *module, PyObject *args)
 {
+    int fd = vmp_profile_fileno();
+    int only_needed = 0;
+
+    if (!PyArg_ParseTuple(args, "|i", &only_needed)) {
+        return NULL;
+    }
+
+#if VMPROF_UNIX
+    if ((read(fd, NULL, 0) != 0) && (only_needed != 0)) {
+        PyErr_SetString(PyExc_ValueError,
+                        "file descriptor must be readable to save only needed code objects");
+        return NULL;
+    }
+#else
+    if (only_needed) {
+        PyErr_SetString(PyExc_ValueError,
+                        "saving only needed code objects is not supported for windows");
+        return NULL;
+    }
+#endif
+
     if (!is_enabled) {
         PyErr_SetString(PyExc_ValueError, "vmprof is not enabled");
         return NULL;
     }
+
     is_enabled = 0;
     vmprof_ignore_signals(1);
+
+#if VMPROF_UNIX
+    if (only_needed)
+        emit_all_code_objects_seen(fd);
+    else
+        emit_all_code_objects();
+#else
     emit_all_code_objects();
+#endif
 
     if (vmprof_disable() < 0) {
         PyErr_SetFromErrno(PyExc_OSError);
@@ -320,15 +438,36 @@
 }
 #endif
 
+#ifdef VMPROF_UNIX
+static PyObject * vmp_get_profile_path(PyObject *module, PyObject *noargs) {
+    PyObject * o;
+    if (is_enabled) {
+        char buffer[4096];
+        buffer[0] = 0;
+        ssize_t buffer_len = vmp_fd_to_path(vmp_profile_fileno(), buffer, 4096);
+        if (buffer_len == -1) {
+            PyErr_Format(PyExc_NotImplementedError, "not implemented platform %s", vmp_machine_os_name());
+            return NULL;
+        }
+        return PyStr_n_NEW(buffer, buffer_len);
+    }
+    Py_RETURN_NONE;
+}
+#endif
+
 static PyMethodDef VMProfMethods[] = {
     {"enable",  enable_vmprof, METH_VARARGS, "Enable profiling."},
-    {"disable", disable_vmprof, METH_NOARGS, "Disable profiling."},
+    {"disable", disable_vmprof, METH_VARARGS, "Disable profiling."},
     {"write_all_code_objects", write_all_code_objects, METH_NOARGS,
      "Write eagerly all the IDs of code objects"},
     {"sample_stack_now", sample_stack_now, METH_VARARGS, "Sample the stack now"},
 #ifdef VMP_SUPPORTS_NATIVE_PROFILING
     {"resolve_addr", resolve_addr, METH_VARARGS, "Return the name of the addr"},
 #endif
+    {"is_enabled", vmp_is_enabled, METH_NOARGS, "Indicates if vmprof is currently sampling."},
+#ifdef VMPROF_UNIX
+    {"get_profile_path", vmp_get_profile_path, METH_NOARGS, "Profile path the profiler logs to."},
+#endif
     {NULL, NULL, 0, NULL}        /* Sentinel */
 };
 
diff --git a/rpython/rlib/rvmprof/src/shared/compat.h b/rpython/rlib/rvmprof/src/shared/compat.h
--- a/rpython/rlib/rvmprof/src/shared/compat.h
+++ b/rpython/rlib/rvmprof/src/shared/compat.h
@@ -7,11 +7,13 @@
       #define PyStr_AS_STRING PyBytes_AS_STRING
       #define PyStr_GET_SIZE PyBytes_GET_SIZE
       #define PyStr_NEW      PyUnicode_FromString
+      #define PyStr_n_NEW      PyUnicode_FromStringAndSize
       #define PyLong_NEW     PyLong_FromSsize_t
 #  else
       #define PyStr_AS_STRING PyString_AS_STRING
       #define PyStr_GET_SIZE PyString_GET_SIZE
       #define PyStr_NEW      PyString_FromString
+      #define PyStr_n_NEW      PyString_FromStringAndSize
       #define PyLong_NEW     PyInt_FromSsize_t
       #define PyLong_AsLong  PyInt_AsLong
 #  endif
diff --git a/rpython/rlib/rvmprof/src/shared/khash.h b/rpython/rlib/rvmprof/src/shared/khash.h
new file mode 100644
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/khash.h
@@ -0,0 +1,627 @@
+/* The MIT License
+
+   Copyright (c) 2008, 2009, 2011 by Attractive Chaos <attractor at live.co.uk>
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+*/
+
+/*
+  An example:
+
+#include "khash.h"
+KHASH_MAP_INIT_INT(32, char)
+int main() {
+	int ret, is_missing;
+	khiter_t k;
+	khash_t(32) *h = kh_init(32);
+	k = kh_put(32, h, 5, &ret);
+	kh_value(h, k) = 10;
+	k = kh_get(32, h, 10);
+	is_missing = (k == kh_end(h));
+	k = kh_get(32, h, 5);
+	kh_del(32, h, k);
+	for (k = kh_begin(h); k != kh_end(h); ++k)
+		if (kh_exist(h, k)) kh_value(h, k) = 1;
+	kh_destroy(32, h);
+	return 0;
+}
+*/
+
+/*
+  2013-05-02 (0.2.8):
+
+	* Use quadratic probing. When the capacity is power of 2, stepping function
+	  i*(i+1)/2 guarantees to traverse each bucket. It is better than double
+	  hashing on cache performance and is more robust than linear probing.
+
+	  In theory, double hashing should be more robust than quadratic probing.
+	  However, my implementation is probably not for large hash tables, because
+	  the second hash function is closely tied to the first hash function,
+	  which reduce the effectiveness of double hashing.
+
+	Reference: http://research.cs.vt.edu/AVresearch/hashing/quadratic.php
+
+  2011-12-29 (0.2.7):
+
+    * Minor code clean up; no actual effect.
+
+  2011-09-16 (0.2.6):
+
+	* The capacity is a power of 2. This seems to dramatically improve the
+	  speed for simple keys. Thank Zilong Tan for the suggestion. Reference:
+
+	   - http://code.google.com/p/ulib/
+	   - http://nothings.org/computer/judy/
+
+	* Allow to optionally use linear probing which usually has better
+	  performance for random input. Double hashing is still the default as it
+	  is more robust to certain non-random input.
+
+	* Added Wang's integer hash function (not used by default). This hash
+	  function is more robust to certain non-random input.
+
+  2011-02-14 (0.2.5):
+
+    * Allow to declare global functions.
+
+  2009-09-26 (0.2.4):
+
+    * Improve portability
+
+  2008-09-19 (0.2.3):
+
+	* Corrected the example
+	* Improved interfaces
+
+  2008-09-11 (0.2.2):
+
+	* Improved speed a little in kh_put()
+
+  2008-09-10 (0.2.1):
+
+	* Added kh_clear()
+	* Fixed a compiling error
+
+  2008-09-02 (0.2.0):
+
+	* Changed to token concatenation which increases flexibility.
+
+  2008-08-31 (0.1.2):
+
+	* Fixed a bug in kh_get(), which has not been tested previously.
+
+  2008-08-31 (0.1.1):
+
+	* Added destructor
+*/
+
+
+#ifndef __AC_KHASH_H
+#define __AC_KHASH_H
+
+/*!
+  @header
+
+  Generic hash table library.
+ */
+
+#define AC_VERSION_KHASH_H "0.2.8"
+
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+/* compiler specific configuration */
+
+#if UINT_MAX == 0xffffffffu
+typedef unsigned int khint32_t;
+#elif ULONG_MAX == 0xffffffffu
+typedef unsigned long khint32_t;
+#endif
+
+#if ULONG_MAX == ULLONG_MAX
+typedef unsigned long khint64_t;
+#else
+typedef unsigned long long khint64_t;
+#endif
+
+#ifndef kh_inline
+#ifdef _MSC_VER
+#define kh_inline __inline
+#else
+#define kh_inline inline
+#endif
+#endif /* kh_inline */
+
+#ifndef klib_unused
+#if (defined __clang__ && __clang_major__ >= 3) || (defined __GNUC__ && __GNUC__ >= 3)
+#define klib_unused __attribute__ ((__unused__))
+#else
+#define klib_unused
+#endif
+#endif /* klib_unused */
+
+typedef khint32_t khint_t;
+typedef khint_t khiter_t;
+
+#define __ac_isempty(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&2)
+#define __ac_isdel(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&1)
+#define __ac_iseither(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&3)
+#define __ac_set_isdel_false(flag, i) (flag[i>>4]&=~(1ul<<((i&0xfU)<<1)))
+#define __ac_set_isempty_false(flag, i) (flag[i>>4]&=~(2ul<<((i&0xfU)<<1)))
+#define __ac_set_isboth_false(flag, i) (flag[i>>4]&=~(3ul<<((i&0xfU)<<1)))
+#define __ac_set_isdel_true(flag, i) (flag[i>>4]|=1ul<<((i&0xfU)<<1))
+
+#define __ac_fsize(m) ((m) < 16? 1 : (m)>>4)
+
+#ifndef kroundup32
+#define kroundup32(x) (--(x), (x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16, ++(x))
+#endif
+
+#ifndef kcalloc
+#define kcalloc(N,Z) calloc(N,Z)
+#endif
+#ifndef kmalloc
+#define kmalloc(Z) malloc(Z)
+#endif
+#ifndef krealloc
+#define krealloc(P,Z) realloc(P,Z)
+#endif
+#ifndef kfree
+#define kfree(P) free(P)
+#endif
+
+static const double __ac_HASH_UPPER = 0.77;
+
+#define __KHASH_TYPE(name, khkey_t, khval_t) \
+	typedef struct kh_##name##_s { \
+		khint_t n_buckets, size, n_occupied, upper_bound; \
+		khint32_t *flags; \
+		khkey_t *keys; \
+		khval_t *vals; \
+	} kh_##name##_t;
+
+#define __KHASH_PROTOTYPES(name, khkey_t, khval_t)	 					\
+	extern kh_##name##_t *kh_init_##name(void);							\
+	extern void kh_destroy_##name(kh_##name##_t *h);					\
+	extern void kh_clear_##name(kh_##name##_t *h);						\
+	extern khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); 	\
+	extern int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
+	extern khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \
+	extern void kh_del_##name(kh_##name##_t *h, khint_t x);
+
+#define __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	SCOPE kh_##name##_t *kh_init_##name(void) {							\
+		return (kh_##name##_t*)kcalloc(1, sizeof(kh_##name##_t));		\
+	}																	\
+	SCOPE void kh_destroy_##name(kh_##name##_t *h)						\
+	{																	\
+		if (h) {														\
+			kfree((void *)h->keys); kfree(h->flags);					\
+			kfree((void *)h->vals);										\
+			kfree(h);													\
+		}																\
+	}																	\
+	SCOPE void kh_clear_##name(kh_##name##_t *h)						\
+	{																	\
+		if (h && h->flags) {											\
+			memset(h->flags, 0xaa, __ac_fsize(h->n_buckets) * sizeof(khint32_t)); \
+			h->size = h->n_occupied = 0;								\
+		}																\
+	}																	\
+	SCOPE khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) 	\
+	{																	\
+		if (h->n_buckets) {												\
+			khint_t k, i, last, mask, step = 0; \
+			mask = h->n_buckets - 1;									\
+			k = __hash_func(key); i = k & mask;							\
+			last = i; \
+			while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
+				i = (i + (++step)) & mask; \
+				if (i == last) return h->n_buckets;						\
+			}															\
+			return __ac_iseither(h->flags, i)? h->n_buckets : i;		\
+		} else return 0;												\
+	}																	\
+	SCOPE int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
+	{ /* This function uses 0.25*n_buckets bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets. */ \
+		khint32_t *new_flags = 0;										\
+		khint_t j = 1;													\
+		{																\
+			kroundup32(new_n_buckets); 									\
+			if (new_n_buckets < 4) new_n_buckets = 4;					\
+			if (h->size >= (khint_t)(new_n_buckets * __ac_HASH_UPPER + 0.5)) j = 0;	/* requested size is too small */ \
+			else { /* hash table size to be changed (shrink or expand); rehash */ \
+				new_flags = (khint32_t*)kmalloc(__ac_fsize(new_n_buckets) * sizeof(khint32_t));	\
+				if (!new_flags) return -1;								\
+				memset(new_flags, 0xaa, __ac_fsize(new_n_buckets) * sizeof(khint32_t)); \
+				if (h->n_buckets < new_n_buckets) {	/* expand */		\
+					khkey_t *new_keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
+					if (!new_keys) { kfree(new_flags); return -1; }		\
+					h->keys = new_keys;									\
+					if (kh_is_map) {									\
+						khval_t *new_vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \
+						if (!new_vals) { kfree(new_flags); return -1; }	\
+						h->vals = new_vals;								\
+					}													\
+				} /* otherwise shrink */								\
+			}															\
+		}																\
+		if (j) { /* rehashing is needed */								\
+			for (j = 0; j != h->n_buckets; ++j) {						\
+				if (__ac_iseither(h->flags, j) == 0) {					\
+					khkey_t key = h->keys[j];							\
+					khval_t val;										\
+					khint_t new_mask;									\
+					new_mask = new_n_buckets - 1; 						\
+					if (kh_is_map) val = h->vals[j];					\
+					__ac_set_isdel_true(h->flags, j);					\
+					while (1) { /* kick-out process; sort of like in Cuckoo hashing */ \
+						khint_t k, i, step = 0; \
+						k = __hash_func(key);							\
+						i = k & new_mask;								\
+						while (!__ac_isempty(new_flags, i)) i = (i + (++step)) & new_mask; \
+						__ac_set_isempty_false(new_flags, i);			\
+						if (i < h->n_buckets && __ac_iseither(h->flags, i) == 0) { /* kick out the existing element */ \
+							{ khkey_t tmp = h->keys[i]; h->keys[i] = key; key = tmp; } \
+							if (kh_is_map) { khval_t tmp = h->vals[i]; h->vals[i] = val; val = tmp; } \
+							__ac_set_isdel_true(h->flags, i); /* mark it as deleted in the old hash table */ \
+						} else { /* write the element and jump out of the loop */ \
+							h->keys[i] = key;							\
+							if (kh_is_map) h->vals[i] = val;			\
+							break;										\
+						}												\
+					}													\
+				}														\
+			}															\
+			if (h->n_buckets > new_n_buckets) { /* shrink the hash table */ \
+				h->keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
+				if (kh_is_map) h->vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \
+			}															\
+			kfree(h->flags); /* free the working space */				\
+			h->flags = new_flags;										\
+			h->n_buckets = new_n_buckets;								\
+			h->n_occupied = h->size;									\
+			h->upper_bound = (khint_t)(h->n_buckets * __ac_HASH_UPPER + 0.5); \
+		}																\
+		return 0;														\
+	}																	\
+	SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \
+	{																	\
+		khint_t x;														\
+		if (h->n_occupied >= h->upper_bound) { /* update the hash table */ \
+			if (h->n_buckets > (h->size<<1)) {							\
+				if (kh_resize_##name(h, h->n_buckets - 1) < 0) { /* clear "deleted" elements */ \
+					*ret = -1; return h->n_buckets;						\
+				}														\
+			} else if (kh_resize_##name(h, h->n_buckets + 1) < 0) { /* expand the hash table */ \
+				*ret = -1; return h->n_buckets;							\
+			}															\
+		} /* TODO: to implement automatically shrinking; resize() already support shrinking */ \
+		{																\
+			khint_t k, i, site, last, mask = h->n_buckets - 1, step = 0; \
+			x = site = h->n_buckets; k = __hash_func(key); i = k & mask; \
+			if (__ac_isempty(h->flags, i)) x = i; /* for speed up */	\
+			else {														\
+				last = i; \
+				while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
+					if (__ac_isdel(h->flags, i)) site = i;				\
+					i = (i + (++step)) & mask; \
+					if (i == last) { x = site; break; }					\
+				}														\
+				if (x == h->n_buckets) {								\
+					if (__ac_isempty(h->flags, i) && site != h->n_buckets) x = site; \
+					else x = i;											\
+				}														\
+			}															\
+		}																\
+		if (__ac_isempty(h->flags, x)) { /* not present at all */		\
+			h->keys[x] = key;											\
+			__ac_set_isboth_false(h->flags, x);							\
+			++h->size; ++h->n_occupied;									\
+			*ret = 1;													\
+		} else if (__ac_isdel(h->flags, x)) { /* deleted */				\
+			h->keys[x] = key;											\
+			__ac_set_isboth_false(h->flags, x);							\
+			++h->size;													\
+			*ret = 2;													\
+		} else *ret = 0; /* Don't touch h->keys[x] if present and not deleted */ \
+		return x;														\
+	}																	\
+	SCOPE void kh_del_##name(kh_##name##_t *h, khint_t x)				\
+	{																	\
+		if (x != h->n_buckets && !__ac_iseither(h->flags, x)) {			\
+			__ac_set_isdel_true(h->flags, x);							\
+			--h->size;													\
+		}																\
+	}
+
+#define KHASH_DECLARE(name, khkey_t, khval_t)		 					\
+	__KHASH_TYPE(name, khkey_t, khval_t) 								\
+	__KHASH_PROTOTYPES(name, khkey_t, khval_t)
+
+#define KHASH_INIT2(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	__KHASH_TYPE(name, khkey_t, khval_t) 								\
+	__KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal)
+
+#define KHASH_INIT(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	KHASH_INIT2(name, static kh_inline klib_unused, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal)
+
+/* --- BEGIN OF HASH FUNCTIONS --- */
+
+/*! @function
+  @abstract     Integer hash function
+  @param  key   The integer [khint32_t]
+  @return       The hash value [khint_t]
+ */
+#define kh_int_hash_func(key) (khint32_t)(key)
+/*! @function
+  @abstract     Integer comparison function
+ */
+#define kh_int_hash_equal(a, b) ((a) == (b))
+/*! @function
+  @abstract     64-bit integer hash function
+  @param  key   The integer [khint64_t]
+  @return       The hash value [khint_t]
+ */
+#define kh_int64_hash_func(key) (khint32_t)((key)>>33^(key)^(key)<<11)
+/*! @function
+  @abstract     64-bit integer comparison function
+ */
+#define kh_int64_hash_equal(a, b) ((a) == (b))
+/*! @function
+  @abstract     const char* hash function
+  @param  s     Pointer to a null terminated string
+  @return       The hash value
+ */
+static kh_inline khint_t __ac_X31_hash_string(const char *s)
+{
+	khint_t h = (khint_t)*s;
+	if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)*s;
+	return h;
+}
+/*! @function
+  @abstract     Another interface to const char* hash function
+  @param  key   Pointer to a null terminated string [const char*]
+  @return       The hash value [khint_t]
+ */
+#define kh_str_hash_func(key) __ac_X31_hash_string(key)
+/*! @function
+  @abstract     Const char* comparison function
+ */
+#define kh_str_hash_equal(a, b) (strcmp(a, b) == 0)
+
+static kh_inline khint_t __ac_Wang_hash(khint_t key)
+{
+    key += ~(key << 15);
+    key ^=  (key >> 10);
+    key +=  (key << 3);
+    key ^=  (key >> 6);
+    key += ~(key << 11);
+    key ^=  (key >> 16);
+    return key;
+}
+#define kh_int_hash_func2(key) __ac_Wang_hash((khint_t)key)
+
+/* --- END OF HASH FUNCTIONS --- */
+
+/* Other convenient macros... */
+
+/*!
+  @abstract Type of the hash table.
+  @param  name  Name of the hash table [symbol]
+ */
+#define khash_t(name) kh_##name##_t
+
+/*! @function
+  @abstract     Initiate a hash table.
+  @param  name  Name of the hash table [symbol]
+  @return       Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_init(name) kh_init_##name()
+
+/*! @function
+  @abstract     Destroy a hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_destroy(name, h) kh_destroy_##name(h)
+
+/*! @function
+  @abstract     Reset a hash table without deallocating memory.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_clear(name, h) kh_clear_##name(h)
+
+/*! @function
+  @abstract     Resize a hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  s     New size [khint_t]
+ */
+#define kh_resize(name, h, s) kh_resize_##name(h, s)
+
+/*! @function
+  @abstract     Insert a key to the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Key [type of keys]
+  @param  r     Extra return code: -1 if the operation failed;
+                0 if the key is present in the hash table;
+                1 if the bucket is empty (never used); 2 if the element in
+				the bucket has been deleted [int*]
+  @return       Iterator to the inserted element [khint_t]
+ */
+#define kh_put(name, h, k, r) kh_put_##name(h, k, r)
+
+/*! @function
+  @abstract     Retrieve a key from the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Key [type of keys]
+  @return       Iterator to the found element, or kh_end(h) if the element is absent [khint_t]
+ */
+#define kh_get(name, h, k) kh_get_##name(h, k)
+
+/*! @function
+  @abstract     Remove a key from the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Iterator to the element to be deleted [khint_t]
+ */
+#define kh_del(name, h, k) kh_del_##name(h, k)
+
+/*! @function
+  @abstract     Test whether a bucket contains data.
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       1 if containing data; 0 otherwise [int]
+ */
+#define kh_exist(h, x) (!__ac_iseither((h)->flags, (x)))
+
+/*! @function
+  @abstract     Get key given an iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       Key [type of keys]
+ */
+#define kh_key(h, x) ((h)->keys[x])
+
+/*! @function
+  @abstract     Get value given an iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       Value [type of values]
+  @discussion   For hash sets, calling this results in segfault.
+ */
+#define kh_val(h, x) ((h)->vals[x])
+
+/*! @function
+  @abstract     Alias of kh_val()
+ */
+#define kh_value(h, x) ((h)->vals[x])
+
+/*! @function
+  @abstract     Get the start iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       The start iterator [khint_t]
+ */
+#define kh_begin(h) (khint_t)(0)
+
+/*! @function
+  @abstract     Get the end iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       The end iterator [khint_t]
+ */
+#define kh_end(h) ((h)->n_buckets)
+
+/*! @function
+  @abstract     Get the number of elements in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       Number of elements in the hash table [khint_t]
+ */
+#define kh_size(h) ((h)->size)
+
+/*! @function
+  @abstract     Get the number of buckets in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       Number of buckets in the hash table [khint_t]
+ */
+#define kh_n_buckets(h) ((h)->n_buckets)
+
+/*! @function
+  @abstract     Iterate over the entries in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  kvar  Variable to which key will be assigned
+  @param  vvar  Variable to which value will be assigned
+  @param  code  Block of code to execute
+ */
+#define kh_foreach(h, kvar, vvar, code) { khint_t __i;		\
+	for (__i = kh_begin(h); __i != kh_end(h); ++__i) {		\
+		if (!kh_exist(h,__i)) continue;						\
+		(kvar) = kh_key(h,__i);								\
+		(vvar) = kh_val(h,__i);								\
+		code;												\
+	} }
+
+/*! @function
+  @abstract     Iterate over the values in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  vvar  Variable to which value will be assigned
+  @param  code  Block of code to execute
+ */
+#define kh_foreach_value(h, vvar, code) { khint_t __i;		\
+	for (__i = kh_begin(h); __i != kh_end(h); ++__i) {		\
+		if (!kh_exist(h,__i)) continue;						\
+		(vvar) = kh_val(h,__i);								\
+		code;												\
+	} }
+
+/* More conenient interfaces */
+
+/*! @function
+  @abstract     Instantiate a hash set containing integer keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_INT(name)										\
+	KHASH_INIT(name, khint32_t, char, 0, kh_int_hash_func, kh_int_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing integer keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_INT(name, khval_t)								\
+	KHASH_INIT(name, khint32_t, khval_t, 1, kh_int_hash_func, kh_int_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing 64-bit integer keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_INT64(name)										\
+	KHASH_INIT(name, khint64_t, char, 0, kh_int64_hash_func, kh_int64_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing 64-bit integer keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_INT64(name, khval_t)								\
+	KHASH_INIT(name, khint64_t, khval_t, 1, kh_int64_hash_func, kh_int64_hash_equal)
+
+typedef const char *kh_cstr_t;
+/*! @function
+  @abstract     Instantiate a hash map containing const char* keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_STR(name)										\
+	KHASH_INIT(name, kh_cstr_t, char, 0, kh_str_hash_func, kh_str_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing const char* keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_STR(name, khval_t)								\
+	KHASH_INIT(name, kh_cstr_t, khval_t, 1, kh_str_hash_func, kh_str_hash_equal)
+
+#endif /* __AC_KHASH_H */
diff --git a/rpython/rlib/rvmprof/src/shared/machine.c b/rpython/rlib/rvmprof/src/shared/machine.c
--- a/rpython/rlib/rvmprof/src/shared/machine.c
+++ b/rpython/rlib/rvmprof/src/shared/machine.c
@@ -3,6 +3,11 @@
 #include "vmprof.h"
 #include <stdio.h>
 
+#ifdef VMPROF_UNIX
+#include <unistd.h>
+#include <fcntl.h>
+#endif
+
 int vmp_machine_bits(void)
 {
     return sizeof(void*)*8;
@@ -27,3 +32,15 @@
 #endif
 }
 
+long vmp_fd_to_path(int fd, char * buffer, long buffer_len)
+{
+#ifdef VMPROF_LINUX
+    char proffs[24];
+    (void)snprintf(proffs, 24, "/proc/self/fd/%d", fd);
+    return readlink(proffs, buffer, buffer_len);
+#elif defined(VMPROF_UNIX)
+    fcntl(fd, F_GETPATH, buffer);
+    return strlen(buffer);
+#endif
+    return -1;
+}
diff --git a/rpython/rlib/rvmprof/src/shared/machine.h b/rpython/rlib/rvmprof/src/shared/machine.h
--- a/rpython/rlib/rvmprof/src/shared/machine.h
+++ b/rpython/rlib/rvmprof/src/shared/machine.h
@@ -10,3 +10,9 @@
  */
 const char * vmp_machine_os_name(void);
 
+/**
+ * Writes the filename into buffer. Returns -1 if the platform is not
+ * implemented.
+ */
+long vmp_fd_to_path(int fd, char * buffer, long buffer_len);
+
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c b/rpython/rlib/rvmprof/src/shared/symboltable.c
--- a/rpython/rlib/rvmprof/src/shared/symboltable.c
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.c
@@ -3,11 +3,15 @@
 #include "vmprof.h"
 #include "machine.h"
 
+#include "khash.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <assert.h>
 #include <dlfcn.h>
+
 #if defined(VMPROF_LINUX)
 #include <link.h>
 #endif
@@ -206,15 +210,20 @@
 struct backtrace_state * bstate = NULL;
 int vmp_resolve_addr(void * addr, char * name, int name_len, int * lineno, char * srcfile, int srcfile_len) {
 #ifdef __APPLE__
-    Dl_info info;
-    if (dladdr((const void*)addr, &info) == 0) {
+    Dl_info dlinfo;
+    if (dladdr((const void*)addr, &dlinfo) == 0) {
         return 1;
     }
-    if (info.dli_sname != NULL) {
-        (void)strncpy(name, info.dli_sname, name_len-1);
+    if (dlinfo.dli_sname != NULL) {
+        (void)strncpy(name, dlinfo.dli_sname, name_len-1);
         name[name_len-1] = 0;
     }
-    lookup_vmprof_debug_info(name, info.dli_fbase, srcfile, srcfile_len, lineno);
+    lookup_vmprof_debug_info(name, dlinfo.dli_fbase, srcfile, srcfile_len, lineno);
+    // copy the shared object name to the source file name if source cannot be determined
+    if (srcfile[0] == 0 && dlinfo.dli_fname != NULL) {
+        (void)strncpy(srcfile, dlinfo.dli_fname, srcfile_len-1);
+        srcfile[srcfile_len-1] = 0;
+    }
 #elif defined(VMPROF_LINUX)
     if (bstate == NULL) {
         bstate = backtrace_create_state (NULL, 1, backtrace_error_cb, NULL);
@@ -238,6 +247,18 @@
             (void)strncpy(info.name, dlinfo.dli_sname, info.name_len-1);
             name[name_len-1] = 0;
         }
+
+    }
+
+    // copy the shared object name to the source file name if source cannot be determined
+    if (srcfile[0] == 0) {
+        Dl_info dlinfo;
+        dlinfo.dli_fname = NULL;
+        (void)dladdr((const void*)addr, &dlinfo);
+        if (dlinfo.dli_fname != NULL) {
+            (void)strncpy(srcfile, dlinfo.dli_fname, srcfile_len-1);
+            srcfile[srcfile_len-1] = 0;
+        }
     }
 #endif
     return 0;
@@ -338,8 +359,9 @@
     return 0;
 }
 
+KHASH_MAP_INIT_INT(ptr, intptr_t)
 
-void dump_native_symbols(int fileno)
+void vmp_scan_profile(int fileno, int dump_nat_sym, void *all_code_uids)
 {
     off_t orig_pos, cur_pos;
     char marker;
@@ -350,6 +372,9 @@
     fsync(fileno);
     orig_pos = lseek(fileno, 0, SEEK_CUR);
 
+    khash_t(ptr) * nat_syms = kh_init(ptr);
+    khiter_t it;
+
     lseek(fileno, 5*WORD_SIZE, SEEK_SET);
 
     while (1) {
@@ -363,11 +388,17 @@
             case MARKER_HEADER: {
                 LOG("header 0x%llx\n", cur_pos);
                 if (_skip_header(fileno, &version, &flags) != 0) {
+                    kh_destroy(ptr, nat_syms);
                     return;
                 }
                 memory = (flags & PROFILE_MEMORY) != 0;
                 native = (flags & PROFILE_NATIVE) != 0;
                 lines = (flags & PROFILE_LINES) != 0;
+                if (!native && dump_nat_sym) {
+                    lseek(fileno, 0, SEEK_END);
+                    kh_destroy(ptr, nat_syms);
+                    return;
+                }
                 break;
             } case MARKER_META: {
                 LOG("meta 0x%llx\n", cur_pos);
@@ -400,19 +431,46 @@
 #else
                 for (i = 0; i < depth; i++) {
                     void * addr = _read_addr(fileno);
+                    if (lines && i % 2 == 0) {
+                        continue;
+                    }
                     if (((intptr_t)addr & 0x1) == 1) {
 #endif
-                        LOG("found kind %p\n", addr);
-                        char name[MAXLEN];
-                        char srcfile[MAXLEN];
-                        name[0] = 0;
-                        srcfile[0] = 0;
-                        int lineno = 0;
-                        if (vmp_resolve_addr(addr, name, MAXLEN, &lineno, srcfile, MAXLEN) == 0) {
-                            LOG("dumping add %p, name %s, %s:%d\n", addr, name, srcfile, lineno);
-                            _dump_native_symbol(fileno, addr, name, lineno, srcfile);
+                        /* dump the native symbol to disk */
+                        if (dump_nat_sym) {
+                            LOG("found kind %p\n", addr);
+
+                            // if the address has already been dumped,
+                            // do not log it again!
+                            it = kh_get(ptr, nat_syms, (intptr_t)addr);
+                            if (it == kh_end(nat_syms)) {
+                                char name[MAXLEN];
+                                char srcfile[MAXLEN];
+                                name[0] = 0;
+                                srcfile[0] = 0;
+                                int lineno = 0;
+                                if (vmp_resolve_addr(addr, name, MAXLEN, &lineno, srcfile, MAXLEN) == 0) {
+                                    LOG("dumping add %p, name %s, %s:%d\n", addr, name, srcfile, lineno);
+                                    _dump_native_symbol(fileno, addr, name, lineno, srcfile);
+                                    int ret;
+                                    it = kh_put(ptr, nat_syms, (intptr_t)addr, &ret);
+                                    kh_value(nat_syms, it) = 1;
+                                }
+                            }
+                        }
+#ifdef RPYTHON_VMPROF
+                    }
+#else
+                    } else {
+                        // cpython adds all addresses into a set to get the intersection
+                        // of all gc known code addresses
+                        if (all_code_uids != NULL) {
+                            PyObject *co_uid = PyLong_FromVoidPtr(addr);
+                            int check = PySet_Add(all_code_uids, co_uid);
+                            Py_CLEAR(co_uid);
                         }
                     }
+#endif
                 }
                 LOG("passed  memory %d \n", memory);
 
@@ -427,6 +485,7 @@
             } default: {
                 fprintf(stderr, "unknown marker 0x%x\n", marker);
                 lseek(fileno, 0, SEEK_END);
+                kh_destroy(ptr, nat_syms);
                 return;
             }
         }
@@ -437,5 +496,11 @@
         }
     }
 
+    kh_destroy(ptr, nat_syms);
     lseek(fileno, 0, SEEK_END);
 }
+
+void dump_native_symbols(int fileno)
+{
+    vmp_scan_profile(fileno, 1, NULL);
+}
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.h b/rpython/rlib/rvmprof/src/shared/symboltable.h
--- a/rpython/rlib/rvmprof/src/shared/symboltable.h
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.h
@@ -17,5 +17,7 @@
  */
 void dump_all_known_symbols(int fd);
 
+void dump_native_symbols(int fd);
+
 int vmp_resolve_addr(void * addr, char * name, int name_len, int * lineno,
                       char * srcfile, int srcfile_len);
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_main.h b/rpython/rlib/rvmprof/src/shared/vmprof_main.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof_main.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof_main.h
@@ -218,7 +218,7 @@
         if (p == NULL) {
             /* ignore this signal: there are no free buffers right now */
         } else {
-#ifdef RPYTHON_VMPORF
+#ifdef RPYTHON_VMPROF
             commit = _vmprof_sample_stack(p, NULL, (ucontext_t*)ucontext);
 #else
             commit = _vmprof_sample_stack(p, tstate, (ucontext_t*)ucontext);

From pypy.commits at gmail.com  Sun Apr 23 17:39:54 2017
From: pypy.commits at gmail.com (mjacob)
Date: Sun, 23 Apr 2017 14:39:54 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: 2to3
Message-ID: <58fd1f2a.8e941c0a.520ad.fce3@mx.google.com>

Author: Manuel Jacob <me at manueljacob.de>
Branch: py3.5
Changeset: r91120:bff93f299782
Date: 2017-04-23 23:38 +0200
http://bitbucket.org/pypy/pypy/changeset/bff93f299782/

Log:	2to3

diff --git a/lib_pypy/_md5.py b/lib_pypy/_md5.py
--- a/lib_pypy/_md5.py
+++ b/lib_pypy/_md5.py
@@ -53,10 +53,10 @@
     j = 0
     i = 0
     while i < imax:
-        b0 = ord(list[j])
-        b1 = ord(list[j+1]) << 8
-        b2 = ord(list[j+2]) << 16
-        b3 = ord(list[j+3]) << 24
+        b0 = list[j]
+        b1 = list[j+1] << 8
+        b2 = list[j+2] << 16
+        b3 = list[j+3] << 24
         hl[i] = b0 | b1 |b2 | b3
         i = i+1
         j = j+4
@@ -319,7 +319,7 @@
         else:
             padLen = 120 - index
 
-        padding = [b'\200'] + [b'\000'] * 63
+        padding = [128] + [0] * 63
         self.update(padding[:padLen])
 
         # Append length (before padding).
diff --git a/pypy/module/test_lib_pypy/test_md5_extra.py b/pypy/module/test_lib_pypy/test_md5_extra.py
--- a/pypy/module/test_lib_pypy/test_md5_extra.py
+++ b/pypy/module/test_lib_pypy/test_md5_extra.py
@@ -36,32 +36,32 @@
     def test_update(self):
         """Test updating cloned objects."""
         cases = (
-            "123",
-            "1234",
-            "12345",
-            "123456",
-            "1234567",
-            "12345678",
-            "123456789 123456789 123456789 ",
-            "123456789 123456789 ",
-            "123456789 123456789 1",
-            "123456789 123456789 12",
-            "123456789 123456789 123",
-            "123456789 123456789 1234",
-            "123456789 123456789 123456789 1",
-            "123456789 123456789 123456789 12",
-            "123456789 123456789 123456789 123",
-            "123456789 123456789 123456789 1234",
-            "123456789 123456789 123456789 12345",
-            "123456789 123456789 123456789 123456",
-            "123456789 123456789 123456789 1234567",
-            "123456789 123456789 123456789 12345678",
+            b"123",
+            b"1234",
+            b"12345",
+            b"123456",
+            b"1234567",
+            b"12345678",
+            b"123456789 123456789 123456789 ",
+            b"123456789 123456789 ",
+            b"123456789 123456789 1",
+            b"123456789 123456789 12",
+            b"123456789 123456789 123",
+            b"123456789 123456789 1234",
+            b"123456789 123456789 123456789 1",
+            b"123456789 123456789 123456789 12",
+            b"123456789 123456789 123456789 123",
+            b"123456789 123456789 123456789 1234",
+            b"123456789 123456789 123456789 12345",
+            b"123456789 123456789 123456789 123456",
+            b"123456789 123456789 123456789 1234567",
+            b"123456789 123456789 123456789 12345678",
             )
         space = self.space
         w__md5 = import_lib_pypy(space, '_md5')
 
         # Load both with same prefix.
-        prefix1 = 2**10 * 'a'
+        prefix1 = 2**10 * b'a'
 
         # The host md5
         m1 = md5.md5()
@@ -70,7 +70,7 @@
 
         # The app-level _md5
         w_m2 = space.call_method(w__md5, 'md5')
-        space.call_method(w_m2, 'update', space.wrap(prefix1))
+        space.call_method(w_m2, 'update', space.newbytes(prefix1))
         w_m2c = space.call_method(w_m2, 'copy')
 
         # Update and compare...
@@ -78,7 +78,7 @@
             m1c.update(message)
             d1 = m1c.hexdigest()
 
-            space.call_method(w_m2c, 'update', space.wrap(message))
+            space.call_method(w_m2c, 'update', space.newbytes(message))
             w_d2 = space.call_method(w_m2c, 'hexdigest')
             d2 = space.str_w(w_d2)
 
@@ -136,19 +136,19 @@
     def test1(self):
         """Test cases with known digest result."""
         cases = (
-            ("",
+            (b"",
              "d41d8cd98f00b204e9800998ecf8427e"),
-            ("a",
+            (b"a",
              "0cc175b9c0f1b6a831c399e269772661"),
-            ("abc",
+            (b"abc",
              "900150983cd24fb0d6963f7d28e17f72"),
-            ("message digest",
+            (b"message digest",
              "f96b697d7cb7938d525a2f31aaf161d0"),
-            ("abcdefghijklmnopqrstuvwxyz",
+            (b"abcdefghijklmnopqrstuvwxyz",
              "c3fcd3d76192e4007dfb496cca67e13b"),
-            ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+            (b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
              "d174ab98d277d9f5a5611c2c9f419d9f"),
-            ("1234567890"*8,
+            (b"1234567890"*8,
              "57edf4a22be3c955ac49da2e2107b67a"),
             )
 
@@ -162,26 +162,26 @@
     def test2(self):
         """Test cases without known digest result."""
         cases = (
-            "123",
-            "1234",
-            "12345",
-            "123456",
-            "1234567",
-            "12345678",
-            "123456789 123456789 123456789 ",
-            "123456789 123456789 ",
-            "123456789 123456789 1",
-            "123456789 123456789 12",
-            "123456789 123456789 123",
-            "123456789 123456789 1234",
-            "123456789 123456789 123456789 1",
-            "123456789 123456789 123456789 12",
-            "123456789 123456789 123456789 123",
-            "123456789 123456789 123456789 1234",
-            "123456789 123456789 123456789 12345",
-            "123456789 123456789 123456789 123456",
-            "123456789 123456789 123456789 1234567",
-            "123456789 123456789 123456789 12345678",
+            b"123",
+            b"1234",
+            b"12345",
+            b"123456",
+            b"1234567",
+            b"12345678",
+            b"123456789 123456789 123456789 ",
+            b"123456789 123456789 ",
+            b"123456789 123456789 1",
+            b"123456789 123456789 12",
+            b"123456789 123456789 123",
+            b"123456789 123456789 1234",
+            b"123456789 123456789 123456789 1",
+            b"123456789 123456789 123456789 12",
+            b"123456789 123456789 123456789 123",
+            b"123456789 123456789 123456789 1234",
+            b"123456789 123456789 123456789 12345",
+            b"123456789 123456789 123456789 123456",
+            b"123456789 123456789 123456789 1234567",
+            b"123456789 123456789 123456789 12345678",
             )
 
         for message in cases:
@@ -194,9 +194,9 @@
     def test3(self):
         """Test cases with long messages (can take a while)."""
         cases = (
-            2**10*'a',
-            2**10*'abcd',
-            #2**20*'a',  # 1 MB, takes about 160 sec. on a 233 Mhz Pentium.
+            2**10*b'a',
+            2**10*b'abcd',
+            #2**20*b'a',  # 1 MB, takes about 160 sec. on a 233 Mhz Pentium.
             )
 
         for message in cases:
@@ -210,7 +210,7 @@
         """Test cases with increasingly growing message lengths."""
         i = 0
         while i < 2**5:
-            message = i * 'a'
+            message = i * b'a'
             res = self.compare(message)
             if res is not None:
                 d1, d2 = res

From pypy.commits at gmail.com  Sun Apr 23 17:44:40 2017
From: pypy.commits at gmail.com (mjacob)
Date: Sun, 23 Apr 2017 14:44:40 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: 2to3
Message-ID: <58fd2048.0a301c0a.4b1f5.ab7f@mx.google.com>

Author: Manuel Jacob <me at manueljacob.de>
Branch: py3.5
Changeset: r91121:bf079f3f0ada
Date: 2017-04-23 23:43 +0200
http://bitbucket.org/pypy/pypy/changeset/bf079f3f0ada/

Log:	2to3

diff --git a/pypy/interpreter/test/test_syntax.py b/pypy/interpreter/test/test_syntax.py
--- a/pypy/interpreter/test/test_syntax.py
+++ b/pypy/interpreter/test/test_syntax.py
@@ -315,7 +315,7 @@
         s = """
 from __future__ import unicode_literals; from __future__ import print_function
 """
-        exec s in {}
+        exec(s, {})
 
 
 class AppTestComprehensions:

From pypy.commits at gmail.com  Mon Apr 24 13:30:58 2017
From: pypy.commits at gmail.com (arigo)
Date: Mon, 24 Apr 2017 10:30:58 -0700 (PDT)
Subject: [pypy-commit] pypy default: (issue2545, issue2530, possibly others)
Message-ID: <58fe3652.0e2f1c0a.4aad9.7aee@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r91122:b2569cf1bd55
Date: 2017-04-24 19:19 +0200
http://bitbucket.org/pypy/pypy/changeset/b2569cf1bd55/

Log:	(issue2545, issue2530, possibly others)

	Fix a multithreading bug that was there since a while with
	shadowstack. Thanks matti for a lot of the work around these issues.

diff --git a/rpython/memory/gctransform/shadowstack.py b/rpython/memory/gctransform/shadowstack.py
--- a/rpython/memory/gctransform/shadowstack.py
+++ b/rpython/memory/gctransform/shadowstack.py
@@ -75,6 +75,7 @@
         BaseRootWalker.__init__(self, gctransformer)
         # NB. 'self' is frozen, but we can use self.gcdata to store state
         gcdata = self.gcdata
+        gcdata.can_look_at_partial_stack = True
 
         def incr_stack(n):
             top = gcdata.root_stack_top
@@ -109,7 +110,19 @@
         BaseRootWalker.setup_root_walker(self)
 
     def walk_stack_roots(self, collect_stack_root, is_minor=False):
+        # Note that if we're the first minor collection after a thread
+        # switch, then we also need to disable the 'is_minor'
+        # optimization.  The reason is subtle: we need to walk the whole
+        # stack because otherwise, we can be in the middle of an
+        # incremental major collection, and the new stack was just moved
+        # off a ShadowStackRef object (gctransform/shadowstack.py) which
+        # was not seen yet.  We might completely miss some old objects
+        # from the parts of that stack that are skipped by this is_minor
+        # optimization.
         gcdata = self.gcdata
+        if is_minor and not gcdata.can_look_at_partial_stack:
+            is_minor = False
+            gcdata.can_look_at_partial_stack = True
         walk_stack_root(self.invoke_collect_stack_root, collect_stack_root,
                         None, gcdata.root_stack_base, gcdata.root_stack_top,
                         is_minor=is_minor)
@@ -298,6 +311,7 @@
                   "restore_state_from: broken shadowstack")
         self.gcdata.root_stack_base = shadowstackref.base
         self.gcdata.root_stack_top  = shadowstackref.top
+        self.gcdata.can_look_at_partial_stack = False
         self._cleanup(shadowstackref)
 
     def start_fresh_new_state(self):

From pypy.commits at gmail.com  Tue Apr 25 10:46:53 2017
From: pypy.commits at gmail.com (rlamy)
Date: Tue, 25 Apr 2017 07:46:53 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Move new_slice() method to PyBuffer,
 and BufferSlice to pypy.interpreter.buffer
Message-ID: <58ff615d.0438ed0a.c8aa9.efae@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91123:10cb464da2fc
Date: 2017-04-25 15:38 +0100
http://bitbucket.org/pypy/pypy/changeset/10cb464da2fc/

Log:	Move new_slice() method to PyBuffer, and BufferSlice to
	pypy.interpreter.buffer

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -141,6 +141,9 @@
         data = self.getbytes(offset, itemsize)
         return self.value_from_bytes(space, data)
 
+    def new_slice(self, start, step, slicelength):
+        return BufferSlice(self, start, step, slicelength)
+
     def setitem_w(self, space, idx, w_obj):
         offset = self.get_offset(space, 0, idx)
         itemsize = self.getitemsize()
@@ -246,10 +249,73 @@
         ch = self.data[idx]
         return space.newint(ord(ch))
 
+    def new_slice(self, start, step, slicelength):
+        if step == 1:
+            return SimpleBuffer(SubBuffer(self.data, start, slicelength))
+        else:
+            return BufferSlice(self, start, step, slicelength)
+
     def setitem_w(self, space, idx, w_obj):
         idx = self.get_offset(space, 0, idx)
         self.data[idx] = space.byte_w(w_obj)
 
+class BufferSlice(PyBuffer):
+    _immutable_ = True
+    _attrs_ = ['buf', 'readonly', 'shape', 'strides', 'start', 'step']
+    def __init__(self, buf, start, step, length):
+        self.buf = buf
+        self.readonly = self.buf.readonly
+        self.strides = buf.getstrides()[:]
+        itemsize = buf.getitemsize()
+        self.start = start
+        self.step = step
+        self.strides[0] *= step
+        self.shape = buf.getshape()[:]
+        self.shape[0] = length
+
+    def getlength(self):
+        return self.shape[0] * self.getitemsize()
+
+    def getbytes(self, start, size):
+        offset = self.start * self.buf.getstrides()[0]
+        return self.buf.getbytes(offset + start, size)
+
+    def setbytes(self, start, string):
+        if len(string) == 0:
+            return        # otherwise, adding self.offset might make 'start'
+                          # out of bounds
+        offset = self.start * self.buf.getstrides()[0]
+        self.buf.setbytes(offset + start, string)
+
+    def get_raw_address(self):
+        from rpython.rtyper.lltypesystem import rffi
+        offset = self.start * self.buf.getstrides()[0]
+        return rffi.ptradd(self.buf.get_raw_address(), offset)
+
+    def getformat(self):
+        return self.buf.getformat()
+
+    def getitemsize(self):
+        return self.buf.getitemsize()
+
+    def getndim(self):
+        return self.buf.getndim()
+
+    def getshape(self):
+        return self.shape
+
+    def getstrides(self):
+        return self.strides
+
+    def parent_index(self, idx):
+        return self.start + self.step * idx
+
+    def w_getitem(self, space, idx):
+        return self.buf.w_getitem(space, self.parent_index(idx))
+
+    def setitem_w(self, space, idx, w_obj):
+        return self.buf.setitem_w(space, self.parent_index(idx), w_obj)
+
 
 class BinaryBuffer(object):
     """Base class for buffers of bytes"""
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -160,19 +160,11 @@
             else:
                 raise oefmt(space.w_NotImplementedError, "multi-dimensional sub-views are not implemented")
         elif is_slice:
-            return self.new_slice(start, stop, step, slicelength, 0)
+            return W_MemoryView(self.buf.new_slice(start, step, slicelength))
         # multi index is handled at the top of this function
         else:
             raise TypeError("memoryview: invalid slice key")
 
-    def new_slice(self, start, stop, step, slicelength, dim):
-        pybuf = self.buf
-        if step == 1 and isinstance(pybuf, SimpleBuffer):
-            sliced = SimpleBuffer(SubBuffer(pybuf.data, start, slicelength))
-        else:
-            sliced = BufferSlice(pybuf, start, step, slicelength)
-        return W_MemoryView(sliced)
-
     def init_len(self):
         self.length = self.bytecount_from_shape()
 
@@ -593,63 +585,6 @@
                 _IsFortranContiguous(ndim, shape, strides, itemsize))
     return 0
 
-class BufferSlice(PyBuffer):
-    _immutable_ = True
-    _attrs_ = ['buf', 'readonly', 'shape', 'strides', 'start', 'step']
-    def __init__(self, buf, start, step, length):
-        self.buf = buf
-        self.readonly = self.buf.readonly
-        self.strides = buf.getstrides()[:]
-        itemsize = buf.getitemsize()
-        self.start = start
-        self.step = step
-        self.strides[0] *= step
-        self.shape = buf.getshape()[:]
-        self.shape[0] = length
-
-    def getlength(self):
-        return self.shape[0] * self.getitemsize()
-
-    def getbytes(self, start, size):
-        offset = self.start * self.buf.getstrides()[0]
-        return self.buf.getbytes(offset + start, size)
-
-    def setbytes(self, start, string):
-        if len(string) == 0:
-            return        # otherwise, adding self.offset might make 'start'
-                          # out of bounds
-        offset = self.start * self.buf.getstrides()[0]
-        self.buf.setbytes(offset + start, string)
-
-    def get_raw_address(self):
-        from rpython.rtyper.lltypesystem import rffi
-        offset = self.start * self.buf.getstrides()[0]
-        return rffi.ptradd(self.buf.get_raw_address(), offset)
-
-    def getformat(self):
-        return self.buf.getformat()
-
-    def getitemsize(self):
-        return self.buf.getitemsize()
-
-    def getndim(self):
-        return self.buf.getndim()
-
-    def getshape(self):
-        return self.shape
-
-    def getstrides(self):
-        return self.strides
-
-    def parent_index(self, idx):
-        return self.start + self.step * idx
-
-    def w_getitem(self, space, idx):
-        return self.buf.w_getitem(space, self.parent_index(idx))
-
-    def setitem_w(self, space, idx, w_obj):
-        return self.buf.setitem_w(space, self.parent_index(idx), w_obj)
-
 
 class BufferViewBase(PyBuffer):
     _immutable_ = True

From pypy.commits at gmail.com  Tue Apr 25 10:46:56 2017
From: pypy.commits at gmail.com (rlamy)
Date: Tue, 25 Apr 2017 07:46:56 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: optimisation: do not nest BufferSlice
 objects
Message-ID: <58ff6160.910b370a.54eed.4365@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91124:b669ec17dc42
Date: 2017-04-25 15:46 +0100
http://bitbucket.org/pypy/pypy/changeset/b669ec17dc42/

Log:	optimisation: do not nest BufferSlice objects

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -313,6 +313,11 @@
     def w_getitem(self, space, idx):
         return self.buf.w_getitem(space, self.parent_index(idx))
 
+    def new_slice(self, start, step, slicelength):
+        real_start = start + self.start
+        real_step = self.step * step
+        return BufferSlice(self.buf, real_start, real_step, slicelength)
+
     def setitem_w(self, space, idx, w_obj):
         return self.buf.setitem_w(space, self.parent_index(idx), w_obj)
 

From pypy.commits at gmail.com  Tue Apr 25 11:25:12 2017
From: pypy.commits at gmail.com (rlamy)
Date: Tue, 25 Apr 2017 08:25:12 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: replace rpython.rlib.buffer.Buffer
 (and subclasses) with pypy.interpreter.buffer.BinaryBuffer (and subclasses)
Message-ID: <58ff6a58.44ba370a.21aaf.46a4@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91125:985fe7a93e47
Date: 2017-04-25 16:24 +0100
http://bitbucket.org/pypy/pypy/changeset/985fe7a93e47/

Log:	replace rpython.rlib.buffer.Buffer (and subclasses) with
	pypy.interpreter.buffer.BinaryBuffer (and subclasses)

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -1,7 +1,6 @@
-from rpython.rlib.rgc import nonmoving_raw_ptr_for_resizable_list
-from rpython.rlib.signature import signature
-from rpython.rlib import types
 from rpython.rlib.rstruct.error import StructError
+from rpython.rlib.buffer import Buffer as BinaryBuffer
+from rpython.rlib.buffer import StringBuffer, ByteBuffer, SubBuffer
 
 from pypy.interpreter.error import oefmt
 
@@ -128,12 +127,11 @@
             index += nitems
         if index < 0 or index >= nitems:
             raise oefmt(space.w_IndexError,
-                "index out of bounds on dimension %d", dim+1)
+                "index out of bounds on dimension %d", dim + 1)
         # TODO suboffsets?
         strides = self.getstrides()
         return strides[dim] * index
 
-
     def w_getitem(self, space, idx):
         offset = self.get_offset(space, 0, idx)
         itemsize = self.getitemsize()
@@ -146,14 +144,12 @@
 
     def setitem_w(self, space, idx, w_obj):
         offset = self.get_offset(space, 0, idx)
-        itemsize = self.getitemsize()
         # TODO: this probably isn't very fast
         byteval = self.bytes_from_value(space, w_obj)
         self.setbytes(offset, byteval)
 
     def w_tolist(self, space):
         dim = self.getndim()
-        fmt = self.getformat()
         if dim == 0:
             raise NotImplementedError
         elif dim == 1:
@@ -176,7 +172,7 @@
             bytecount = (stride * dimshape)
             values_w = [
                 self.value_from_bytes(space, self.getbytes(pos, itemsize))
-                    for pos in range(start, start + bytecount, stride)]
+                for pos in range(start, start + bytecount, stride)]
             return space.newlist(values_w)
 
         items = [None] * dimshape
@@ -262,11 +258,11 @@
 class BufferSlice(PyBuffer):
     _immutable_ = True
     _attrs_ = ['buf', 'readonly', 'shape', 'strides', 'start', 'step']
+
     def __init__(self, buf, start, step, length):
         self.buf = buf
         self.readonly = self.buf.readonly
         self.strides = buf.getstrides()[:]
-        itemsize = buf.getitemsize()
         self.start = start
         self.step = step
         self.strides[0] *= step
@@ -320,174 +316,3 @@
 
     def setitem_w(self, space, idx, w_obj):
         return self.buf.setitem_w(space, self.parent_index(idx), w_obj)
-
-
-class BinaryBuffer(object):
-    """Base class for buffers of bytes"""
-    _attrs_ = ['readonly']
-    _immutable_ = True
-
-    def getlength(self):
-        """Returns the size in bytes (even if getitemsize() > 1)."""
-        raise NotImplementedError
-
-    def __len__(self):
-        res = self.getlength()
-        assert res >= 0
-        return res
-
-    def as_str(self):
-        "Returns an interp-level string with the whole content of the buffer."
-        # May be overridden.
-        return self.getslice(0, self.getlength(), 1, self.getlength())
-
-    def as_str_and_offset_maybe(self):
-        """
-        If the buffer is backed by a string, return a pair (string, offset),
-        where offset is the offset inside the string where the buffer start.
-        Else, return (None, 0).
-        """
-        return None, 0
-
-    def getitem(self, index):
-        "Returns the index'th character in the buffer."
-        raise NotImplementedError   # Must be overriden.  No bounds checks.
-
-    def __getitem__(self, i):
-        return self.getitem(i)
-
-    def getslice(self, start, stop, step, size):
-        # May be overridden.  No bounds checks.
-        return ''.join([self.getitem(i) for i in range(start, stop, step)])
-
-    @signature(types.any(), types.int(), types.int(), returns=types.str())
-    def __getslice__(self, start, stop):
-        return self.getslice(start, stop, 1, stop - start)
-
-    def setitem(self, index, char):
-        "Write a character into the buffer."
-        raise NotImplementedError   # Must be overriden.  No bounds checks.
-
-    def __setitem__(self, i, char):
-        return self.setitem(i, char)
-
-    def setslice(self, start, string):
-        # May be overridden.  No bounds checks.
-        for i in range(len(string)):
-            self.setitem(start + i, string[i])
-
-class ByteBuffer(BinaryBuffer):
-    _immutable_ = True
-
-    def __init__(self, len):
-        self.data = ['\x00'] * len
-        self.readonly = False
-
-    def getlength(self):
-        return len(self.data)
-
-    def getitem(self, index):
-        return self.data[index]
-
-    def setitem(self, index, char):
-        self.data[index] = char
-
-    def get_raw_address(self):
-        return nonmoving_raw_ptr_for_resizable_list(self.data)
-
-class StringBuffer(BinaryBuffer):
-    _attrs_ = ['readonly', 'value']
-    _immutable_ = True
-
-    def __init__(self, value):
-        self.value = value
-        self.readonly = 1
-
-    def getlength(self):
-        return len(self.value)
-
-    def as_str(self):
-        return self.value
-
-    def as_str_and_offset_maybe(self):
-        return self.value, 0
-
-    def getitem(self, index):
-        return self.value[index]
-
-    def getslice(self, start, stop, step, size):
-        if size == 0:
-            return ""
-        if step == 1:
-            assert 0 <= start <= stop
-            if start == 0 and stop == len(self.value):
-                return self.value
-            return self.value[start:stop]
-        return BinaryBuffer.getslice(self, start, stop, step, size)
-
-    def get_raw_address(self):
-        from rpython.rtyper.lltypesystem import rffi
-        # may still raise ValueError on some GCs
-        return rffi.get_raw_address_of_string(self.value)
-
-class SubBuffer(BinaryBuffer):
-    _attrs_ = ['buffer', 'offset', 'size', 'readonly']
-    _immutable_ = True
-
-    @signature(types.any(), types.instance(BinaryBuffer), types.int(), types.int(), returns=types.none())
-    def __init__(self, buffer, offset, size):
-        self.readonly = buffer.readonly
-        if isinstance(buffer, SubBuffer):     # don't nest them
-            # we want a view (offset, size) over a view
-            # (buffer.offset, buffer.size) over buffer.buffer.
-            # Note that either '.size' can be -1 to mean 'up to the end'.
-            at_most = buffer.getlength() - offset
-            if size > at_most or size < 0:
-                if at_most < 0:
-                    at_most = 0
-                size = at_most
-            offset += buffer.offset
-            buffer = buffer.buffer
-        #
-        self.buffer = buffer
-        self.offset = offset
-        self.size = size
-
-    def getlength(self):
-        at_most = self.buffer.getlength() - self.offset
-        if 0 <= self.size <= at_most:
-            return self.size
-        elif at_most >= 0:
-            return at_most
-        else:
-            return 0
-
-    def as_str_and_offset_maybe(self):
-        string, offset = self.buffer.as_str_and_offset_maybe()
-        if string is not None:
-            return string, offset + self.offset
-        return None, 0
-
-    def getitem(self, index):
-        return self.buffer.getitem(self.offset + index)
-
-    def getslice(self, start, stop, step, size):
-        if start == stop:
-            return ''     # otherwise, adding self.offset might make them
-                          # out of bounds
-        return self.buffer.getslice(self.offset + start, self.offset + stop,
-                                    step, size)
-
-    def setitem(self, index, char):
-        self.buffer.setitem(self.offset + index, char)
-
-    def setslice(self, start, string):
-        if len(string) == 0:
-            return        # otherwise, adding self.offset might make 'start'
-                          # out of bounds
-        self.buffer.setslice(self.offset + start, string)
-
-    def get_raw_address(self):
-        from rpython.rtyper.lltypesystem import rffi
-        ptr = self.buffer.get_raw_address()
-        return rffi.ptradd(ptr, self.offset)
diff --git a/rpython/rlib/buffer.py b/rpython/rlib/buffer.py
--- a/rpython/rlib/buffer.py
+++ b/rpython/rlib/buffer.py
@@ -1,13 +1,12 @@
 """
 Buffer protocol support.
 """
-from rpython.rlib import jit
-from rpython.rlib.rgc import (resizable_list_supporting_raw_ptr,
-        nonmoving_raw_ptr_for_resizable_list)
-
+from rpython.rlib.rgc import nonmoving_raw_ptr_for_resizable_list
+from rpython.rlib.signature import signature
+from rpython.rlib import types
 
 class Buffer(object):
-    """Abstract base class for buffers."""
+    """Base class for buffers of bytes"""
     _attrs_ = ['readonly']
     _immutable_ = True
 
@@ -27,8 +26,8 @@
 
     def as_str_and_offset_maybe(self):
         """
-        If the buffer is backed by a string, return a pair (string, offset), where
-        offset is the offset inside the string where the buffer start.
+        If the buffer is backed by a string, return a pair (string, offset),
+        where offset is the offset inside the string where the buffer start.
         Else, return (None, 0).
         """
         return None, 0
@@ -44,6 +43,7 @@
         # May be overridden.  No bounds checks.
         return ''.join([self.getitem(i) for i in range(start, stop, step)])
 
+    @signature(types.any(), types.int(), types.int(), returns=types.str())
     def __getslice__(self, start, stop):
         return self.getslice(start, stop, 1, stop - start)
 
@@ -59,26 +59,24 @@
         for i in range(len(string)):
             self.setitem(start + i, string[i])
 
+class ByteBuffer(Buffer):
+    _immutable_ = True
+
+    def __init__(self, len):
+        self.data = ['\x00'] * len
+        self.readonly = False
+
+    def getlength(self):
+        return len(self.data)
+
+    def getitem(self, index):
+        return self.data[index]
+
+    def setitem(self, index, char):
+        self.data[index] = char
+
     def get_raw_address(self):
-        raise ValueError("no raw buffer")
-
-    def getformat(self):
-        return 'B'
-
-    def getitemsize(self):
-        return 1
-
-    def getndim(self):
-        return 1
-
-    def getshape(self):
-        return [self.getlength()]
-
-    def getstrides(self):
-        return [1]
-
-    def releasebuffer(self):
-        pass
+        return nonmoving_raw_ptr_for_resizable_list(self.data)
 
 class StringBuffer(Buffer):
     _attrs_ = ['readonly', 'value']
@@ -119,6 +117,7 @@
     _attrs_ = ['buffer', 'offset', 'size', 'readonly']
     _immutable_ = True
 
+    @signature(types.any(), types.instance(Buffer), types.int(), types.int(), returns=types.none())
     def __init__(self, buffer, offset, size):
         self.readonly = buffer.readonly
         if isinstance(buffer, SubBuffer):     # don't nest them
@@ -149,7 +148,7 @@
     def as_str_and_offset_maybe(self):
         string, offset = self.buffer.as_str_and_offset_maybe()
         if string is not None:
-            return string, offset+self.offset
+            return string, offset + self.offset
         return None, 0
 
     def getitem(self, index):

From pypy.commits at gmail.com  Tue Apr 25 13:01:25 2017
From: pypy.commits at gmail.com (rlamy)
Date: Tue, 25 Apr 2017 10:01:25 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Renamings: PyBuffer -> BufferView,
 space.newbuffer -> space.newmemoryview, ...
Message-ID: <58ff80e5.d02ec80a.8b205.56d1@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91126:3841ee7693ba
Date: 2017-04-25 18:00 +0100
http://bitbucket.org/pypy/pypy/changeset/3841ee7693ba/

Log:	Renamings: PyBuffer -> BufferView, space.newbuffer ->
	space.newmemoryview, ...

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -8,7 +8,7 @@
     pass
 
 
-class PyBuffer(object):
+class BufferView(object):
     """Abstract base class for buffers."""
     _attrs_ = ['readonly']
     _immutable_ = True
@@ -26,7 +26,7 @@
 
         This is a low-level operation, it is up to the caller to ensure that
         the data requested actually correspond to items accessible from the
-        PyBuffer.
+        BufferView.
         Note that `start` may be negative, e.g. if the buffer is reversed.
         """
         raise NotImplementedError
@@ -183,8 +183,11 @@
 
         return space.newlist(items)
 
+    def wrap(self, space):
+        return space.newmemoryview(self)
 
-class SimpleBuffer(PyBuffer):
+
+class SimpleBuffer(BufferView):
     _attrs_ = ['readonly', 'data']
     _immutable_ = True
 
@@ -255,7 +258,7 @@
         idx = self.get_offset(space, 0, idx)
         self.data[idx] = space.byte_w(w_obj)
 
-class BufferSlice(PyBuffer):
+class BufferSlice(BufferView):
     _immutable_ = True
     _attrs_ = ['buf', 'readonly', 'shape', 'strides', 'start', 'step']
 
diff --git a/pypy/module/__pypy__/bytebuffer.py b/pypy/module/__pypy__/bytebuffer.py
--- a/pypy/module/__pypy__/bytebuffer.py
+++ b/pypy/module/__pypy__/bytebuffer.py
@@ -7,4 +7,4 @@
 
 @unwrap_spec(length=int)
 def bytebuffer(space, length):
-    return space.newbuffer(SimpleBuffer(ByteBuffer(length)))
+    return SimpleBuffer(ByteBuffer(length)).wrap(space)
diff --git a/pypy/module/_io/interp_bufferedio.py b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -584,10 +584,10 @@
         assert buffer is not None
         length = intmask(length)
         start = intmask(start)
-        w_buf = space.newbuffer(SimpleBuffer(SubBuffer(buffer, start, length)))
+        w_view = SimpleBuffer(SubBuffer(buffer, start, length)).wrap(space)
         while True:
             try:
-                w_size = space.call_method(self.w_raw, "readinto", w_buf)
+                w_size = space.call_method(self.w_raw, "readinto", w_view)
             except OperationError as e:
                 if trap_eintr(space, e):
                     continue  # try again
diff --git a/pypy/module/_io/interp_bytesio.py b/pypy/module/_io/interp_bytesio.py
--- a/pypy/module/_io/interp_bytesio.py
+++ b/pypy/module/_io/interp_bytesio.py
@@ -8,7 +8,6 @@
 from rpython.rlib.objectmodel import import_from_mixin
 from pypy.module._io.interp_bufferedio import W_BufferedIOBase
 from pypy.module._io.interp_iobase import convert_size
-from pypy.objspace.std.memoryobject import W_MemoryView
 import sys
 
 
@@ -125,7 +124,7 @@
 
     def getbuffer_w(self, space):
         self._check_closed(space)
-        return W_MemoryView(SimpleBuffer(BytesIOBuffer(self)))
+        return SimpleBuffer(BytesIOBuffer(self)).wrap(space)
 
     def getvalue_w(self, space):
         self._check_closed(space)
diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -6,7 +6,7 @@
 from rpython.rtyper.lltypesystem import lltype, rffi
 from rpython.rtyper.lltypesystem.rstr import copy_string_to_raw
 
-from pypy.interpreter.buffer import PyBuffer, BinaryBuffer
+from pypy.interpreter.buffer import BufferView, BinaryBuffer
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.gateway import (
@@ -257,7 +257,7 @@
             lltype.free(oldbuffer, flavor='raw')
 
     def buffer_w(self, space, flags):
-        return ArrayBuffer(ArrayData(self), self.typecode, self.itemsize, False)
+        return ArrayView(ArrayData(self), self.typecode, self.itemsize, False)
 
     def descr_append(self, space, w_x):
         """ append(x)
@@ -881,7 +881,7 @@
         return self.w_array._charbuf_start()
 
 
-class ArrayBuffer(PyBuffer):
+class ArrayView(BufferView):
     _immutable_ = True
 
     def __init__(self, data, fmt, itemsize, readonly):
diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -19,7 +19,7 @@
 from pypy.module.cpyext.memoryobject import fill_Py_buffer
 from pypy.module.cpyext.state import State
 from pypy.module.cpyext import userslot
-from pypy.interpreter.buffer import PyBuffer, BinaryBuffer
+from pypy.interpreter.buffer import BufferView, BinaryBuffer
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.argument import Arguments
 from rpython.rlib.unroll import unrolling_iterable
@@ -313,7 +313,7 @@
         space.fromcache(State).check_and_raise_exception(always=True)
     return space.newint(res)
 
-class CPyBuffer(PyBuffer):
+class CPyBuffer(BufferView):
     # Similar to Py_buffer
     _immutable_ = True
 
@@ -427,32 +427,32 @@
 
 class CBuffer(BinaryBuffer):
     _immutable_ = True
-    def __init__(self, pybuffer):
-        self.pybuffer = pybuffer
-        self.readonly = pybuffer.readonly
+    def __init__(self, view):
+        self.view = view
+        self.readonly = view.readonly
 
     def getlength(self):
-        return self.pybuffer.getlength()
+        return self.view.getlength()
 
     def getitem(self, index):
-        return self.pybuffer.ptr[index]
+        return self.view.ptr[index]
 
     def getslice(self, start, stop, step, size):
         assert step == 1
         assert stop - start == size
-        ptr = rffi.ptradd(cts.cast('char *', self.pybuffer.ptr), start)
+        ptr = rffi.ptradd(cts.cast('char *', self.view.ptr), start)
         return rffi.charpsize2str(ptr, size)
 
     def setitem(self, index, char):
-        self.pybuffer.ptr[index] = char
+        self.view.ptr[index] = char
 
     def setslice(self, index, s):
         assert s is not None
-        ptr = rffi.ptradd(cts.cast('char *', self.pybuffer.ptr), index)
+        ptr = rffi.ptradd(cts.cast('char *', self.view.ptr), index)
         rffi.str2chararray(s, ptr, len(s))
 
     def get_raw_address(self):
-        return cts.cast('char *', self.pybuffer.ptr)
+        return cts.cast('char *', self.view.ptr)
 
 
 def wrap_getreadbuffer(space, w_self, w_args, func):
@@ -471,7 +471,7 @@
         buf = CPyBuffer(space, ptr[0], size, w_self,
                                releasebufferproc=rbp)
         fq.register_finalizer(buf)
-        return space.newbuffer(buf)
+        return buf.wrap(space)
 
 def wrap_getwritebuffer(space, w_self, w_args, func):
     func_target = rffi.cast(readbufferproc, func)
@@ -489,7 +489,7 @@
         buf = CPyBuffer(space, ptr[0], size, w_self, readonly=False,
                                releasebufferproc=rbp)
         fq.register_finalizer(buf)
-        return space.newbuffer(buf)
+        return buf.wrap(space)
 
 def wrap_getbuffer(space, w_self, w_args, func):
     func_target = rffi.cast(getbufferproc, func)
@@ -531,7 +531,7 @@
                             needs_decref=True,
                             releasebufferproc = rbp)
         fq.register_finalizer(buf)
-        return space.newbuffer(buf, itemsize=buf.itemsize)
+        return buf.wrap(space)
 
 def get_richcmp_func(OP_CONST):
     def inner(space, w_self, w_args, func):
@@ -784,24 +784,24 @@
     @slot_function([PyObject, Py_bufferP, rffi.INT_real],
             rffi.INT_real, error=-1)
     @func_renamer("cpyext_%s_%s" % (name, typedef.name))
-    def buff_w(space, w_self, view, flags):
+    def buff_w(space, w_self, c_view, flags):
         args = Arguments(space, [space.newint(flags)])
         w_obj = space.call_args(space.get(buff_fn, w_self), args)
-        if view:
+        if c_view:
             #like PyObject_GetBuffer
             flags = widen(flags)
             buf = space.buffer_w(w_obj, flags)
             try:
-                view.c_buf = rffi.cast(rffi.VOIDP, buf.get_raw_address())
-                view.c_obj = make_ref(space, w_obj)
+                c_view.c_buf = rffi.cast(rffi.VOIDP, buf.get_raw_address())
+                c_view.c_obj = make_ref(space, w_obj)
             except ValueError:
                 s = buf.as_str()
                 w_s = space.newbytes(s)
-                view.c_obj = make_ref(space, w_s)
-                view.c_buf = rffi.cast(rffi.VOIDP, rffi.str2charp(
+                c_view.c_obj = make_ref(space, w_s)
+                c_view.c_buf = rffi.cast(rffi.VOIDP, rffi.str2charp(
                                         s, track_allocation=False))
-                rffi.setintfield(view, 'c_readonly', 1)
-            ret = fill_Py_buffer(space, buf, view)
+                rffi.setintfield(c_view, 'c_readonly', 1)
+            ret = fill_Py_buffer(space, buf, c_view)
             return ret
         return 0
     return buff_w
@@ -811,23 +811,23 @@
     @slot_function([PyObject, Py_bufferP, rffi.INT_real],
             rffi.INT_real, error=-1)
     @func_renamer("cpyext_%s_%s" % (name, typedef.name))
-    def buff_w(space, w_self, view, flags):
+    def buff_w(space, w_self, c_view, flags):
         w_obj = w_self
-        if view:
+        if c_view:
             #like PyObject_GetBuffer
             flags = widen(flags)
             buf = space.buffer_w(w_obj, flags)
             try:
-                view.c_buf = rffi.cast(rffi.VOIDP, buf.get_raw_address())
-                view.c_obj = make_ref(space, w_obj)
+                c_view.c_buf = rffi.cast(rffi.VOIDP, buf.get_raw_address())
+                c_view.c_obj = make_ref(space, w_obj)
             except ValueError:
                 s = buf.as_str()
                 w_s = space.newbytes(s)
-                view.c_obj = make_ref(space, w_s)
-                view.c_buf = rffi.cast(rffi.VOIDP, rffi.str2charp(
+                c_view.c_obj = make_ref(space, w_s)
+                c_view.c_buf = rffi.cast(rffi.VOIDP, rffi.str2charp(
                                         s, track_allocation=False))
-                rffi.setintfield(view, 'c_readonly', 1)
-            ret = fill_Py_buffer(space, buf, view)
+                rffi.setintfield(c_view, 'c_readonly', 1)
+            ret = fill_Py_buffer(space, buf, c_view)
             return ret
         return 0
     return buff_w
diff --git a/pypy/module/cpyext/test/test_memoryobject.py b/pypy/module/cpyext/test/test_memoryobject.py
--- a/pypy/module/cpyext/test/test_memoryobject.py
+++ b/pypy/module/cpyext/test/test_memoryobject.py
@@ -11,9 +11,9 @@
 
 class TestMemoryViewObject(BaseApiTest):
     def test_frombuffer(self, space, api):
-        w_buf = space.newbuffer(SimpleBuffer(StringBuffer("hello")))
+        w_view = SimpleBuffer(StringBuffer("hello")).wrap(space)
         c_memoryview = rffi.cast(
-            PyMemoryViewObject, api.PyMemoryView_FromObject(w_buf))
+            PyMemoryViewObject, api.PyMemoryView_FromObject(w_view))
         w_memoryview = from_ref(space, c_memoryview)
         view = c_memoryview.c_view
         assert view.c_ndim == 1
diff --git a/pypy/module/micronumpy/concrete.py b/pypy/module/micronumpy/concrete.py
--- a/pypy/module/micronumpy/concrete.py
+++ b/pypy/module/micronumpy/concrete.py
@@ -1,4 +1,4 @@
-from pypy.interpreter.buffer import PyBuffer
+from pypy.interpreter.buffer import BufferView
 from pypy.interpreter.error import oefmt
 from rpython.rlib import jit, rgc
 from rpython.rlib.rarithmetic import ovfcheck
@@ -397,7 +397,7 @@
             not self.flags & NPY.ARRAY_WRITEABLE):
            raise oefmt(errtype, "buffer source array is read-only")
         readonly = not (flags & space.BUF_WRITABLE) == space.BUF_WRITABLE
-        return ArrayBuffer(self, readonly)
+        return ArrayView(self, readonly)
 
     def astype(self, space, dtype, order, copy=True):
         # copy the general pattern of the strides
@@ -702,7 +702,7 @@
         free_raw_storage(self.storage)
 
 
-class ArrayBuffer(PyBuffer):
+class ArrayView(BufferView):
     _immutable_ = True
 
     def __init__(self, impl, readonly):
diff --git a/pypy/module/micronumpy/ndarray.py b/pypy/module/micronumpy/ndarray.py
--- a/pypy/module/micronumpy/ndarray.py
+++ b/pypy/module/micronumpy/ndarray.py
@@ -808,7 +808,7 @@
         return self.implementation.get_buffer(space, flags)
 
     def descr_get_data(self, space):
-        return space.newbuffer(self.implementation.get_buffer(space, space.BUF_FULL))
+        return self.implementation.get_buffer(space, space.BUF_FULL).wrap(space)
 
     @unwrap_spec(offset=int, axis1=int, axis2=int)
     def descr_diagonal(self, space, offset=0, axis1=0, axis2=1):
diff --git a/pypy/objspace/fake/objspace.py b/pypy/objspace/fake/objspace.py
--- a/pypy/objspace/fake/objspace.py
+++ b/pypy/objspace/fake/objspace.py
@@ -205,7 +205,7 @@
     def newseqiter(self, x):
         return w_some_obj()
 
-    def newbuffer(self, x, itemsize=1):
+    def newmemoryview(self, x):
         return w_some_obj()
 
     @not_rpython
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -5,7 +5,7 @@
 
 from rpython.rlib.objectmodel import compute_hash
 from pypy.interpreter.baseobjspace import W_Root
-from pypy.interpreter.buffer import PyBuffer, SimpleBuffer, SubBuffer
+from pypy.interpreter.buffer import BufferView, SimpleBuffer, SubBuffer
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.gateway import interp2app
 from pypy.interpreter.typedef import TypeDef, GetSetProperty,  make_weakref_descr
@@ -26,7 +26,7 @@
     """
 
     def __init__(self, buf):
-        assert isinstance(buf, PyBuffer)
+        assert isinstance(buf, BufferView)
         self.buf = buf
         self._hash = -1
         self.flags = 0
@@ -58,7 +58,7 @@
             w_object._check_released(space)
             return W_MemoryView.copy(w_object)
         buf = space.buffer_w(w_object, space.BUF_FULL_RO)
-        return W_MemoryView(buf)
+        return buf.wrap(space)
 
     def _make_descr__cmp(name):
         def descr__cmp(self, space, w_other):
@@ -160,7 +160,7 @@
             else:
                 raise oefmt(space.w_NotImplementedError, "multi-dimensional sub-views are not implemented")
         elif is_slice:
-            return W_MemoryView(self.buf.new_slice(start, step, slicelength))
+            return self.buf.new_slice(start, step, slicelength).wrap(space)
         # multi index is handled at the top of this function
         else:
             raise TypeError("memoryview: invalid slice key")
@@ -342,7 +342,7 @@
         return size
 
     def _zero_in_shape(self):
-        # this method could be moved to the class PyBuffer
+        # this method could be moved to the class BufferView
         buf = self.buf
         shape = buf.getshape()
         for i in range(buf.getndim()):
@@ -383,13 +383,12 @@
                 raise oefmt(space.w_TypeError,
                             "memoryview: cast must be 1D -> ND or ND -> 1D")
 
-        newbuf = self._cast_to_1D(space, buf, fmt)
+        newview = self._cast_to_1D(space, buf, fmt)
         if w_shape:
             fview = space.fixedview(w_shape)
             shape = [space.int_w(w_obj) for w_obj in fview]
-            newbuf = self._cast_to_ND(space, newbuf, shape, ndim)
-        mv = W_MemoryView(newbuf)
-        return mv
+            newview = self._cast_to_ND(space, newview, shape, ndim)
+        return newview.wrap(space)
 
     def _init_flags(self):
         buf = self.buf
@@ -586,7 +585,8 @@
     return 0
 
 
-class BufferViewBase(PyBuffer):
+class IndirectView(BufferView):
+    """Base class for views into another BufferView"""
     _immutable_ = True
     _attrs_ = ['readonly', 'parent']
 
@@ -614,7 +614,7 @@
     def as_binary_rw(self):
         return self.parent.as_binary_rw()
 
-class BufferView1D(BufferViewBase):
+class BufferView1D(IndirectView):
     _immutable_ = True
     _attrs_ = ['readonly', 'parent', 'format', 'itemsize']
 
@@ -639,7 +639,7 @@
     def getstrides(self):
         return [self.itemsize]
 
-class BufferViewND(BufferViewBase):
+class BufferViewND(IndirectView):
     _immutable_ = True
     _attrs_ = ['readonly', 'parent', 'ndim', 'shape', 'strides']
 
diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objspace/std/objspace.py
@@ -368,7 +368,7 @@
     def newseqiter(self, w_obj):
         return W_SeqIterObject(w_obj)
 
-    def newbuffer(self, w_obj, itemsize=1):
+    def newmemoryview(self, w_obj):
         return W_MemoryView(w_obj)
 
     def newbytes(self, s):
diff --git a/pypy/objspace/std/test/test_memoryobject.py b/pypy/objspace/std/test/test_memoryobject.py
--- a/pypy/objspace/std/test/test_memoryobject.py
+++ b/pypy/objspace/std/test/test_memoryobject.py
@@ -4,7 +4,7 @@
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.gateway import interp2app
 from pypy.interpreter.typedef import TypeDef
-from pypy.interpreter.buffer import PyBuffer
+from pypy.interpreter.buffer import BufferView
 from pypy.conftest import option
 
 class AppTestMemoryView(object):
@@ -300,7 +300,7 @@
         assert (m[0], m[1], m[2], m[3]) == expected
         a.free()
 
-class MockBuffer(PyBuffer):
+class MockBuffer(BufferView):
     def __init__(self, space, w_arr, w_dim, w_fmt, \
                  w_itemsize, w_strides, w_shape):
         self.space = space

From pypy.commits at gmail.com  Tue Apr 25 13:31:39 2017
From: pypy.commits at gmail.com (mattip)
Date: Tue, 25 Apr 2017 10:31:39 -0700 (PDT)
Subject: [pypy-commit] cffi find-vcvars: move _hack_at_distutils from global
 to per-function
Message-ID: <58ff87fb.d610370a.48d40.442b@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: find-vcvars
Changeset: r2927:05483eaa4461
Date: 2017-04-25 20:31 +0300
http://bitbucket.org/cffi/cffi/changeset/05483eaa4461/

Log:	move _hack_at_distutils from global to per-function

diff --git a/cffi/ffiplatform.py b/cffi/ffiplatform.py
--- a/cffi/ffiplatform.py
+++ b/cffi/ffiplatform.py
@@ -6,6 +6,7 @@
                       'extra_objects', 'depends']
 
 def get_extension(srcfilename, modname, sources=(), **kwds):
+    _hack_at_distutils()
     from distutils.core import Extension
     allsources = [srcfilename]
     for src in sources:
@@ -15,6 +16,7 @@
 def compile(tmpdir, ext, compiler_verbose=0, debug=None):
     """Compile a C extension module using distutils."""
 
+    _hack_at_distutils()
     saved_environ = os.environ.copy()
     try:
         outputfilename = _build(tmpdir, ext, compiler_verbose, debug)
@@ -123,6 +125,3 @@
             import setuptools    # for side-effects, patches distutils
         except ImportError:
             pass
-
-# this must be done before get_extension() and before compile()
-_hack_at_distutils()

From pypy.commits at gmail.com  Tue Apr 25 13:32:58 2017
From: pypy.commits at gmail.com (rlamy)
Date: Tue, 25 Apr 2017 10:32:58 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: More buffer -> view renamings
Message-ID: <58ff884a.15ede90a.eff90.f71b@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91127:bf5037061e5f
Date: 2017-04-25 18:32 +0100
http://bitbucket.org/pypy/pypy/changeset/bf5037061e5f/

Log:	More buffer -> view renamings

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -187,7 +187,7 @@
         return space.newmemoryview(self)
 
 
-class SimpleBuffer(BufferView):
+class SimpleView(BufferView):
     _attrs_ = ['readonly', 'data']
     _immutable_ = True
 
@@ -250,7 +250,7 @@
 
     def new_slice(self, start, step, slicelength):
         if step == 1:
-            return SimpleBuffer(SubBuffer(self.data, start, slicelength))
+            return SimpleView(SubBuffer(self.data, start, slicelength))
         else:
             return BufferSlice(self, start, step, slicelength)
 
@@ -258,47 +258,48 @@
         idx = self.get_offset(space, 0, idx)
         self.data[idx] = space.byte_w(w_obj)
 
+
 class BufferSlice(BufferView):
     _immutable_ = True
-    _attrs_ = ['buf', 'readonly', 'shape', 'strides', 'start', 'step']
+    _attrs_ = ['parent', 'readonly', 'shape', 'strides', 'start', 'step']
 
-    def __init__(self, buf, start, step, length):
-        self.buf = buf
-        self.readonly = self.buf.readonly
-        self.strides = buf.getstrides()[:]
+    def __init__(self, parent, start, step, length):
+        self.parent = parent
+        self.readonly = self.parent.readonly
+        self.strides = parent.getstrides()[:]
         self.start = start
         self.step = step
         self.strides[0] *= step
-        self.shape = buf.getshape()[:]
+        self.shape = parent.getshape()[:]
         self.shape[0] = length
 
     def getlength(self):
         return self.shape[0] * self.getitemsize()
 
     def getbytes(self, start, size):
-        offset = self.start * self.buf.getstrides()[0]
-        return self.buf.getbytes(offset + start, size)
+        offset = self.start * self.parent.getstrides()[0]
+        return self.parent.getbytes(offset + start, size)
 
     def setbytes(self, start, string):
         if len(string) == 0:
             return        # otherwise, adding self.offset might make 'start'
                           # out of bounds
-        offset = self.start * self.buf.getstrides()[0]
-        self.buf.setbytes(offset + start, string)
+        offset = self.start * self.parent.getstrides()[0]
+        self.parent.setbytes(offset + start, string)
 
     def get_raw_address(self):
         from rpython.rtyper.lltypesystem import rffi
-        offset = self.start * self.buf.getstrides()[0]
-        return rffi.ptradd(self.buf.get_raw_address(), offset)
+        offset = self.start * self.parent.getstrides()[0]
+        return rffi.ptradd(self.parent.get_raw_address(), offset)
 
     def getformat(self):
-        return self.buf.getformat()
+        return self.parent.getformat()
 
     def getitemsize(self):
-        return self.buf.getitemsize()
+        return self.parent.getitemsize()
 
     def getndim(self):
-        return self.buf.getndim()
+        return self.parent.getndim()
 
     def getshape(self):
         return self.shape
@@ -310,12 +311,12 @@
         return self.start + self.step * idx
 
     def w_getitem(self, space, idx):
-        return self.buf.w_getitem(space, self.parent_index(idx))
+        return self.parent.w_getitem(space, self.parent_index(idx))
 
     def new_slice(self, start, step, slicelength):
         real_start = start + self.start
         real_step = self.step * step
-        return BufferSlice(self.buf, real_start, real_step, slicelength)
+        return BufferSlice(self.parent, real_start, real_step, slicelength)
 
     def setitem_w(self, space, idx, w_obj):
-        return self.buf.setitem_w(space, self.parent_index(idx), w_obj)
+        return self.parent.setitem_w(space, self.parent_index(idx), w_obj)
diff --git a/pypy/module/__pypy__/bytebuffer.py b/pypy/module/__pypy__/bytebuffer.py
--- a/pypy/module/__pypy__/bytebuffer.py
+++ b/pypy/module/__pypy__/bytebuffer.py
@@ -2,9 +2,9 @@
 # A convenient read-write buffer.  Located here for want of a better place.
 #
 
-from pypy.interpreter.buffer import SimpleBuffer, ByteBuffer
+from pypy.interpreter.buffer import SimpleView, ByteBuffer
 from pypy.interpreter.gateway import unwrap_spec
 
 @unwrap_spec(length=int)
 def bytebuffer(space, length):
-    return SimpleBuffer(ByteBuffer(length)).wrap(space)
+    return SimpleView(ByteBuffer(length)).wrap(space)
diff --git a/pypy/module/_cffi_backend/cbuffer.py b/pypy/module/_cffi_backend/cbuffer.py
--- a/pypy/module/_cffi_backend/cbuffer.py
+++ b/pypy/module/_cffi_backend/cbuffer.py
@@ -5,7 +5,7 @@
 from pypy.module._cffi_backend import cdataobj, ctypeptr, ctypearray
 from pypy.module._cffi_backend import ctypestruct
 
-from pypy.interpreter.buffer import SimpleBuffer, BinaryBuffer
+from pypy.interpreter.buffer import SimpleView, BinaryBuffer
 from rpython.rtyper.annlowlevel import llstr
 from rpython.rtyper.lltypesystem import rffi
 from rpython.rtyper.lltypesystem.rstr import copy_string_to_raw
@@ -47,7 +47,7 @@
         self.keepalive = keepalive
 
     def buffer_w(self, space, flags):
-        return SimpleBuffer(self.buffer)
+        return SimpleView(self.buffer)
 
     def descr_len(self, space):
         return space.newint(self.buffer.getlength())
diff --git a/pypy/module/_io/interp_bufferedio.py b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -7,7 +7,7 @@
 from pypy.interpreter.typedef import (
     TypeDef, GetSetProperty, generic_new_descr, interp_attrproperty_w)
 from pypy.interpreter.gateway import interp2app, unwrap_spec, WrappedDefault
-from pypy.interpreter.buffer import SimpleBuffer, BinaryBuffer, SubBuffer
+from pypy.interpreter.buffer import SimpleView, BinaryBuffer, SubBuffer
 from rpython.rlib.rgc import (
     nonmoving_raw_ptr_for_resizable_list, resizable_list_supporting_raw_ptr)
 from rpython.rlib.rstring import StringBuilder
@@ -584,7 +584,7 @@
         assert buffer is not None
         length = intmask(length)
         start = intmask(start)
-        w_view = SimpleBuffer(SubBuffer(buffer, start, length)).wrap(space)
+        w_view = SimpleView(SubBuffer(buffer, start, length)).wrap(space)
         while True:
             try:
                 w_size = space.call_method(self.w_raw, "readinto", w_view)
diff --git a/pypy/module/_io/interp_bytesio.py b/pypy/module/_io/interp_bytesio.py
--- a/pypy/module/_io/interp_bytesio.py
+++ b/pypy/module/_io/interp_bytesio.py
@@ -2,7 +2,7 @@
 from pypy.interpreter.typedef import (
     TypeDef, generic_new_descr, GetSetProperty)
 from pypy.interpreter.gateway import interp2app, unwrap_spec
-from pypy.interpreter.buffer import SimpleBuffer, BinaryBuffer
+from pypy.interpreter.buffer import SimpleView, BinaryBuffer
 from rpython.rlib.rStringIO import RStringIO
 from rpython.rlib.rarithmetic import r_longlong
 from rpython.rlib.objectmodel import import_from_mixin
@@ -124,7 +124,7 @@
 
     def getbuffer_w(self, space):
         self._check_closed(space)
-        return SimpleBuffer(BytesIOBuffer(self)).wrap(space)
+        return SimpleView(BytesIOBuffer(self)).wrap(space)
 
     def getvalue_w(self, space):
         self._check_closed(space)
diff --git a/pypy/module/_rawffi/interp_rawffi.py b/pypy/module/_rawffi/interp_rawffi.py
--- a/pypy/module/_rawffi/interp_rawffi.py
+++ b/pypy/module/_rawffi/interp_rawffi.py
@@ -1,6 +1,6 @@
 import sys
 from pypy.interpreter.baseobjspace import W_Root
-from pypy.interpreter.buffer import SimpleBuffer
+from pypy.interpreter.buffer import SimpleView
 from pypy.interpreter.error import OperationError, oefmt, wrap_oserror
 from pypy.interpreter.gateway import interp2app, unwrap_spec
 from pypy.interpreter.typedef import interp_attrproperty
@@ -380,7 +380,7 @@
         self._ll_buffer = self.ll_buffer
 
     def buffer_w(self, space, flags):
-        return SimpleBuffer(RawFFIBuffer(self))
+        return SimpleView(RawFFIBuffer(self))
 
     def getrawsize(self):
         raise NotImplementedError("abstract base class")
diff --git a/pypy/module/cpyext/memoryobject.py b/pypy/module/cpyext/memoryobject.py
--- a/pypy/module/cpyext/memoryobject.py
+++ b/pypy/module/cpyext/memoryobject.py
@@ -42,15 +42,15 @@
     assert isinstance(w_obj, W_MemoryView)
     py_obj = rffi.cast(PyMemoryViewObject, py_obj)
     view = py_obj.c_view
-    ndim = w_obj.buf.getndim()
+    ndim = w_obj.getndim()
     if ndim >= Py_MAX_NDIMS:
         # XXX warn?
         return
-    fill_Py_buffer(space, w_obj.buf, view)
+    fill_Py_buffer(space, w_obj.view, view)
     try:
-        view.c_buf = rffi.cast(rffi.VOIDP, w_obj.buf.get_raw_address())
+        view.c_buf = rffi.cast(rffi.VOIDP, w_obj.view.get_raw_address())
         view.c_obj = make_ref(space, w_userdata)
-        rffi.setintfield(view, 'c_readonly', w_obj.buf.readonly)
+        rffi.setintfield(view, 'c_readonly', w_obj.view.readonly)
     except ValueError:
         w_s = w_obj.descr_tobytes(space)
         view.c_obj = make_ref(space, w_s)
diff --git a/pypy/module/cpyext/test/test_memoryobject.py b/pypy/module/cpyext/test/test_memoryobject.py
--- a/pypy/module/cpyext/test/test_memoryobject.py
+++ b/pypy/module/cpyext/test/test_memoryobject.py
@@ -3,7 +3,7 @@
 from rpython.rtyper.lltypesystem import rffi
 from pypy.module.cpyext.test.test_api import BaseApiTest
 from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
-from pypy.interpreter.buffer import SimpleBuffer, StringBuffer
+from pypy.interpreter.buffer import SimpleView, StringBuffer
 from pypy.module.cpyext.pyobject import from_ref
 from pypy.module.cpyext.memoryobject import PyMemoryViewObject
 
@@ -11,7 +11,7 @@
 
 class TestMemoryViewObject(BaseApiTest):
     def test_frombuffer(self, space, api):
-        w_view = SimpleBuffer(StringBuffer("hello")).wrap(space)
+        w_view = SimpleView(StringBuffer("hello")).wrap(space)
         c_memoryview = rffi.cast(
             PyMemoryViewObject, api.PyMemoryView_FromObject(w_view))
         w_memoryview = from_ref(space, c_memoryview)
diff --git a/pypy/module/mmap/interp_mmap.py b/pypy/module/mmap/interp_mmap.py
--- a/pypy/module/mmap/interp_mmap.py
+++ b/pypy/module/mmap/interp_mmap.py
@@ -2,7 +2,7 @@
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.typedef import TypeDef, GetSetProperty, make_weakref_descr
 from pypy.interpreter.gateway import interp2app, unwrap_spec, WrappedDefault
-from pypy.interpreter.buffer import BinaryBuffer, SimpleBuffer
+from pypy.interpreter.buffer import BinaryBuffer, SimpleView
 from rpython.rlib import rmmap, rarithmetic, objectmodel
 from rpython.rlib.rmmap import RValueError, RTypeError, RMMapError
 from rpython.rlib.rstring import StringBuilder
@@ -24,7 +24,7 @@
         write_required = bool(flags & space.BUF_WRITABLE)
         if write_required and readonly:
             raise oefmt(space.w_BufferError, "Object is not writable.")
-        return SimpleBuffer(MMapBuffer(self.space, self.mmap, readonly))
+        return SimpleView(MMapBuffer(self.space, self.mmap, readonly))
 
     def close(self):
         self.mmap.close()
diff --git a/pypy/objspace/fake/objspace.py b/pypy/objspace/fake/objspace.py
--- a/pypy/objspace/fake/objspace.py
+++ b/pypy/objspace/fake/objspace.py
@@ -11,7 +11,7 @@
 from pypy.tool.option import make_config
 from pypy.interpreter import argument, gateway
 from pypy.interpreter.baseobjspace import W_Root, ObjSpace, SpaceCache
-from pypy.interpreter.buffer import StringBuffer, SimpleBuffer
+from pypy.interpreter.buffer import StringBuffer, SimpleView
 from pypy.interpreter.typedef import TypeDef, GetSetProperty
 from pypy.objspace.std.sliceobject import W_SliceObject
 
@@ -42,7 +42,7 @@
         is_root(w_subtype)
 
     def buffer_w(self, space, flags):
-        return SimpleBuffer(StringBuffer("foobar"))
+        return SimpleView(StringBuffer("foobar"))
 
     def text_w(self, space):
         return NonConstant("foobar")
diff --git a/pypy/objspace/std/bytearrayobject.py b/pypy/objspace/std/bytearrayobject.py
--- a/pypy/objspace/std/bytearrayobject.py
+++ b/pypy/objspace/std/bytearrayobject.py
@@ -16,7 +16,7 @@
 from pypy.objspace.std.bytesobject import makebytesdata_w, newbytesdata_w
 from pypy.interpreter.gateway import WrappedDefault, interp2app, unwrap_spec
 from pypy.interpreter.typedef import TypeDef
-from pypy.interpreter.buffer import SimpleBuffer, BinaryBuffer
+from pypy.interpreter.buffer import SimpleView, BinaryBuffer
 from pypy.objspace.std.sliceobject import W_SliceObject, unwrap_start_stop
 from pypy.objspace.std.stringmethods import StringMethods, _get_buffer
 from pypy.objspace.std.stringmethods import _descr_getslice_slowpath
@@ -51,7 +51,7 @@
                            ''.join(self._data[self._offset:]))
 
     def buffer_w(self, space, flags):
-        return SimpleBuffer(BytearrayBuffer(self))
+        return SimpleView(BytearrayBuffer(self))
 
     def bytearray_list_of_chars_w(self, space):
         return self.getdata()
diff --git a/pypy/objspace/std/bytesobject.py b/pypy/objspace/std/bytesobject.py
--- a/pypy/objspace/std/bytesobject.py
+++ b/pypy/objspace/std/bytesobject.py
@@ -7,7 +7,7 @@
 from rpython.rlib.rstring import StringBuilder
 
 from pypy.interpreter.baseobjspace import W_Root
-from pypy.interpreter.buffer import SimpleBuffer, StringBuffer
+from pypy.interpreter.buffer import SimpleView, StringBuffer
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.gateway import (
     WrappedDefault, interp2app, interpindirect2app, unwrap_spec)
@@ -419,7 +419,7 @@
 
     def buffer_w(self, space, flags):
         space.check_buf_flags(flags, True)
-        return SimpleBuffer(StringBuffer(self._value))
+        return SimpleView(StringBuffer(self._value))
 
     def descr_getbuffer(self, space, w_flags):
         #from pypy.objspace.std.bufferobject import W_Buffer
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -5,12 +5,11 @@
 
 from rpython.rlib.objectmodel import compute_hash
 from pypy.interpreter.baseobjspace import W_Root
-from pypy.interpreter.buffer import BufferView, SimpleBuffer, SubBuffer
+from pypy.interpreter.buffer import BufferView, SubBuffer
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.gateway import interp2app
 from pypy.interpreter.typedef import TypeDef, GetSetProperty,  make_weakref_descr
 from rpython.rlib.unroll import unrolling_iterable
-from rpython.rlib.objectmodel import always_inline
 
 MEMORYVIEW_MAX_DIM = 64
 MEMORYVIEW_SCALAR   = 0x0001
@@ -25,60 +24,60 @@
     an interp-level buffer.
     """
 
-    def __init__(self, buf):
-        assert isinstance(buf, BufferView)
-        self.buf = buf
+    def __init__(self, view):
+        assert isinstance(view, BufferView)
+        self.view = view
         self._hash = -1
         self.flags = 0
         self._init_flags()
 
     def getndim(self):
-        return self.buf.getndim()
+        return self.view.getndim()
 
     def getshape(self):
-        return self.buf.getshape()
+        return self.view.getshape()
 
     def getstrides(self):
-        return self.buf.getstrides()
+        return self.view.getstrides()
 
     def getitemsize(self):
-        return self.buf.getitemsize()
+        return self.view.getitemsize()
 
     def getformat(self):
-        return self.buf.getformat()
+        return self.view.getformat()
 
     def buffer_w(self, space, flags):
         self._check_released(space)
-        space.check_buf_flags(flags, self.buf.readonly)
-        return self.buf
+        space.check_buf_flags(flags, self.view.readonly)
+        return self.view
 
     @staticmethod
     def descr_new_memoryview(space, w_subtype, w_object):
         if isinstance(w_object, W_MemoryView):
             w_object._check_released(space)
             return W_MemoryView.copy(w_object)
-        buf = space.buffer_w(w_object, space.BUF_FULL_RO)
-        return buf.wrap(space)
+        view = space.buffer_w(w_object, space.BUF_FULL_RO)
+        return view.wrap(space)
 
     def _make_descr__cmp(name):
         def descr__cmp(self, space, w_other):
-            if self.buf is None:
+            if self.view is None:
                 return space.newbool(getattr(operator, name)(self, w_other))
             if isinstance(w_other, W_MemoryView):
                 # xxx not the most efficient implementation
-                str1 = self.buf.as_str()
-                str2 = w_other.buf.as_str()
+                str1 = self.view.as_str()
+                str2 = w_other.view.as_str()
                 return space.newbool(getattr(operator, name)(str1, str2))
 
             try:
-                buf = space.buffer_w(w_other, space.BUF_CONTIG_RO)
+                view = space.buffer_w(w_other, space.BUF_CONTIG_RO)
             except OperationError as e:
                 if not e.match(space, space.w_TypeError):
                     raise
                 return space.w_NotImplemented
             else:
-                str1 = self.buf.as_str()
-                str2 = buf.as_str()
+                str1 = self.view.as_str()
+                str2 = view.as_str()
                 return space.newbool(getattr(operator, name)(str1, str2))
         descr__cmp.func_name = name
         return descr__cmp
@@ -87,21 +86,21 @@
     descr_ne = _make_descr__cmp('ne')
 
     def getlength(self):
-        return self.buf.getlength()
+        return self.view.getlength()
 
     def descr_tobytes(self, space):
         self._check_released(space)
-        return space.newbytes(self.buf.as_str())
+        return space.newbytes(self.view.as_str())
 
     def descr_tolist(self, space):
         self._check_released(space)
-        return self.buf.w_tolist(space)
+        return self.view.w_tolist(space)
 
     def _start_from_tuple(self, space, w_tuple):
         from pypy.objspace.std.tupleobject import W_AbstractTupleObject
         start = 0
 
-        view = self.buf
+        view = self.view
         length = space.len_w(w_tuple)
         dim = view.getndim()
         dim = 0
@@ -109,15 +108,12 @@
         while dim < length:
             w_obj = w_tuple.getitem(space, dim)
             index = space.getindex_w(w_obj, space.w_IndexError)
-            start += self.buf.get_offset(space, dim, index)
+            start += self.view.get_offset(space, dim, index)
             dim += 1
         return start
 
     def _getitem_tuple_indexed(self, space, w_index):
-        view = self.buf
-
-        fmt = view.getformat() # TODO adjust format?
-
+        view = self.view
         length = space.len_w(w_index)
         ndim = view.getndim()
         if length < ndim:
@@ -151,16 +147,15 @@
         start, stop, step, slicelength = self._decode_index(space, w_index, is_slice)
         # ^^^ for a non-slice index, this returns (index, 0, 0, 1)
         if step == 0:  # index only
-            itemsize = self.getitemsize()
             dim = self.getndim()
             if dim == 0:
                 raise oefmt(space.w_TypeError, "invalid indexing of 0-dim memory")
             elif dim == 1:
-                return self.buf.w_getitem(space, start)
+                return self.view.w_getitem(space, start)
             else:
                 raise oefmt(space.w_NotImplementedError, "multi-dimensional sub-views are not implemented")
         elif is_slice:
-            return self.buf.new_slice(start, step, slicelength).wrap(space)
+            return self.view.new_slice(start, step, slicelength).wrap(space)
         # multi index is handled at the top of this function
         else:
             raise TypeError("memoryview: invalid slice key")
@@ -177,14 +172,14 @@
         return length * self.getitemsize()
 
     @staticmethod
-    def copy(view):
+    def copy(w_view):
         # TODO suboffsets
-        buf = view.buf
-        return W_MemoryView(buf)
+        view = w_view.view
+        return W_MemoryView(view)
 
     def descr_setitem(self, space, w_index, w_obj):
         self._check_released(space)
-        if self.buf.readonly:
+        if self.view.readonly:
             raise oefmt(space.w_TypeError, "cannot modify read-only memory")
         if space.isinstance_w(w_index, space.w_tuple):
             raise oefmt(space.w_NotImplementedError, "")
@@ -193,13 +188,13 @@
         start, stop, step, slicelength = self._decode_index(space, w_index, is_slice)
         itemsize = self.getitemsize()
         if step == 0:  # index only
-            self.buf.setitem_w(space, start, w_obj)
+            self.view.setitem_w(space, start, w_obj)
         elif step == 1:
             value = space.buffer_w(w_obj, space.BUF_CONTIG_RO)
             if value.getlength() != slicelength * itemsize:
                 raise oefmt(space.w_ValueError,
                             "cannot modify size of memoryview object")
-            self.buf.setbytes(start * itemsize, value.as_str())
+            self.view.setbytes(start * itemsize, value.as_str())
         else:
             if self.getndim() != 1:
                 raise oefmt(space.w_NotImplementedError,
@@ -213,7 +208,7 @@
             dst_strides = self.getstrides()
             dim = 0
             dst = SubBuffer(
-                self.buf.as_binary_rw(),
+                self.view.as_binary_rw(),
                 start * itemsize, slicelength * itemsize)
             src_stride0 = dst_strides[dim]
 
@@ -255,7 +250,7 @@
 
     def w_is_readonly(self, space):
         self._check_released(space)
-        return space.newbool(bool(self.buf.readonly))
+        return space.newbool(bool(self.view.readonly))
 
     def w_get_shape(self, space):
         self._check_released(space)
@@ -271,7 +266,7 @@
         return space.newtuple([])
 
     def descr_repr(self, space):
-        if self.buf is None:
+        if self.view is None:
             return self.getrepr(space, u'released memory')
         else:
             return self.getrepr(space, u'memory')
@@ -279,17 +274,17 @@
     def descr_hash(self, space):
         if self._hash == -1:
             self._check_released(space)
-            if not self.buf.readonly:
+            if not self.view.readonly:
                 raise oefmt(space.w_ValueError,
                             "cannot hash writable memoryview object")
-            self._hash = compute_hash(self.buf.as_str())
+            self._hash = compute_hash(self.view.as_str())
         return space.newint(self._hash)
 
     def descr_release(self, space):
-        self.buf = None
+        self.view = None
 
     def _check_released(self, space):
-        if self.buf is None:
+        if self.view is None:
             raise oefmt(space.w_ValueError,
                         "operation forbidden on released memoryview object")
 
@@ -298,17 +293,18 @@
         return self
 
     def descr_exit(self, space, __args__):
-        self.buf = None
+        self.view = None
         return space.w_None
 
     def descr_pypy_raw_address(self, space):
         from rpython.rtyper.lltypesystem import lltype, rffi
         try:
-            ptr = self.buf.get_raw_address()
+            ptr = self.view.get_raw_address()
         except ValueError:
-            # report the error using the RPython-level internal repr of self.buf
+            # report the error using the RPython-level internal repr of
+            # self.view
             msg = ("cannot find the underlying address of buffer that "
-                   "is internally %r" % (self.buf,))
+                   "is internally %r" % (self.view,))
             raise OperationError(space.w_ValueError, space.newtext(msg))
         return space.newint(rffi.cast(lltype.Signed, ptr))
 
@@ -343,9 +339,9 @@
 
     def _zero_in_shape(self):
         # this method could be moved to the class BufferView
-        buf = self.buf
-        shape = buf.getshape()
-        for i in range(buf.getndim()):
+        view = self.view
+        shape = view.getshape()
+        for i in range(view.getndim()):
             if shape[i] == 0:
                 return True
         return False
@@ -358,7 +354,7 @@
                         "memoryview: format argument must be a string")
 
         fmt = space.text_w(w_format)
-        buf = self.buf
+        view = self.view
         ndim = 1
 
         if not memory_view_c_contiguous(space, self.flags):
@@ -366,7 +362,7 @@
                         "memoryview: casts are restricted"
                         " to C-contiguous views")
 
-        if (w_shape or buf.getndim() != 1) and self._zero_in_shape():
+        if (w_shape or view.getndim() != 1) and self._zero_in_shape():
             raise oefmt(space.w_TypeError,
                         "memoryview: cannot casts view with"
                         " zeros in shape or strides")
@@ -379,11 +375,11 @@
                 raise oefmt(space.w_ValueError, \
                         "memoryview: number of dimensions must not exceed %d",
                         ndim)
-            if ndim > 1 and buf.getndim() != 1:
+            if ndim > 1 and view.getndim() != 1:
                 raise oefmt(space.w_TypeError,
                             "memoryview: cast must be 1D -> ND or ND -> 1D")
 
-        newview = self._cast_to_1D(space, buf, fmt)
+        newview = self._cast_to_1D(space, view, fmt)
         if w_shape:
             fview = space.fixedview(w_shape)
             shape = [space.int_w(w_obj) for w_obj in fview]
@@ -391,7 +387,6 @@
         return newview.wrap(space)
 
     def _init_flags(self):
-        buf = self.buf
         ndim = self.getndim()
         flags = 0
         if ndim == 0:
@@ -419,21 +414,21 @@
 
         self.flags = flags
 
-    def _cast_to_1D(self, space, buf, fmt):
+    def _cast_to_1D(self, space, view, fmt):
         itemsize = self.get_native_fmtchar(fmt)
         if itemsize < 0:
-            raise oefmt(space.w_ValueError, "memoryview: destination" \
-                    " format must be a native single character format prefixed" \
+            raise oefmt(space.w_ValueError, "memoryview: destination"
+                    " format must be a native single character format prefixed"
                     " with an optional '@'")
 
-        origfmt = buf.getformat()
+        origfmt = view.getformat()
         if self.get_native_fmtchar(origfmt) < 0 or \
            (not is_byte_format(fmt) and not is_byte_format(origfmt)):
             raise oefmt(space.w_TypeError,
-                    "memoryview: cannot cast between" \
+                    "memoryview: cannot cast between"
                     " two non-byte formats")
 
-        if buf.getlength() % itemsize != 0:
+        if view.getlength() % itemsize != 0:
             raise oefmt(space.w_TypeError,
                     "memoryview: length is not a multiple of itemsize")
 
@@ -441,7 +436,7 @@
         if not newfmt:
             raise oefmt(space.w_RuntimeError,
                     "memoryview: internal error")
-        return BufferView1D(buf, newfmt, itemsize)
+        return BufferView1D(view, newfmt, itemsize)
 
     def get_native_fmtstr(self, fmt):
         lenfmt = len(fmt)
@@ -449,7 +444,7 @@
         if lenfmt == 0:
             return None
         elif lenfmt == 1:
-            format = fmt[0] # fine!
+            format = fmt[0]  # fine!
         elif lenfmt == 2:
             if fmt[0] == '@':
                 nat = True
@@ -459,8 +454,8 @@
         else:
             return None
 
-        chars = ['c','b','B','h','H','i','I','l','L','q',
-                 'Q','n','N','f','d','?','P']
+        chars = ['c', 'b', 'B', 'h', 'H', 'i', 'I', 'l', 'L', 'q',
+                 'Q', 'n', 'N', 'f', 'd', '?', 'P']
         for c in unrolling_iterable(chars):
             if c == format:
                 if nat:
@@ -470,16 +465,16 @@
 
         return None
 
-    def _cast_to_ND(self, space, buf, shape, ndim):
-        length = itemsize = buf.getitemsize()
+    def _cast_to_ND(self, space, view, shape, ndim):
+        length = itemsize = view.getitemsize()
         for i in range(ndim):
             length *= shape[i]
-        if length != buf.getlength():
+        if length != view.getlength():
             raise oefmt(space.w_TypeError,
                         "memoryview: product(shape) * itemsize != buffer size")
 
         strides = self._strides_from_shape(shape, itemsize)
-        return BufferViewND(buf, ndim, shape, strides)
+        return BufferViewND(view, ndim, shape, strides)
 
     @staticmethod
     def _strides_from_shape(shape, itemsize):
@@ -497,7 +492,7 @@
     def descr_hex(self, space):
         from pypy.objspace.std.bytearrayobject import _array_to_hexstring
         self._check_released(space)
-        return _array_to_hexstring(space, self.buf.as_binary(), 0, 1, self.getlength())
+        return _array_to_hexstring(space, self.view.as_binary(), 0, 1, self.getlength())
 
 def is_byte_format(char):
     return char == 'b' or char == 'B' or char == 'c'
@@ -580,7 +575,7 @@
     elif (fort == 'F'):
         return _IsFortranContiguous(ndim, shape, strides, itemsize)
     elif (fort == 'A'):
-        return (_IsCContiguous(ndim, shape, strides, itemsize) or \
+        return (_IsCContiguous(ndim, shape, strides, itemsize) or
                 _IsFortranContiguous(ndim, shape, strides, itemsize))
     return 0
 
diff --git a/pypy/objspace/std/strbufobject.py b/pypy/objspace/std/strbufobject.py
--- a/pypy/objspace/std/strbufobject.py
+++ b/pypy/objspace/std/strbufobject.py
@@ -4,7 +4,7 @@
 
 from pypy.objspace.std.bytesobject import W_AbstractBytesObject, W_BytesObject
 from pypy.interpreter.gateway import interp2app, unwrap_spec
-from pypy.interpreter.buffer import SimpleBuffer, StringBuffer
+from pypy.interpreter.buffer import SimpleView, StringBuffer
 from pypy.interpreter.error import OperationError
 from rpython.rlib.rstring import StringBuilder
 
@@ -38,7 +38,7 @@
         return self.force()
 
     def buffer_w(self, space, flags):
-        return SimpleBuffer(StringBuffer(self.force()))
+        return SimpleView(StringBuffer(self.force()))
 
     def descr_len(self, space):
         return space.newint(self.length)

From pypy.commits at gmail.com  Tue Apr 25 13:59:14 2017
From: pypy.commits at gmail.com (rlamy)
Date: Tue, 25 Apr 2017 10:59:14 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: import rpython.rlib.buffer objects
 directly; remove 'BinaryBuffer' alias
Message-ID: <58ff8e72.47a1370a.1c71e.23f8@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91128:462160738ca6
Date: 2017-04-25 18:57 +0100
http://bitbucket.org/pypy/pypy/changeset/462160738ca6/

Log:	import rpython.rlib.buffer objects directly; remove 'BinaryBuffer'
	alias

diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -1,6 +1,5 @@
 from rpython.rlib.rstruct.error import StructError
-from rpython.rlib.buffer import Buffer as BinaryBuffer
-from rpython.rlib.buffer import StringBuffer, ByteBuffer, SubBuffer
+from rpython.rlib.buffer import StringBuffer, SubBuffer
 
 from pypy.interpreter.error import oefmt
 
@@ -42,7 +41,7 @@
         return StringBuffer(self.as_str())
 
     def as_binary_rw(self):
-        """Return a writable BinaryBuffer sharing the same data as `self`."""
+        """Return a writable Buffer sharing the same data as `self`."""
         raise BufferInterfaceNotFound
 
     def getformat(self):
diff --git a/pypy/module/_cffi_backend/cbuffer.py b/pypy/module/_cffi_backend/cbuffer.py
--- a/pypy/module/_cffi_backend/cbuffer.py
+++ b/pypy/module/_cffi_backend/cbuffer.py
@@ -4,14 +4,15 @@
 from pypy.interpreter.typedef import TypeDef, make_weakref_descr
 from pypy.module._cffi_backend import cdataobj, ctypeptr, ctypearray
 from pypy.module._cffi_backend import ctypestruct
+from pypy.interpreter.buffer import SimpleView
 
-from pypy.interpreter.buffer import SimpleView, BinaryBuffer
+from rpython.rlib.buffer import Buffer
 from rpython.rtyper.annlowlevel import llstr
 from rpython.rtyper.lltypesystem import rffi
 from rpython.rtyper.lltypesystem.rstr import copy_string_to_raw
 
 
-class LLBuffer(BinaryBuffer):
+class LLBuffer(Buffer):
     _immutable_ = True
 
     def __init__(self, raw_cdata, size):
@@ -34,7 +35,7 @@
     def getslice(self, start, stop, step, size):
         if step == 1:
             return rffi.charpsize2str(rffi.ptradd(self.raw_cdata, start), size)
-        return BinaryBuffer.getslice(self, start, stop, step, size)
+        return Buffer.getslice(self, start, stop, step, size)
 
     def setslice(self, start, string):
         raw_cdata = rffi.ptradd(self.raw_cdata, start)
diff --git a/pypy/module/_io/interp_bufferedio.py b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -7,7 +7,9 @@
 from pypy.interpreter.typedef import (
     TypeDef, GetSetProperty, generic_new_descr, interp_attrproperty_w)
 from pypy.interpreter.gateway import interp2app, unwrap_spec, WrappedDefault
-from pypy.interpreter.buffer import SimpleView, BinaryBuffer, SubBuffer
+from pypy.interpreter.buffer import SimpleView
+
+from rpython.rlib.buffer import Buffer, SubBuffer
 from rpython.rlib.rgc import (
     nonmoving_raw_ptr_for_resizable_list, resizable_list_supporting_raw_ptr)
 from rpython.rlib.rstring import StringBuilder
@@ -158,7 +160,7 @@
     readinto1 = interp2app(W_BufferedIOBase.readinto1_w),
 )
 
-class RawBuffer(BinaryBuffer):
+class RawBuffer(Buffer):
     _immutable_ = True
 
     def __init__(self, n):
diff --git a/pypy/module/_io/interp_bytesio.py b/pypy/module/_io/interp_bytesio.py
--- a/pypy/module/_io/interp_bytesio.py
+++ b/pypy/module/_io/interp_bytesio.py
@@ -2,7 +2,8 @@
 from pypy.interpreter.typedef import (
     TypeDef, generic_new_descr, GetSetProperty)
 from pypy.interpreter.gateway import interp2app, unwrap_spec
-from pypy.interpreter.buffer import SimpleView, BinaryBuffer
+from pypy.interpreter.buffer import SimpleView
+from rpython.rlib.buffer import Buffer
 from rpython.rlib.rStringIO import RStringIO
 from rpython.rlib.rarithmetic import r_longlong
 from rpython.rlib.objectmodel import import_from_mixin
@@ -11,7 +12,7 @@
 import sys
 
 
-class BytesIOBuffer(BinaryBuffer):
+class BytesIOBuffer(Buffer):
     _immutable_ = True
 
     def __init__(self, w_bytesio):
diff --git a/pypy/module/_rawffi/buffer.py b/pypy/module/_rawffi/buffer.py
--- a/pypy/module/_rawffi/buffer.py
+++ b/pypy/module/_rawffi/buffer.py
@@ -1,11 +1,11 @@
 from rpython.rtyper.lltypesystem import rffi
 
-from pypy.interpreter.buffer import BinaryBuffer
+from rpython.rlib.buffer import Buffer
 
 # XXX not the most efficient implementation
 
 
-class RawFFIBuffer(BinaryBuffer):
+class RawFFIBuffer(Buffer):
     _immutable_ = True
 
     def __init__(self, datainstance):
@@ -15,22 +15,6 @@
     def getlength(self):
         return self.datainstance.getrawsize()
 
-    def getformat(self):
-        return self.datainstance.fmt
-
-    #XXX we keep the default of 1 for now.  I *think* it does not make
-    # sense to give another answer here without also tweaking the
-    # 'shape' and 'strides'.  At least it makes memoryobject.py think the
-    # buffer is not C-contiguous, which is nonsense (e.g. cast() are
-    # refused).  Now, the memoryview we get from a ctypes object is the
-    # one that would correspond to an array of chars of the same
-    # size---which is wrong, because ctypes gives a more complicated
-    # result on CPython (at least 3.5), but at least it corresponds to
-    # the basics.  (For example, CPython 3.5 gives a zero-dimensional
-    # memoryview if the ctypes type is not an array.)
-    #def getitemsize(self):
-    #    return self.datainstance.itemsize
-
     def getitem(self, index):
         ll_buffer = self.datainstance.ll_buffer
         return ll_buffer[index]
diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -5,8 +5,9 @@
 from rpython.rtyper.annlowlevel import llstr
 from rpython.rtyper.lltypesystem import lltype, rffi
 from rpython.rtyper.lltypesystem.rstr import copy_string_to_raw
+from rpython.rlib.buffer import Buffer
 
-from pypy.interpreter.buffer import BufferView, BinaryBuffer
+from pypy.interpreter.buffer import BufferView
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.gateway import (
@@ -845,7 +846,7 @@
     v.typecode = k
 unroll_typecodes = unrolling_iterable(types.keys())
 
-class ArrayData(BinaryBuffer):
+class ArrayData(Buffer):
     _immutable_ = True
     readonly = False
     def __init__(self, w_array):
diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -19,9 +19,11 @@
 from pypy.module.cpyext.memoryobject import fill_Py_buffer
 from pypy.module.cpyext.state import State
 from pypy.module.cpyext import userslot
-from pypy.interpreter.buffer import BufferView, BinaryBuffer
+from pypy.interpreter.buffer import BufferView
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.argument import Arguments
+
+from rpython.rlib.buffer import Buffer
 from rpython.rlib.unroll import unrolling_iterable
 from rpython.rlib.objectmodel import specialize, not_rpython
 from rpython.tool.sourcetools import func_renamer
@@ -425,7 +427,7 @@
 fq = FQ()
 
 
-class CBuffer(BinaryBuffer):
+class CBuffer(Buffer):
     _immutable_ = True
     def __init__(self, view):
         self.view = view
diff --git a/pypy/module/mmap/interp_mmap.py b/pypy/module/mmap/interp_mmap.py
--- a/pypy/module/mmap/interp_mmap.py
+++ b/pypy/module/mmap/interp_mmap.py
@@ -2,7 +2,9 @@
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.typedef import TypeDef, GetSetProperty, make_weakref_descr
 from pypy.interpreter.gateway import interp2app, unwrap_spec, WrappedDefault
-from pypy.interpreter.buffer import BinaryBuffer, SimpleView
+from pypy.interpreter.buffer import SimpleView
+
+from rpython.rlib.buffer import Buffer
 from rpython.rlib import rmmap, rarithmetic, objectmodel
 from rpython.rlib.rmmap import RValueError, RTypeError, RMMapError
 from rpython.rlib.rstring import StringBuilder
@@ -307,7 +309,7 @@
         return OperationError(space.w_SystemError, space.newtext('%s' % e))
 
 
-class MMapBuffer(BinaryBuffer):
+class MMapBuffer(Buffer):
     _immutable_ = True
 
     def __init__(self, space, mmap, readonly):
@@ -327,7 +329,7 @@
         if step == 1:
             return self.mmap.getslice(start, size)
         else:
-            return BinaryBuffer.getslice(self, start, stop, step, size)
+            return Buffer.getslice(self, start, stop, step, size)
 
     def setitem(self, index, char):
         self.check_valid_writeable()
diff --git a/pypy/objspace/std/bytearrayobject.py b/pypy/objspace/std/bytearrayobject.py
--- a/pypy/objspace/std/bytearrayobject.py
+++ b/pypy/objspace/std/bytearrayobject.py
@@ -10,13 +10,14 @@
 from rpython.rlib.rgc import (resizable_list_supporting_raw_ptr,
         nonmoving_raw_ptr_for_resizable_list)
 from rpython.rlib import jit
+from rpython.rlib.buffer import Buffer
 
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.objspace.std.bytesobject import makebytesdata_w, newbytesdata_w
 from pypy.interpreter.gateway import WrappedDefault, interp2app, unwrap_spec
 from pypy.interpreter.typedef import TypeDef
-from pypy.interpreter.buffer import SimpleView, BinaryBuffer
+from pypy.interpreter.buffer import SimpleView
 from pypy.objspace.std.sliceobject import W_SliceObject, unwrap_start_stop
 from pypy.objspace.std.stringmethods import StringMethods, _get_buffer
 from pypy.objspace.std.stringmethods import _descr_getslice_slowpath
@@ -1274,7 +1275,7 @@
         start += step
 
 
-class BytearrayBuffer(BinaryBuffer):
+class BytearrayBuffer(Buffer):
     _immutable_ = True
     readonly = False
 
@@ -1304,7 +1305,7 @@
             if start != 0 or stop != len(data):
                 data = data[start:stop]
             return "".join(data)
-        return BinaryBuffer.getslice(self, start, stop, step, size)
+        return Buffer.getslice(self, start, stop, step, size)
 
     def setslice(self, start, string):
         # No bounds checks.

From pypy.commits at gmail.com  Tue Apr 25 14:49:51 2017
From: pypy.commits at gmail.com (rlamy)
Date: Tue, 25 Apr 2017 11:49:51 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Rename as_binary()/as_binary_rw() to
 as_readbuf()/as_writebuf()
Message-ID: <58ff9a4f.e43aed0a.393ba.796a@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91129:357193a36126
Date: 2017-04-25 19:49 +0100
http://bitbucket.org/pypy/pypy/changeset/357193a36126/

Log:	Rename as_binary()/as_binary_rw() to as_readbuf()/as_writebuf()

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -9,9 +9,9 @@
 from rpython.rlib.signature import signature
 from rpython.rlib.rarithmetic import r_uint, SHRT_MIN, SHRT_MAX, \
     INT_MIN, INT_MAX, UINT_MAX, USHRT_MAX
+from rpython.rlib.buffer import StringBuffer
 
-from pypy.interpreter.buffer import (
-    BufferInterfaceNotFound, StringBuffer)
+from pypy.interpreter.buffer import BufferInterfaceNotFound
 from pypy.interpreter.executioncontext import (ExecutionContext, ActionFlag,
     make_finalizer_queue)
 from pypy.interpreter.error import OperationError, new_exception_class, oefmt
@@ -1475,14 +1475,14 @@
     def readbuf_w(self, w_obj):
         # Old buffer interface, returns a readonly buffer (PyObject_AsReadBuffer)
         try:
-            return w_obj.buffer_w(self, self.BUF_SIMPLE).as_binary()
+            return w_obj.buffer_w(self, self.BUF_SIMPLE).as_readbuf()
         except BufferInterfaceNotFound:
             self._getarg_error("bytes-like object", w_obj)
 
     def writebuf_w(self, w_obj):
         # Old buffer interface, returns a writeable buffer (PyObject_AsWriteBuffer)
         try:
-            return w_obj.buffer_w(self, self.BUF_WRITABLE).as_binary_rw()
+            return w_obj.buffer_w(self, self.BUF_WRITABLE).as_writebuf()
         except (BufferInterfaceNotFound, OperationError):
             self._getarg_error("read-write bytes-like object", w_obj)
 
@@ -1516,7 +1516,7 @@
                 # NB. CPython forbids surrogates here
                 return StringBuffer(w_obj.text_w(self))
             try:
-                return w_obj.buffer_w(self, self.BUF_SIMPLE).as_binary()
+                return w_obj.buffer_w(self, self.BUF_SIMPLE).as_readbuf()
             except BufferInterfaceNotFound:
                 self._getarg_error("bytes or buffer", w_obj)
         elif code == 's#':
diff --git a/pypy/interpreter/buffer.py b/pypy/interpreter/buffer.py
--- a/pypy/interpreter/buffer.py
+++ b/pypy/interpreter/buffer.py
@@ -36,11 +36,11 @@
     def get_raw_address(self):
         raise ValueError("no raw buffer")
 
-    def as_binary(self):
+    def as_readbuf(self):
         # Inefficient. May be overridden.
         return StringBuffer(self.as_str())
 
-    def as_binary_rw(self):
+    def as_writebuf(self):
         """Return a writable Buffer sharing the same data as `self`."""
         raise BufferInterfaceNotFound
 
@@ -209,10 +209,10 @@
     def get_raw_address(self):
         return self.data.get_raw_address()
 
-    def as_binary(self):
+    def as_readbuf(self):
         return self.data
 
-    def as_binary_rw(self):
+    def as_writebuf(self):
         assert not self.data.readonly
         return self.data
 
diff --git a/pypy/module/_cffi_backend/cbuffer.py b/pypy/module/_cffi_backend/cbuffer.py
--- a/pypy/module/_cffi_backend/cbuffer.py
+++ b/pypy/module/_cffi_backend/cbuffer.py
@@ -66,7 +66,7 @@
                                                       self.buffer.getlength())
         if step not in (0, 1):
             raise oefmt(space.w_NotImplementedError, "")
-        value = space.buffer_w(w_newstring, space.BUF_CONTIG_RO).as_binary()
+        value = space.buffer_w(w_newstring, space.BUF_CONTIG_RO).as_readbuf()
         if value.getlength() != size:
             raise oefmt(space.w_ValueError,
                         "cannot modify size of memoryview object")
@@ -80,20 +80,20 @@
         if space.isinstance_w(w_other, space.w_unicode):
             return space.w_NotImplemented
         try:
-            other_pybuf = space.buffer_w(w_other, space.BUF_SIMPLE)
+            other_buf = space.readbuf_w(w_other)
         except OperationError as e:
             if e.async(space):
                 raise
             return space.w_NotImplemented
         my_buf = self.buffer
         my_len = len(my_buf)
-        other_len = other_pybuf.getlength()
+        other_len = len(other_buf)
         if other_len != my_len:
             if mode == 'E':
                 return space.w_False
             if mode == 'N':
                 return space.w_True
-        cmp = _memcmp(my_buf, other_pybuf.as_binary(), min(my_len, other_len))
+        cmp = _memcmp(my_buf, other_buf, min(my_len, other_len))
         if cmp == 0:
             if my_len < other_len:
                 cmp = -1
diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -921,10 +921,10 @@
     def get_raw_address(self):
         return self.data.get_raw_address()
 
-    def as_binary(self):
+    def as_readbuf(self):
         return self.data
 
-    def as_binary_rw(self):
+    def as_writebuf(self):
         assert not self.readonly
         return self.data
 
diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -390,10 +390,10 @@
         for i in range(len(string)):
             self.ptr[start + i] = string[i]
 
-    def as_binary(self):
+    def as_readbuf(self):
         return CBuffer(self)
 
-    def as_binary_rw(self):
+    def as_writebuf(self):
         assert not self.readonly
         return CBuffer(self)
 
diff --git a/pypy/module/cpyext/test/test_memoryobject.py b/pypy/module/cpyext/test/test_memoryobject.py
--- a/pypy/module/cpyext/test/test_memoryobject.py
+++ b/pypy/module/cpyext/test/test_memoryobject.py
@@ -1,9 +1,11 @@
 import pytest
 
 from rpython.rtyper.lltypesystem import rffi
+from rpython.rlib.buffer import StringBuffer
+
 from pypy.module.cpyext.test.test_api import BaseApiTest
 from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
-from pypy.interpreter.buffer import SimpleView, StringBuffer
+from pypy.interpreter.buffer import SimpleView
 from pypy.module.cpyext.pyobject import from_ref
 from pypy.module.cpyext.memoryobject import PyMemoryViewObject
 
diff --git a/pypy/module/struct/interp_struct.py b/pypy/module/struct/interp_struct.py
--- a/pypy/module/struct/interp_struct.py
+++ b/pypy/module/struct/interp_struct.py
@@ -127,7 +127,7 @@
     """Unpack the buffer, containing packed C structure data, according to
 fmt, starting at offset. Requires len(buffer[offset:]) >= calcsize(fmt)."""
     size = _calcsize(space, format)
-    buf = space.buffer_w(w_buffer, space.BUF_SIMPLE).as_binary()
+    buf = space.readbuf_w(w_buffer, space.BUF_SIMPLE)
     if offset < 0:
         offset += buf.getlength()
     if offset < 0 or (buf.getlength() - offset) < size:
@@ -140,7 +140,7 @@
 
 class W_UnpackIter(W_Root):
     def __init__(self, space, w_struct, w_buffer):
-        buf = space.buffer_w(w_buffer, space.BUF_SIMPLE).as_binary()
+        buf = space.readbuf_w(w_buffer, space.BUF_SIMPLE)
         if w_struct.size <= 0:
             raise oefmt(get_error(space),
                 "cannot iteratively unpack with a struct of length %d",
diff --git a/pypy/objspace/std/bytearrayobject.py b/pypy/objspace/std/bytearrayobject.py
--- a/pypy/objspace/std/bytearrayobject.py
+++ b/pypy/objspace/std/bytearrayobject.py
@@ -19,7 +19,7 @@
 from pypy.interpreter.typedef import TypeDef
 from pypy.interpreter.buffer import SimpleView
 from pypy.objspace.std.sliceobject import W_SliceObject, unwrap_start_stop
-from pypy.objspace.std.stringmethods import StringMethods, _get_buffer
+from pypy.objspace.std.stringmethods import StringMethods
 from pypy.objspace.std.stringmethods import _descr_getslice_slowpath
 from pypy.objspace.std.bytesobject import W_BytesObject
 from pypy.objspace.std.util import get_positive_index
@@ -267,7 +267,7 @@
             return space.newbool(self.getdata() == w_other.getdata())
 
         try:
-            buffer = _get_buffer(space, w_other)
+            buffer = space.readbuf_w(w_other)
         except OperationError as e:
             if e.match(space, space.w_TypeError):
                 return space.w_NotImplemented
@@ -287,7 +287,7 @@
             return space.newbool(self.getdata() != w_other.getdata())
 
         try:
-            buffer = _get_buffer(space, w_other)
+            buffer = space.readbuf_w(w_other)
         except OperationError as e:
             if e.match(space, space.w_TypeError):
                 return space.w_NotImplemented
@@ -315,7 +315,7 @@
             cmp = _memcmp(value, other, min(len(value), len(other)))
         else:
             try:
-                buffer = _get_buffer(space, w_other)
+                buffer = space.readbuf_w(w_other)
             except OperationError as e:
                 if e.match(space, space.w_TypeError):
                     return False, 0, 0
@@ -357,7 +357,7 @@
         if isinstance(w_other, W_BytesObject):
             self._inplace_add(self._op_val(space, w_other))
         else:
-            self._inplace_add(_get_buffer(space, w_other))
+            self._inplace_add(space.readbuf_w(w_other))
         return self
 
     @specialize.argtype(1)
@@ -459,7 +459,7 @@
             return self._add(self._op_val(space, w_other))
 
         try:
-            buffer = _get_buffer(space, w_other)
+            buffer = space.readbuf_w(w_other)
         except OperationError as e:
             if e.match(space, space.w_TypeError):
                 return space.w_NotImplemented
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -208,7 +208,7 @@
             dst_strides = self.getstrides()
             dim = 0
             dst = SubBuffer(
-                self.view.as_binary_rw(),
+                self.view.as_writebuf(),
                 start * itemsize, slicelength * itemsize)
             src_stride0 = dst_strides[dim]
 
@@ -492,7 +492,7 @@
     def descr_hex(self, space):
         from pypy.objspace.std.bytearrayobject import _array_to_hexstring
         self._check_released(space)
-        return _array_to_hexstring(space, self.view.as_binary(), 0, 1, self.getlength())
+        return _array_to_hexstring(space, self.view.as_readbuf(), 0, 1, self.getlength())
 
 def is_byte_format(char):
     return char == 'b' or char == 'B' or char == 'c'
@@ -603,11 +603,11 @@
     def get_raw_address(self):
         return self.parent.get_raw_address()
 
-    def as_binary(self):
-        return self.parent.as_binary()
+    def as_readbuf(self):
+        return self.parent.as_readbuf()
 
-    def as_binary_rw(self):
-        return self.parent.as_binary_rw()
+    def as_writebuf(self):
+        return self.parent.as_writebuf()
 
 class BufferView1D(IndirectView):
     _immutable_ = True
diff --git a/pypy/objspace/std/stringmethods.py b/pypy/objspace/std/stringmethods.py
--- a/pypy/objspace/std/stringmethods.py
+++ b/pypy/objspace/std/stringmethods.py
@@ -485,7 +485,7 @@
 
             pos = value.find(sub)
         else:
-            sub = _get_buffer(space, w_sub)
+            sub = space.readbuf_w(w_sub)
             sublen = sub.getlength()
             if sublen == 0:
                 raise oefmt(space.w_ValueError, "empty separator")
@@ -515,7 +515,7 @@
 
             pos = value.rfind(sub)
         else:
-            sub = _get_buffer(space, w_sub)
+            sub = space.readbuf_w(w_sub)
             sublen = sub.getlength()
             if sublen == 0:
                 raise oefmt(space.w_ValueError, "empty separator")
@@ -806,6 +806,3 @@
 @specialize.argtype(0)
 def _descr_getslice_slowpath(selfvalue, start, step, sl):
     return [selfvalue[start + i*step] for i in range(sl)]
-
-def _get_buffer(space, w_obj):
-    return space.buffer_w(w_obj, space.BUF_SIMPLE).as_binary()

From pypy.commits at gmail.com  Tue Apr 25 16:02:13 2017
From: pypy.commits at gmail.com (arigo)
Date: Tue, 25 Apr 2017 13:02:13 -0700 (PDT)
Subject: [pypy-commit] cffi default: hg merge find-vcvars
Message-ID: <58ffab45.0b04c80a.89a4f.7eda@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r2928:78ceec56f4dc
Date: 2017-04-25 22:01 +0200
http://bitbucket.org/cffi/cffi/changeset/78ceec56f4dc/

Log:	hg merge find-vcvars

	Windows fix, for distutils/setuptools, thanks matti

diff --git a/cffi/ffiplatform.py b/cffi/ffiplatform.py
--- a/cffi/ffiplatform.py
+++ b/cffi/ffiplatform.py
@@ -6,6 +6,7 @@
                       'extra_objects', 'depends']
 
 def get_extension(srcfilename, modname, sources=(), **kwds):
+    _hack_at_distutils()
     from distutils.core import Extension
     allsources = [srcfilename]
     for src in sources:
@@ -15,6 +16,7 @@
 def compile(tmpdir, ext, compiler_verbose=0, debug=None):
     """Compile a C extension module using distutils."""
 
+    _hack_at_distutils()
     saved_environ = os.environ.copy()
     try:
         outputfilename = _build(tmpdir, ext, compiler_verbose, debug)
@@ -113,3 +115,13 @@
     f = cStringIO.StringIO()
     _flatten(x, f)
     return f.getvalue()
+
+def _hack_at_distutils():
+    # Windows-only workaround for some configurations: see
+    # https://bugs.python.org/issue23246 (Python 2.7 with 
+    # a specific MS compiler suite download)
+    if sys.platform == "win32":
+        try:
+            import setuptools    # for side-effects, patches distutils
+        except ImportError:
+            pass
diff --git a/cffi/verifier.py b/cffi/verifier.py
--- a/cffi/verifier.py
+++ b/cffi/verifier.py
@@ -26,16 +26,6 @@
                 s = s.encode('ascii')
             super(NativeIO, self).write(s)
 
-def _hack_at_distutils():
-    # Windows-only workaround for some configurations: see
-    # https://bugs.python.org/issue23246 (Python 2.7 with 
-    # a specific MS compiler suite download)
-    if sys.platform == "win32":
-        try:
-            import setuptools    # for side-effects, patches distutils
-        except ImportError:
-            pass
-
 
 class Verifier(object):
 
@@ -126,7 +116,7 @@
         return basename
 
     def get_extension(self):
-        _hack_at_distutils() # backward compatibility hack
+        ffiplatform._hack_at_distutils() # backward compatibility hack
         if not self._has_source:
             with self.ffi._lock:
                 if not self._has_source:

From pypy.commits at gmail.com  Wed Apr 26 12:50:02 2017
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 26 Apr 2017 09:50:02 -0700 (PDT)
Subject: [pypy-commit] pypy controller-refactor: cleanup: use @specialize
 instead of ._annspecialcase_
Message-ID: <5900cfba.4695370a.95717.3707@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: controller-refactor
Changeset: r91131:12f5e62a77b5
Date: 2017-04-26 17:36 +0100
http://bitbucket.org/pypy/pypy/changeset/12f5e62a77b5/

Log:	cleanup: use @specialize instead of ._annspecialcase_

diff --git a/rpython/rtyper/controllerentry.py b/rpython/rtyper/controllerentry.py
--- a/rpython/rtyper/controllerentry.py
+++ b/rpython/rtyper/controllerentry.py
@@ -3,6 +3,7 @@
 from rpython.annotator import model as annmodel
 from rpython.tool.pairtype import pairtype
 from rpython.annotator.bookkeeper import getbookkeeper
+from rpython.rlib.objectmodel import specialize
 from rpython.rtyper.rmodel import Repr
 from rpython.rtyper.extregistry import ExtRegistryEntry
 from rpython.rtyper.annlowlevel import cachedtype
@@ -64,25 +65,25 @@
     def _freeze_(self):
         return True
 
+    @specialize.arg(0)
     def box(self, obj):
         return controlled_instance_box(self, obj)
-    box._annspecialcase_ = 'specialize:arg(0)'
 
+    @specialize.arg(0)
     def unbox(self, obj):
         return controlled_instance_unbox(self, obj)
-    unbox._annspecialcase_ = 'specialize:arg(0)'
 
+    @specialize.arg(0)
     def is_box(self, obj):
         return controlled_instance_is_box(self, obj)
-    is_box._annspecialcase_ = 'specialize:arg(0)'
 
+    @specialize.arg(0, 2)
     def getattr(self, obj, attr):
         return getattr(self, 'get_' + attr)(obj)
-    getattr._annspecialcase_ = 'specialize:arg(0, 2)'
 
+    @specialize.arg(0, 2)
     def setattr(self, obj, attr, value):
         return getattr(self, 'set_' + attr)(obj, value)
-    setattr._annspecialcase_ = 'specialize:arg(0, 2)'
 
 
 def delegate(boundmethod, *args_s):

From pypy.commits at gmail.com  Wed Apr 26 14:36:09 2017
From: pypy.commits at gmail.com (arigo)
Date: Wed, 26 Apr 2017 11:36:09 -0700 (PDT)
Subject: [pypy-commit] pypy.org extradoc: update the values
Message-ID: <5900e899.f024c80a.a0774.05b6@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r882:b443f9383aeb
Date: 2017-04-26 20:36 +0200
http://bitbucket.org/pypy/pypy.org/changeset/b443f9383aeb/

Log:	update the values

diff --git a/don1.html b/don1.html
--- a/don1.html
+++ b/don1.html
@@ -15,7 +15,7 @@
 </script>
 
    <!-- Income:PyPy:Donations:Py3k / 0.95 -->
-   $66798 of $105000 (63.6%)
+   $66820 of $105000 (63.6%)
    <div id="progressbar">
    </div>
 
@@ -23,7 +23,7 @@
   <li>
   <span id="donate_text">This donation goes towards supporting Python 3 in PyPy.
   Current status:
-    we have $2605 left
+    we have $2624 left
   in the account.</br> <a href="py3donate.html">Read proposal</a></span>
   </li>
   <li>

From pypy.commits at gmail.com  Wed Apr 26 15:12:48 2017
From: pypy.commits at gmail.com (tobweber)
Date: Wed, 26 Apr 2017 12:12:48 -0700 (PDT)
Subject: [pypy-commit] stmgc c8-adaptive-trx-length: Merge overheads
 instrumentation
Message-ID: <5900f130.47a1370a.9eee6.0c7c@mx.google.com>

Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-adaptive-trx-length
Changeset: r2043:efebf97ce6b2
Date: 2017-04-26 21:11 +0200
http://bitbucket.org/pypy/stmgc/changeset/efebf97ce6b2/

Log:	Merge overheads instrumentation

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -158,6 +158,9 @@
 {
     /* returns true if we reached a valid state, or false if
        we need to abort now */
+    start_timer();
+    stm_thread_local_t *thread_local_for_logging = STM_SEGMENT->running_thread;
+
     dprintf(("_stm_validate() at cl=%p, rev=%lu\n", STM_PSEGMENT->last_commit_log_entry,
              STM_PSEGMENT->last_commit_log_entry->rev_num));
     /* go from last known entry in commit log to the
@@ -171,6 +174,11 @@
 
     if (STM_PSEGMENT->transaction_state == TS_INEVITABLE) {
         assert(first_cl->next == INEV_RUNNING);
+
+        if (thread_local_for_logging != NULL) {
+            stop_timer_and_publish_for_thread(
+                thread_local_for_logging, STM_DURATION_VALIDATION);
+        }
         return true;
     }
 
@@ -338,6 +346,11 @@
         release_privatization_lock(my_segnum);
     }
 
+    if (thread_local_for_logging != NULL) {
+        stop_timer_and_publish_for_thread(
+            thread_local_for_logging, STM_DURATION_VALIDATION);
+    }
+
     return !needs_abort;
 }
 
@@ -346,6 +359,8 @@
 {
     /* puts all modified_old_objects in a new commit log entry */
 
+    start_timer();
+
     // we don't need the privatization lock, as we are only
     // reading from modified_old_objs and nobody but us can change it
     struct list_s *list = STM_PSEGMENT->modified_old_objects;
@@ -358,6 +373,9 @@
     result->rev_num = -1;       /* invalid */
     result->written_count = count;
     memcpy(result->written, list->items, count * sizeof(struct stm_undo_s));
+
+    stop_timer_and_publish(STM_DURATION_CREATE_CLE);
+
     return result;
 }
 
@@ -400,6 +418,8 @@
 */
 static void _validate_and_attach(struct stm_commit_log_entry_s *new)
 {
+    start_timer();
+
     uintptr_t cle_length = 0;
     struct stm_commit_log_entry_s *old;
 
@@ -412,10 +432,17 @@
     soon_finished_or_inevitable_thread_segment();
 
  retry_from_start:
+    pause_timer();
     if (!_stm_validate()) {
+        continue_timer();
+
         free_cle(new);
-        stm_abort_transaction();
+
+        stop_timer_and_publish(STM_DURATION_VALIDATION);
+
+        stm_abort_transaction(); // leaves method by longjump
     }
+    continue_timer();
 
     if (cle_length != list_count(STM_PSEGMENT->modified_old_objects)) {
         /* something changed the list of modified objs during _stm_validate; or
@@ -475,6 +502,8 @@
         dprintf(("_validate_and_attach(%p) failed, retrying\n", new));
         goto retry_from_start;
     }
+
+    stop_timer_and_publish(STM_DURATION_VALIDATION);
 }
 
 /* This is called to do stm_validate() and then attach INEV_RUNNING to
@@ -495,6 +524,8 @@
 
 static void _validate_and_add_to_commit_log(void)
 {
+    start_timer();
+
     struct stm_commit_log_entry_s *old, *new;
 
     new = _create_commit_log_entry();
@@ -523,8 +554,12 @@
         release_modification_lock_wr(STM_SEGMENT->segment_num);
     }
     else {
+        pause_timer();
         _validate_and_attach(new);
+        continue_timer();
     }
+
+    stop_timer_and_publish(STM_DURATION_VALIDATION);
 }
 
 /* ############# STM ############# */
@@ -817,6 +852,8 @@
 
 static void write_slowpath_common(object_t *obj, bool mark_card)
 {
+    start_timer();
+
     assert(_seems_to_be_running_transaction());
     assert(!_is_in_nursery(obj));
     assert(obj->stm_flags & GCFLAG_WRITE_BARRIER);
@@ -826,6 +863,8 @@
            part again: */
         assert(!(obj->stm_flags & GCFLAG_WB_EXECUTED));
         write_slowpath_overflow_obj(obj, mark_card);
+
+        stop_timer_and_publish(STM_DURATION_WRITE_GC_ONLY);
         return;
     }
 
@@ -893,11 +932,15 @@
     }
 
     DEBUG_EXPECT_SEGFAULT(true);
+
+    stop_timer_and_publish(STM_DURATION_WRITE_SLOWPATH);
 }
 
 
 void _stm_write_slowpath_card(object_t *obj, uintptr_t index)
 {
+    start_timer();
+
     dprintf_test(("write_slowpath_card(%p, %lu)\n",
                   obj, index));
 
@@ -906,9 +949,15 @@
        card marking instead. */
     if (!(obj->stm_flags & GCFLAG_CARDS_SET)) {
         bool mark_card = obj_should_use_cards(STM_SEGMENT->segment_base, obj);
+
+        pause_timer();
         write_slowpath_common(obj, mark_card);
-        if (!mark_card)
+        continue_timer();
+
+        if (!mark_card) {
+            stop_timer_and_publish(STM_DURATION_WRITE_SLOWPATH);
             return;
+        }
     }
 
     assert(obj_should_use_cards(STM_SEGMENT->segment_base, obj));
@@ -955,13 +1004,13 @@
 
     dprintf(("mark %p index %lu, card:%lu with %d\n",
              obj, index, get_index_to_card_index(index), CARD_MARKED));
+
+    stop_timer_and_publish(STM_DURATION_WRITE_SLOWPATH);
 }
 
 __attribute__((flatten))
 void _stm_write_slowpath(object_t *obj) {
-    start_timer()
     write_slowpath_common(obj,  /* mark_card */ false);
-    stop_timer_and_publish(STM_DURATION_WRITE_BARRIER)
 }
 
 
@@ -1021,6 +1070,8 @@
 
 static void _do_start_transaction(stm_thread_local_t *tl)
 {
+    start_timer();
+
     assert(!_stm_in_transaction(tl));
     tl->wait_event_emitted = 0;
 
@@ -1084,6 +1135,8 @@
         reset_transaction_read_version();
     }
 
+    stop_timer_and_publish(STM_DURATION_START_TRX);
+
     stm_validate();
 }
 
@@ -1208,6 +1261,9 @@
 
 static void _core_commit_transaction(bool external)
 {
+    start_timer();
+    stm_thread_local_t *thread_local_for_logging = STM_SEGMENT->running_thread;
+
     exec_local_finalizers();
 
     assert(!_has_mutex());
@@ -1226,11 +1282,17 @@
     assert(STM_SEGMENT->running_thread->wait_event_emitted == 0);
 
     dprintf(("> stm_commit_transaction(external=%d)\n", (int)external));
+
+    pause_timer();
     minor_collection(/*commit=*/ true, external);
+    continue_timer();
+
     if (!external && is_major_collection_requested()) {
         s_mutex_lock();
         if (is_major_collection_requested()) {   /* if still true */
+            pause_timer();
             major_collection_with_mutex();
+            continue_timer();
         }
         s_mutex_unlock();
     }
@@ -1246,7 +1308,10 @@
        stm_validate() at the start of a new transaction is happy even
        if there is an inevitable tx running) */
     bool was_inev = STM_PSEGMENT->transaction_state == TS_INEVITABLE;
+
+    pause_timer();
     _validate_and_add_to_commit_log();
+    continue_timer();
 
     if (external) {
         /* from this point on, unlink the original 'stm_thread_local_t *'
@@ -1295,6 +1360,9 @@
 
     s_mutex_unlock();
 
+    stop_timer_and_publish_for_thread(
+        thread_local_for_logging, STM_DURATION_COMMIT_EXCEPT_GC);
+
     /* between transactions, call finalizers. this will execute
        a transaction itself */
     if (tl != NULL)
diff --git a/c8/stm/gcpage.c b/c8/stm/gcpage.c
--- a/c8/stm/gcpage.c
+++ b/c8/stm/gcpage.c
@@ -747,9 +747,13 @@
     dprintf((" .----- major collection -----------------------\n"));
     assert(_has_mutex());
 
+    stm_thread_local_t *thread_local_for_logging = STM_SEGMENT->running_thread;
+
     /* first, force a minor collection in each of the other segments */
     major_do_validation_and_minor_collections();
 
+    start_timer();
+
     dprintf((" | used before collection: %ld\n",
              (long)pages_ctl.total_allocated));
     dprintf((" | commit log entries before: %ld\n",
@@ -779,9 +783,12 @@
         dprintf((" | used after collection:  %ld\n",
                 (long)pages_ctl.total_allocated));
         dprintf((" `----------------------------------------------\n"));
+
+        stop_timer_and_publish_for_thread(
+            thread_local_for_logging, STM_DURATION_MAJOR_GC_LOG_ONLY);
+
         if (must_abort())
             abort_with_mutex();
-
         return;
 #endif
     }
@@ -836,6 +843,10 @@
        must abort, do it now. The others are in safe-points that will
        abort if they need to. */
     dprintf(("must abort?:%d\n", (int)must_abort()));
+
+    stop_timer_and_publish_for_thread(
+        thread_local_for_logging, STM_DURATION_MAJOR_GC_FULL);
+
     if (must_abort())
         abort_with_mutex();
 }
diff --git a/c8/stm/nursery.c b/c8/stm/nursery.c
--- a/c8/stm/nursery.c
+++ b/c8/stm/nursery.c
@@ -534,6 +534,8 @@
 
 static void _do_minor_collection(bool commit)
 {
+    start_timer();
+
     dprintf(("minor_collection commit=%d\n", (int)commit));
     assert(!STM_SEGMENT->no_safe_point_here);
 
@@ -578,6 +580,8 @@
     throw_away_nursery(get_priv_segment(STM_SEGMENT->segment_num));
 
     assert(MINOR_NOTHING_TO_DO(STM_PSEGMENT));
+
+    stop_timer_and_publish(STM_DURATION_MINOR_GC);
 }
 
 static void minor_collection(bool commit, bool external)
diff --git a/c8/stm/timing.h b/c8/stm/timing.h
--- a/c8/stm/timing.h
+++ b/c8/stm/timing.h
@@ -1,32 +1,48 @@
 #include <time.h>
 
+#define continue_timer() clock_gettime(CLOCK_MONOTONIC_RAW, &start);
+
 /* Use raw monotonic time, i.e., solely based on local hardware (no NTP
    adjustments) as in prof.c to obtain values comparable with total program
    runtime. */
-#define start_timer() struct timespec start;                                 \
-                      clock_gettime(CLOCK_MONOTONIC_RAW, &start);
+#define start_timer() struct timespec start, stop;                             \
+                      struct timespec duration = { .tv_sec = 0, .tv_nsec = 0 };\
+                      uint32_t nanosec_diff, sec_diff;                         \
+                      continue_timer()
 
-#define stop_timer() struct timespec stop;                                   \
-                     clock_gettime(CLOCK_MONOTONIC_RAW, &stop);
+/* Must use start_timer before using this macro. */
+#define get_duration() nanosec_diff = stop.tv_nsec - start.tv_nsec;         \
+                       sec_diff = stop.tv_sec - start.tv_sec;               \
+                       if (stop.tv_nsec < start.tv_nsec) {                  \
+                           nanosec_diff += 1000000000;                      \
+                           sec_diff -= 1;                                   \
+                       }                                                    \
+                       duration.tv_sec += sec_diff;                         \
+                       duration.tv_nsec += nanosec_diff;                    \
+                       if (duration.tv_nsec >= 1000000000) {                \
+                           duration.tv_sec += 1;                            \
+                           duration.tv_nsec -= 1000000000;                  \
+                       }
 
-/* Must use start_timer and stop_timer before using this macro. */
-#define get_duration() struct timespec duration = {                          \
-                           stop.tv_sec - start.tv_sec,                       \
-                           stop.tv_nsec - start.tv_nsec                      \
-                       };
+#define pause_timer() clock_gettime(CLOCK_MONOTONIC_RAW, &stop);            \
+                      get_duration()
 
-#define stm_duration_payload(duration)                                       \
-    stm_timing_event_payload_data_t stm_duration_data =                      \
-        { .duration = &duration };                                           \
-    stm_timing_event_payload_t stm_duration_payload =                        \
+#define stm_duration_payload(duration)                                      \
+    stm_timing_event_payload_data_t stm_duration_data =                     \
+        { .duration = &duration };                                          \
+    stm_timing_event_payload_t stm_duration_payload =                       \
         { STM_EVENT_PAYLOAD_DURATION, stm_duration_data };
 
-#define publish_event(event)                                                 \
-    (timing_enabled() ?                                                      \
-        stmcb_timing_event(STM_SEGMENT->running_thread, event, &stm_duration_payload) : \
+#define publish_event(thread_local, event)                                  \
+    (timing_enabled() ?                                                     \
+        stmcb_timing_event(thread_local, event, &stm_duration_payload) :    \
         (void)0);
 
-#define stop_timer_and_publish(event) stop_timer()                           \
-                                      get_duration()                         \
-                                      stm_duration_payload(duration)         \
-                                      publish_event(event)
+#define stop_timer_and_publish_for_thread(thread_local, event)              \
+    pause_timer()                                                           \
+    stm_duration_payload(duration)                                          \
+    assert(thread_local != NULL);                                           \
+    publish_event(thread_local, event)
+
+#define stop_timer_and_publish(event)                                       \
+    stop_timer_and_publish_for_thread(STM_SEGMENT->running_thread, event)
diff --git a/c8/stmgc.h b/c8/stmgc.h
--- a/c8/stmgc.h
+++ b/c8/stmgc.h
@@ -575,33 +575,41 @@
     STM_GC_MAJOR_DONE,
 
     /* execution duration profiling events */
-    STM_DURATION_WRITE_BARRIER,
+    STM_DURATION_START_TRX,
+    STM_DURATION_WRITE_GC_ONLY,
+    STM_DURATION_WRITE_SLOWPATH,
     STM_DURATION_VALIDATION,
-    STM_DURATION_COMMIT,
+    STM_DURATION_CREATE_CLE,
+    STM_DURATION_COMMIT_EXCEPT_GC,
     STM_DURATION_MINOR_GC,
-    STM_DURATION_MAJOR_GC,
+    STM_DURATION_MAJOR_GC_LOG_ONLY,
+    STM_DURATION_MAJOR_GC_FULL,
 
     _STM_EVENT_N
 };
 
-#define STM_EVENT_NAMES                         \
-    "transaction start",                        \
-    "transaction commit",                       \
-    "transaction abort",                        \
-    "contention write read",                    \
-    "wait free segment",                        \
-    "wait other inevitable",                    \
-    "wait done",                                \
-    "gc minor start",                           \
-    "gc minor done",                            \
-    "gc major start",                           \
-    "gc major done",                            \
-    /* names of duration events */              \
-    "duration of write slowpath",               \
-    "duration of validation",                   \
-    "duration of commit",                       \
-    "duration of minor gc",                     \
-    "duration of major gc"
+#define STM_EVENT_NAMES                             \
+    "transaction start",                            \
+    "transaction commit",                           \
+    "transaction abort",                            \
+    "contention write read",                        \
+    "wait free segment",                            \
+    "wait other inevitable",                        \
+    "wait done",                                    \
+    "gc minor start",                               \
+    "gc minor done",                                \
+    "gc major start",                               \
+    "gc major done",                                \
+    /* names of duration events */                  \
+    "duration of transaction start",                \
+    "duration of gc due to write",                  \
+    "duration of write slowpath",                   \
+    "duration of validation",                       \
+    "duration of commit log entry creation",        \
+    "duration of commit except gc",                 \
+    "duration of minor gc",                         \
+    "duration of major gc doing log clean up only", \
+    "duration of full major gc"
 
 /* The markers pushed in the shadowstack are an odd number followed by a
    regular object pointer. */

From pypy.commits at gmail.com  Wed Apr 26 16:07:39 2017
From: pypy.commits at gmail.com (mattip)
Date: Wed, 26 Apr 2017 13:07:39 -0700 (PDT)
Subject: [pypy-commit] pypy cpyext-obj-stealing: optimize
Message-ID: <5900fe0b.a237ed0a.58bb4.15ff@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-obj-stealing
Changeset: r91132:ffe9ef211159
Date: 2017-04-22 19:45 +0300
http://bitbucket.org/pypy/pypy/changeset/ffe9ef211159/

Log:	optimize

diff --git a/pypy/objspace/std/listobject.py b/pypy/objspace/std/listobject.py
--- a/pypy/objspace/std/listobject.py
+++ b/pypy/objspace/std/listobject.py
@@ -230,8 +230,10 @@
         return list(items)
 
     def switch_to_object_strategy(self):
+        object_strategy = self.space.fromcache(ObjectListStrategy)
+        if self.strategy is object_strategy:
+            return
         list_w = self.getitems()
-        object_strategy = self.space.fromcache(ObjectListStrategy)
         self.strategy = object_strategy
         object_strategy.init_from_list_w(self, list_w)
 

From pypy.commits at gmail.com  Wed Apr 26 16:07:42 2017
From: pypy.commits at gmail.com (mattip)
Date: Wed, 26 Apr 2017 13:07:42 -0700 (PDT)
Subject: [pypy-commit] pypy cpyext-obj-stealing: merge default into branch
Message-ID: <5900fe0e.8736ed0a.ca2d6.166e@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-obj-stealing
Changeset: r91133:6b3b57cdab23
Date: 2017-04-26 06:45 +0300
http://bitbucket.org/pypy/pypy/changeset/6b3b57cdab23/

Log:	merge default into branch

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -49,6 +49,11 @@
 ^rpython/translator/goal/target.+-c$
 ^rpython/translator/goal/.+\.exe$
 ^rpython/translator/goal/.+\.dll$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.guess$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.h$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.log$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.status$
 ^pypy/goal/pypy-translation-snapshot$
 ^pypy/goal/pypy-c
 ^pypy/goal/.+\.exe$
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -28,3 +28,5 @@
 Performance tweaks in the x86 JIT-generated machine code: rarely taken
 blocks are moved off-line.  Also, the temporary register used to contain
 large constants is reused across instructions.
+
+.. branch: vmprof-0.4.4
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -27,7 +27,7 @@
 made it available as the `Microsoft Visual C++ Compiler for Python 2.7`_ (the link
 was checked in Nov 2016). Note that the compiler suite will be installed in
 ``C:\Users\<user name>\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python``.
-Using a current version of ``setuptools`` will be able to find it there. For
+A current version of ``setuptools`` will be able to find it there. For
 Windows 10, you must right-click the download, and under ``Properties`` ->
 ``Compatibility`` mark it as ``Run run this program in comatibility mode for``
 ``Previous version...``. Also, you must download and install the ``.Net Framework 3.5``,
@@ -40,8 +40,9 @@
 Translating PyPy with Visual Studio
 -----------------------------------
 
-We routinely test translation using Visual Studio 2008, Express
-Edition.  Other configurations may work as well.
+We routinely test translation using v9, also known as Visual Studio 2008.
+Our buildbot is still using the Express Edition, not the compiler noted above.
+Other configurations may work as well.
 
 The translation scripts will set up the appropriate environment variables
 for the compiler, so you do not need to run vcvars before translation.
@@ -117,6 +118,9 @@
 -----------------------------------------------------------
 
 Download the versions of all the external packages from
+https://bitbucket.org/pypy/pypy/downloads/local_5.8.zip
+(for post-5.7.1 builds) with sha256 checksum 
+``f1510452293f22e84d6059464e11f4c62ffd0e2ee97a52be9195bec8a70c6dce`` or
 https://bitbucket.org/pypy/pypy/downloads/local_2.4.zip
 (for 2.4 release and later) or
 https://bitbucket.org/pypy/pypy/downloads/local.zip
@@ -173,13 +177,14 @@
 The zlib compression library
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Download http://www.gzip.org/zlib/zlib-1.2.3.tar.gz and extract it in
-the base directory.  Then compile as a static library::
+Download http://www.gzip.org/zlib/zlib-1.2.11.tar.gz and extract it in
+the base directory.  Then compile::
 
-    cd zlib-1.2.3
+    cd zlib-1.2.11
     nmake -f win32\Makefile.msc
     copy zlib.lib <somewhere in LIB>
     copy zlib.h zconf.h <somewhere in INCLUDE>
+    copy zlib1.dll <in PATH> # (needed for tests via ll2ctypes)
 
 
 The bz2 compression library
@@ -198,22 +203,23 @@
 
 PyPy uses cffi to interact with sqlite3.dll. Only the dll is needed, the cffi
 wrapper is compiled when the module is imported for the first time.
-The sqlite3.dll should be version 3.6.21 for CPython2.7 compatablility.
+The sqlite3.dll should be version 3.8.11 for CPython2.7 compatablility.
 
 
 The expat XML parser
 ~~~~~~~~~~~~~~~~~~~~
 
 Download the source code of expat on sourceforge:
-http://sourceforge.net/projects/expat/ and extract it in the base directory.
-Version 2.1.0 is known to pass tests. Then open the project file ``expat.dsw``
+https://github.com/libexpat/libexpat/releases and extract it in the base directory.
+Version 2.1.1 is known to pass tests. Then open the project file ``expat.dsw``
 with Visual Studio; follow the instruction for converting the project files,
 switch to the "Release" configuration, use the ``expat_static`` project,
-reconfigure the runtime for Multi-threaded DLL (/MD) and build.
+reconfigure the runtime for Multi-threaded DLL (/MD) and build. Do the same for
+the ``expat`` project to build the ``expat.dll`` (for tests via ll2ctypes)
 
-Then, copy the file ``win32\bin\release\libexpat.lib`` somewhere in somewhere
-in LIB, and both ``lib\expat.h`` and ``lib\expat_external.h`` somewhere in
-INCLUDE.
+Then, copy the file ``win32\bin\release\libexpat.lib`` into
+LIB, and both ``lib\expat.h`` and ``lib\expat_external.h`` in
+INCLUDE, and ``win32\bin\release\libexpat.dll`` into PATH.
 
 
 The OpenSSL library
@@ -222,15 +228,13 @@
 OpenSSL needs a Perl interpreter to configure its makefile.  You may
 use the one distributed by ActiveState, or the one from cygwin.::
 
-    svn export http://svn.python.org/projects/external/openssl-1.0.1i
-    cd openssl-1.0.1i
+    svn export http://svn.python.org/projects/external/openssl-1.0.2k
+    cd openssl-1.0.2k
     perl Configure VC-WIN32 no-idea no-mdc2
     ms\do_ms.bat
     nmake -f ms\nt.mak install
-
-Then, copy the files ``out32\*.lib`` somewhere in
-somewhere in LIB, and the entire ``include\openssl`` directory as-is somewhere
-in INCLUDE.
+    copy out32\*.lib <somewhere in LIB>
+    xcopy /S include\openssl <somewhere in INCLUDE>
 
 
 TkInter module support
@@ -263,6 +267,9 @@
 http://tukaani.org/xz/xz-5.0.5-windows.zip, check the signature
 http://tukaani.org/xz/xz-5.0.5-windows.zip.sig
 
+Then copy the headers to the include directory, rename ``liblzma.a`` to 
+``lzma.lib`` and copy it to the lib directory
+
 
 Using the mingw compiler
 ------------------------
diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -307,6 +307,9 @@
             config.translation.jit = True
 
         if config.translation.sandbox:
+            assert 0, ("--sandbox is not tested nor maintained.  If you "
+                       "really want to try it anyway, remove this line in "
+                       "pypy/goal/targetpypystandalone.py.")
             config.objspace.lonepycfiles = False
 
         if config.objspace.usemodules.cpyext:
diff --git a/pypy/module/__builtin__/app_functional.py b/pypy/module/__builtin__/app_functional.py
--- a/pypy/module/__builtin__/app_functional.py
+++ b/pypy/module/__builtin__/app_functional.py
@@ -2,7 +2,6 @@
 Plain Python definition of the builtin functions oriented towards
 functional programming.
 """
-from __future__ import with_statement
 import operator
 from __pypy__ import resizelist_hint, newlist_hint
 from __pypy__ import specialized_zip_2_lists
diff --git a/pypy/module/_collections/interp_deque.py b/pypy/module/_collections/interp_deque.py
--- a/pypy/module/_collections/interp_deque.py
+++ b/pypy/module/_collections/interp_deque.py
@@ -311,11 +311,7 @@
 
     def repr(self):
         space = self.space
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return dequerepr(space, w_currently_in_repr, self)
+        return dequerepr(space, space.get_objects_in_repr(), self)
 
     @specialize.arg(2)
     def compare(self, w_other, op):
@@ -428,16 +424,15 @@
 app = gateway.applevel("""
     def dequerepr(currently_in_repr, d):
         'The app-level part of repr().'
-        deque_id = id(d)
-        if deque_id in currently_in_repr:
+        if d in currently_in_repr:
             listrepr = '[...]'
         else:
-            currently_in_repr[deque_id] = 1
+            currently_in_repr[d] = 1
             try:
                 listrepr = "[" + ", ".join([repr(x) for x in d]) + ']'
             finally:
                 try:
-                    del currently_in_repr[deque_id]
+                    del currently_in_repr[d]
                 except:
                     pass
         if d.maxlen is None:
diff --git a/pypy/module/_vmprof/__init__.py b/pypy/module/_vmprof/__init__.py
--- a/pypy/module/_vmprof/__init__.py
+++ b/pypy/module/_vmprof/__init__.py
@@ -12,6 +12,8 @@
         'enable': 'interp_vmprof.enable',
         'disable': 'interp_vmprof.disable',
         'write_all_code_objects': 'interp_vmprof.write_all_code_objects',
+        'is_enabled': 'interp_vmprof.is_enabled',
+        'get_profile_path': 'interp_vmprof.get_profile_path',
         'VMProfError': 'space.fromcache(interp_vmprof.Cache).w_VMProfError',
     }
 
diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -4,6 +4,7 @@
 from pypy.interpreter.pycode import PyCode
 from pypy.interpreter.baseobjspace import W_Root
 from rpython.rlib import rvmprof, jit
+from pypy.interpreter.error import oefmt
 
 # ____________________________________________________________
 
@@ -82,3 +83,16 @@
         rvmprof.disable()
     except rvmprof.VMProfError as e:
         raise VMProfError(space, e)
+
+def is_enabled(space):
+    return space.newbool(rvmprof.is_enabled())
+
+def get_profile_path(space):
+    path = rvmprof.get_profile_path(space)
+    if path is None:
+        # profiling is not enabled
+        return space.w_None
+    if path == "":
+        # Indicates an error! Assume platform does not implement the function call
+        raise oefmt(space.w_NotImplementedError, "platform not implemented")
+    return space.newtext(path)
diff --git a/pypy/module/_vmprof/test/test__vmprof.py b/pypy/module/_vmprof/test/test__vmprof.py
--- a/pypy/module/_vmprof/test/test__vmprof.py
+++ b/pypy/module/_vmprof/test/test__vmprof.py
@@ -94,3 +94,24 @@
         raises(_vmprof.VMProfError, _vmprof.enable, 2, 1e300 * 1e300, 0, 0, 0)
         NaN = (1e300*1e300) / (1e300*1e300)
         raises(_vmprof.VMProfError, _vmprof.enable, 2, NaN, 0, 0, 0)
+
+    def test_is_enabled(self):
+        import _vmprof
+        tmpfile = open(self.tmpfilename, 'wb')
+        assert _vmprof.is_enabled() is False
+        _vmprof.enable(tmpfile.fileno(), 0.01, 0, 0, 0)
+        assert _vmprof.is_enabled() is True
+        _vmprof.disable()
+        assert _vmprof.is_enabled() is False
+
+    def test_get_profile_path(self):
+        import _vmprof
+        tmpfile = open(self.tmpfilename, 'wb')
+        assert _vmprof.get_profile_path() is None
+        _vmprof.enable(tmpfile.fileno(), 0.01, 0, 0, 0)
+        path = _vmprof.get_profile_path()
+        if path != tmpfile.name:
+            with open(path, "rb") as fd1:
+                assert fd1.read() == tmpfile.read()
+        _vmprof.disable()
+        assert _vmprof.get_profile_path() is None
diff --git a/pypy/module/cpyext/test/issue2482.c b/pypy/module/cpyext/test/issue2482.c
new file mode 100644
--- /dev/null
+++ b/pypy/module/cpyext/test/issue2482.c
@@ -0,0 +1,107 @@
+
+#include "Python.h"
+//#define ISSUE_2482
+
+typedef struct {
+    PyObject_HEAD
+    // Some extra storage:
+    char blank[500];
+} instance;
+
+static PyObject * get_basicsize(PyObject *self, PyObject * arg)
+{
+    return PyLong_FromLong(((PyTypeObject*)arg)->tp_basicsize);
+}
+
+const char *name = "issue2482_object";
+static
+PyObject *make_object_base_type(void) {
+
+    PyHeapTypeObject *heap_type = (PyHeapTypeObject *) PyType_Type.tp_alloc(&PyType_Type, 0);
+    if (!heap_type) return NULL;
+
+    PyTypeObject *type = &heap_type->ht_type;
+    type->tp_name = name;
+#ifdef ISSUE_2482
+    type->tp_base = &PyBaseObject_Type; /*fails */
+#else 
+    type->tp_base = &PyType_Type;
+#endif
+    type->tp_basicsize = sizeof(instance);
+    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
+
+    if (PyType_Ready(type) < 0)
+        return NULL;
+
+    return (PyObject *) heap_type;
+};
+
+static PyMethodDef issue2482_functions[] = {
+    {"get_basicsize", (PyCFunction)get_basicsize, METH_O, NULL},
+    {NULL,        NULL}    /* Sentinel */
+};
+
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef moduledef = {
+    PyModuleDef_HEAD_INIT,
+    "issue2482",
+    "Module Doc",
+    -1,
+    issue2482_functions, 
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+};
+#define INITERROR return NULL
+
+/* Initialize this module. */
+#ifdef __GNUC__
+extern __attribute__((visibility("default")))
+#else
+extern __declspec(dllexport)
+#endif
+
+PyMODINIT_FUNC
+PyInit_issue2482(void)
+
+#else
+
+#define INITERROR return
+
+/* Initialize this module. */
+#ifdef __GNUC__
+extern __attribute__((visibility("default")))
+#else
+extern __declspec(dllexport)
+#endif
+
+PyMODINIT_FUNC
+initissue2482(void)
+#endif
+{
+#if PY_MAJOR_VERSION >= 3
+    PyObject *module = PyModule_Create(&moduledef);
+#else
+    PyObject *module = Py_InitModule("issue2482", issue2482_functions);
+#endif
+    if (module == NULL)
+        INITERROR;
+
+    PyHeapTypeObject *heap_type = (PyHeapTypeObject *) PyType_Type.tp_alloc(&PyType_Type, 0);
+    if (!heap_type) INITERROR;
+
+    PyTypeObject *type = &heap_type->ht_type;
+    type->tp_name = name;
+
+    PyObject *base = make_object_base_type();
+    if (! base) INITERROR;
+    Py_INCREF(base);
+    type->tp_base = (PyTypeObject *) base;
+    type->tp_basicsize = ((PyTypeObject *) base)->tp_basicsize;
+    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE | Py_TPFLAGS_CHECKTYPES;
+
+    if (PyType_Ready(type) < 0) INITERROR;
+
+    PyModule_AddObject(module, name, (PyObject *) type);
+};
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -1256,3 +1256,27 @@
         # doesn't call tp_getattr at all, also on CPython
         raises(AttributeError, type(module.gettype1).__getattribute__,
                                module.gettype1, 'dcBA')
+
+    def test_multiple_inheritance_tp_basicsize(self):
+        module = self.import_module(name='issue2482')
+
+        class PyBase(object):
+            pass
+
+        basesize = module.get_basicsize(PyBase)
+
+        CBase = module.issue2482_object
+        class A(CBase, PyBase):
+            def __init__(self, i):
+                CBase.__init__(self)
+                PyBase.__init__(self)
+
+        class B(PyBase, CBase):
+            def __init__(self, i):
+                PyBase.__init__(self)
+                CBase.__init__(self)
+
+        Asize = module.get_basicsize(A)
+        Bsize = module.get_basicsize(B)
+        assert Asize == Bsize
+        assert Asize > basesize
diff --git a/pypy/module/test_lib_pypy/test_md5_extra.py b/pypy/module/test_lib_pypy/test_md5_extra.py
--- a/pypy/module/test_lib_pypy/test_md5_extra.py
+++ b/pypy/module/test_lib_pypy/test_md5_extra.py
@@ -68,9 +68,7 @@
         w_m2c = space.call_method(w_m2, 'copy')
 
         # Update and compare...
-        for i in range(len(cases)):
-            message = cases[i][0]
-
+        for message in cases:
             m1c.update(message)
             d1 = m1c.hexdigest()
 
@@ -147,13 +145,10 @@
              "57edf4a22be3c955ac49da2e2107b67a"),
             )
 
-        for i in range(len(cases)):
-            res = self.compare(cases[i][0])
+        for message, expectedResult in cases:
+            res = self.compare(message)
             if res is not None:
                 d1, d2 = res
-                message, expectedResult = cases[i][0], None
-                if len(cases[i]) == 2:
-                    expectedResult = cases[i][1]
                 self.print_diff(message, d1, d2, expectedResult)
             assert res is None
 
@@ -182,27 +177,25 @@
             "123456789 123456789 123456789 12345678",
             )
 
-        for i in range(len(cases)):
-            res = self.compare(cases[i][0])
+        for message in cases:
+            res = self.compare(message)
             if res is not None:
                 d1, d2 = res
-                message = cases[i][0]
                 self.print_diff(message, d1, d2)
             assert res is None
 
     def test3(self):
         """Test cases with long messages (can take a while)."""
         cases = (
-            (2**10*'a',),
-            (2**10*'abcd',),
-            #(2**20*'a',),  # 1 MB, takes about 160 sec. on a 233 Mhz Pentium.
+            2**10*'a',
+            2**10*'abcd',
+            #2**20*'a',  # 1 MB, takes about 160 sec. on a 233 Mhz Pentium.
             )
 
-        for i in range(len(cases)):
-            res = self.compare(cases[i][0])
+        for message in cases:
+            res = self.compare(message)
             if res is not None:
                 d1, d2 = res
-                message = cases[i][0]
                 self.print_diff(message, d1, d2)
             assert res is None
 
diff --git a/pypy/objspace/std/dictmultiobject.py b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -139,11 +139,7 @@
         init_or_update(space, self, __args__, 'dict')
 
     def descr_repr(self, space):
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return dictrepr(space, w_currently_in_repr, self)
+        return dictrepr(space, space.get_objects_in_repr(), self)
 
     def descr_eq(self, space, w_other):
         if space.is_w(self, w_other):
@@ -468,10 +464,9 @@
     def dictrepr(currently_in_repr, d):
         if len(d) == 0:
             return "{}"
-        dict_id = id(d)
-        if dict_id in currently_in_repr:
+        if d in currently_in_repr:
             return '{...}'
-        currently_in_repr[dict_id] = 1
+        currently_in_repr[d] = 1
         try:
             items = []
             # XXX for now, we cannot use iteritems() at app-level because
@@ -482,7 +477,7 @@
             return "{" +  ', '.join(items) + "}"
         finally:
             try:
-                del currently_in_repr[dict_id]
+                del currently_in_repr[d]
             except:
                 pass
 ''', filename=__file__)
diff --git a/pypy/objspace/std/listobject.py b/pypy/objspace/std/listobject.py
--- a/pypy/objspace/std/listobject.py
+++ b/pypy/objspace/std/listobject.py
@@ -442,11 +442,7 @@
     def descr_repr(self, space):
         if self.length() == 0:
             return space.newtext('[]')
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return listrepr(space, w_currently_in_repr, self)
+        return listrepr(space, space.get_objects_in_repr(), self)
 
     def descr_eq(self, space, w_other):
         if not isinstance(w_other, W_ListObject):
@@ -2038,15 +2034,14 @@
 app = applevel("""
     def listrepr(currently_in_repr, l):
         'The app-level part of repr().'
-        list_id = id(l)
-        if list_id in currently_in_repr:
+        if l in currently_in_repr:
             return '[...]'
-        currently_in_repr[list_id] = 1
+        currently_in_repr[l] = 1
         try:
             return "[" + ", ".join([repr(x) for x in l]) + ']'
         finally:
             try:
-                del currently_in_repr[list_id]
+                del currently_in_repr[l]
             except:
                 pass
 """, filename=__file__)
diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objspace/std/objspace.py
@@ -127,6 +127,14 @@
         ec._py_repr = None
         return ec
 
+    def get_objects_in_repr(self):
+        from pypy.module.__pypy__.interp_identitydict import W_IdentityDict
+        ec = self.getexecutioncontext()
+        w_currently_in_repr = ec._py_repr
+        if w_currently_in_repr is None:
+            w_currently_in_repr = ec._py_repr = W_IdentityDict(self)
+        return w_currently_in_repr
+
     def gettypefor(self, cls):
         return self.gettypeobject(cls.typedef)
 
diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py
--- a/pypy/objspace/std/setobject.py
+++ b/pypy/objspace/std/setobject.py
@@ -165,11 +165,7 @@
         _initialize_set(space, self, w_iterable)
 
     def descr_repr(self, space):
-        ec = space.getexecutioncontext()
-        w_currently_in_repr = ec._py_repr
-        if w_currently_in_repr is None:
-            w_currently_in_repr = ec._py_repr = space.newdict()
-        return setrepr(space, w_currently_in_repr, self)
+        return setrepr(space, space.get_objects_in_repr(), self)
 
     def descr_cmp(self, space, w_other):
         if space.is_w(space.type(self), space.type(w_other)):
@@ -1706,15 +1702,14 @@
 app = gateway.applevel("""
     def setrepr(currently_in_repr, s):
         'The app-level part of repr().'
-        set_id = id(s)
-        if set_id in currently_in_repr:
+        if s in currently_in_repr:
             return '%s(...)' % (s.__class__.__name__,)
-        currently_in_repr[set_id] = 1
+        currently_in_repr[s] = 1
         try:
             return '%s(%s)' % (s.__class__.__name__, [x for x in s])
         finally:
             try:
-                del currently_in_repr[set_id]
+                del currently_in_repr[s]
             except:
                 pass
 """, filename=__file__)
diff --git a/rpython/memory/gctransform/shadowstack.py b/rpython/memory/gctransform/shadowstack.py
--- a/rpython/memory/gctransform/shadowstack.py
+++ b/rpython/memory/gctransform/shadowstack.py
@@ -75,6 +75,7 @@
         BaseRootWalker.__init__(self, gctransformer)
         # NB. 'self' is frozen, but we can use self.gcdata to store state
         gcdata = self.gcdata
+        gcdata.can_look_at_partial_stack = True
 
         def incr_stack(n):
             top = gcdata.root_stack_top
@@ -109,7 +110,19 @@
         BaseRootWalker.setup_root_walker(self)
 
     def walk_stack_roots(self, collect_stack_root, is_minor=False):
+        # Note that if we're the first minor collection after a thread
+        # switch, then we also need to disable the 'is_minor'
+        # optimization.  The reason is subtle: we need to walk the whole
+        # stack because otherwise, we can be in the middle of an
+        # incremental major collection, and the new stack was just moved
+        # off a ShadowStackRef object (gctransform/shadowstack.py) which
+        # was not seen yet.  We might completely miss some old objects
+        # from the parts of that stack that are skipped by this is_minor
+        # optimization.
         gcdata = self.gcdata
+        if is_minor and not gcdata.can_look_at_partial_stack:
+            is_minor = False
+            gcdata.can_look_at_partial_stack = True
         walk_stack_root(self.invoke_collect_stack_root, collect_stack_root,
                         None, gcdata.root_stack_base, gcdata.root_stack_top,
                         is_minor=is_minor)
@@ -298,6 +311,7 @@
                   "restore_state_from: broken shadowstack")
         self.gcdata.root_stack_base = shadowstackref.base
         self.gcdata.root_stack_top  = shadowstackref.top
+        self.gcdata.can_look_at_partial_stack = False
         self._cleanup(shadowstackref)
 
     def start_fresh_new_state(self):
diff --git a/rpython/rlib/rvmprof/__init__.py b/rpython/rlib/rvmprof/__init__.py
--- a/rpython/rlib/rvmprof/__init__.py
+++ b/rpython/rlib/rvmprof/__init__.py
@@ -3,6 +3,7 @@
 from rpython.rlib.rvmprof.rvmprof import vmprof_execute_code, MAX_FUNC_NAME
 from rpython.rlib.rvmprof.rvmprof import _was_registered
 from rpython.rlib.rvmprof.cintf import VMProfPlatformUnsupported
+from rpython.rtyper.lltypesystem import rffi
 
 #
 # See README.txt.
@@ -37,3 +38,21 @@
 
 def disable():
     _get_vmprof().disable()
+
+def is_enabled():
+    vmp = _get_vmprof()
+    return vmp.is_enabled
+
+def get_profile_path(space):
+    vmp = _get_vmprof()
+    if not vmp.is_enabled:
+        return None
+
+    with rffi.scoped_alloc_buffer(4096) as buf:
+        length = vmp.cintf.vmprof_get_profile_path(buf.raw, buf.size) 
+        if length == -1:
+            return ""
+        return buf.str(length)
+
+    return None
+
diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -107,6 +107,10 @@
                                   lltype.Signed, compilation_info=eci,
                                   _nowrapper=True)
 
+    vmprof_get_profile_path = rffi.llexternal("vmprof_get_profile_path", [rffi.CCHARP, lltype.Signed],
+                                              lltype.Signed, compilation_info=eci,
+                                              _nowrapper=True)
+
     return CInterface(locals())
 
 
diff --git a/rpython/rlib/rvmprof/rvmprof.py b/rpython/rlib/rvmprof/rvmprof.py
--- a/rpython/rlib/rvmprof/rvmprof.py
+++ b/rpython/rlib/rvmprof/rvmprof.py
@@ -178,23 +178,6 @@
     arguments given to the decorated function.
 
     'result_class' is ignored (backward compatibility).
-
-    ====================================
-    TRANSLATION NOTE CALL THIS ONLY ONCE
-    ====================================
-
-    This function can only be called once during translation.
-    It generates a C function called __vmprof_eval_vmprof which is used by
-    the vmprof C source code and is bound as an extern function.
-    This is necessary while walking the native stack.
-    If you see __vmprof_eval_vmprof defined twice during
-    translation, read on:
-
-    To remove this restriction do the following:
-
-    *) Extend the macro IS_VMPROF_EVAL in the vmprof source repo to check several
-       sybmols.
-    *) Give each function provided to this decorator a unique symbol name in C
     """
     if _hack_update_stack_untranslated:
         from rpython.rtyper.annlowlevel import llhelper
diff --git a/rpython/rlib/rvmprof/src/rvmprof.c b/rpython/rlib/rvmprof/src/rvmprof.c
--- a/rpython/rlib/rvmprof/src/rvmprof.c
+++ b/rpython/rlib/rvmprof/src/rvmprof.c
@@ -29,3 +29,9 @@
     return ptr == __vmprof_eval_vmprof;
 }
 #endif
+
+
+long vmprof_get_profile_path(const char * buffer, long size)
+{
+    return vmp_fd_to_path(vmp_profile_fileno(), buffer, size);
+}
diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -35,6 +35,7 @@
 RPY_EXTERN long vmprof_stack_pop(void*);
 RPY_EXTERN void vmprof_stack_free(void*);
 RPY_EXTERN intptr_t vmprof_get_traceback(void *, void *, intptr_t*, intptr_t);
+RPY_EXTERN long vmprof_get_profile_path(const char *, long);
 
 long vmprof_write_header_for_jit_addr(intptr_t *result, long n,
                                       intptr_t addr, int max_depth);
diff --git a/rpython/rlib/rvmprof/src/shared/_vmprof.c b/rpython/rlib/rvmprof/src/shared/_vmprof.c
--- a/rpython/rlib/rvmprof/src/shared/_vmprof.c
+++ b/rpython/rlib/rvmprof/src/shared/_vmprof.c
@@ -1,8 +1,7 @@
-/*[clinic input]
-module _vmprof
-[clinic start generated code]*/
-/*[clinic end generated code: output=da39a3ee5e6b4b0d input=b443489e38f2be7d]*/
-
+/**
+ * This file is the CPython module _vmprof. It does not share code
+ * with PyPy. PyPy's _vmprof module is included in the main repo.
+ */
 #define _GNU_SOURCE 1
 
 #include <Python.h>
@@ -14,7 +13,7 @@
 static volatile int is_enabled = 0;
 static destructor Original_code_dealloc = 0;
 static PyObject* (*_default_eval_loop)(PyFrameObject *, int) = 0;
-void dump_native_symbols(int fileno);
+void vmp_scan_profile(int fileno, int dump_native, void *all_code_uids);
 
 #if VMPROF_UNIX
 #include "trampoline.h"
@@ -109,6 +108,33 @@
     return 0;
 }
 
+static int _look_for_code_object_seen(PyObject *o, void *all_codes)
+{
+    if (PyCode_Check(o) && PySet_GET_SIZE(all_codes)) {
+        Py_ssize_t i;
+        PyCodeObject *co = (PyCodeObject *)o;
+        PyObject *uid_co = PyLong_FromVoidPtr((void*)CODE_ADDR_TO_UID(co));
+        int check = PySet_Discard(all_codes, uid_co);
+
+        Py_CLEAR(uid_co);
+
+        if (check < 0)
+            return -1;
+
+        if (check && emit_code_object(co) < 0)
+            return -1;
+
+        i = PyTuple_Size(co->co_consts);
+        while (i > 0) {
+            --i;
+            if (_look_for_code_object(PyTuple_GET_ITEM(co->co_consts, i),
+                                      all_codes) < 0)
+                return -1;
+        }
+    }
+    return 0;
+}
+
 static void emit_all_code_objects(void)
 {
     PyObject *gc_module = NULL, *lst = NULL, *all_codes = NULL;
@@ -118,6 +144,48 @@
     if (gc_module == NULL)
         goto error;
 
+    // lst contains all objects that are known by the gc
+    lst = PyObject_CallMethod(gc_module, "get_objects", "");
+    if (lst == NULL || !PyList_Check(lst))
+        goto error;
+
+    // the set only includes the code objects found in the profile
+    all_codes = PySet_New(NULL);
+    if (all_codes == NULL)
+        goto error;
+
+    size = PyList_GET_SIZE(lst);
+    for (i = 0; i < size; i++) {
+        PyObject *o = PyList_GET_ITEM(lst, i);
+        if (o->ob_type->tp_traverse &&
+            o->ob_type->tp_traverse(o, _look_for_code_object, (void *)all_codes)
+                < 0)
+            goto error;
+    }
+
+ error:
+    Py_XDECREF(all_codes);
+    Py_XDECREF(lst);
+    Py_XDECREF(gc_module);
+}
+
+static int add_code_addr(void *all_code_uids, void *addr)
+{
+    PyObject *co_uid = PyLong_FromVoidPtr(addr);
+    int check = PySet_Add((PyObject*) all_code_uids, co_uid);
+    Py_CLEAR(co_uid);
+    return check;
+}
+
+static void emit_all_code_objects_seen(int fileno)
+{
+    PyObject *gc_module = NULL, *lst = NULL, *all_codes = NULL;
+    Py_ssize_t i, size;
+
+    gc_module = PyImport_ImportModuleNoBlock("gc");
+    if (gc_module == NULL)
+        goto error;
+
     lst = PyObject_CallMethod(gc_module, "get_objects", "");
     if (lst == NULL || !PyList_Check(lst))
         goto error;
@@ -126,16 +194,21 @@
     if (all_codes == NULL)
         goto error;
 
+    // fill up all_codes with every code object found in the profile
+    vmp_scan_profile(fileno, 0, all_codes);
+
+    // intersect the list with the set and dump only the code objects
+    // found in the set!
     size = PyList_GET_SIZE(lst);
     for (i = 0; i < size; i++) {
         PyObject *o = PyList_GET_ITEM(lst, i);
         if (o->ob_type->tp_traverse &&
-            o->ob_type->tp_traverse(o, _look_for_code_object, (void *)all_codes)
-                < 0)
+                o->ob_type->tp_traverse(o, _look_for_code_object_seen, (void *) all_codes)
+            < 0)
             goto error;
     }
 
- error:
+    error:
     Py_XDECREF(all_codes);
     Py_XDECREF(lst);
     Py_XDECREF(gc_module);
@@ -162,8 +235,16 @@
     if (!PyArg_ParseTuple(args, "id|iii", &fd, &interval, &memory, &lines, &native)) {
         return NULL;
     }
-    assert(fd >= 0 && "file descripter provided to vmprof must not" \
-                      " be less then zero.");
+
+    if (write(fd, NULL, 0) != 0) {
+        PyErr_SetString(PyExc_ValueError, "file descriptor must be writeable");
+        return NULL;
+    }
+
+    if ((read(fd, NULL, 0) != 0) && (native != 0)) {
+        PyErr_SetString(PyExc_ValueError, "file descriptor must be readable for native profiling");
+        return NULL;
+    }
 
     if (is_enabled) {
         PyErr_SetString(PyExc_ValueError, "vmprof is already enabled");
@@ -194,16 +275,53 @@
     return Py_None;
 }
 
+static PyObject * vmp_is_enabled(PyObject *module, PyObject *noargs) {
+    if (is_enabled) {
+        Py_RETURN_TRUE;
+    }
+    Py_RETURN_FALSE;
+}
+
 static PyObject *
-disable_vmprof(PyObject *module, PyObject *noarg)
+disable_vmprof(PyObject *module, PyObject *args)
 {
+    int fd = vmp_profile_fileno();
+    int only_needed = 0;
+
+    if (!PyArg_ParseTuple(args, "|i", &only_needed)) {
+        return NULL;
+    }
+
+#if VMPROF_UNIX
+    if ((read(fd, NULL, 0) != 0) && (only_needed != 0)) {
+        PyErr_SetString(PyExc_ValueError,
+                        "file descriptor must be readable to save only needed code objects");
+        return NULL;
+    }
+#else
+    if (only_needed) {
+        PyErr_SetString(PyExc_ValueError,
+                        "saving only needed code objects is not supported for windows");
+        return NULL;
+    }
+#endif
+
     if (!is_enabled) {
         PyErr_SetString(PyExc_ValueError, "vmprof is not enabled");
         return NULL;
     }
+
     is_enabled = 0;
     vmprof_ignore_signals(1);
+
+#if VMPROF_UNIX
+    if (only_needed)
+        emit_all_code_objects_seen(fd);
+    else
+        emit_all_code_objects();
+#else
     emit_all_code_objects();
+#endif
 
     if (vmprof_disable() < 0) {
         PyErr_SetFromErrno(PyExc_OSError);
@@ -320,15 +438,36 @@
 }
 #endif
 
+#ifdef VMPROF_UNIX
+static PyObject * vmp_get_profile_path(PyObject *module, PyObject *noargs) {
+    PyObject * o;
+    if (is_enabled) {
+        char buffer[4096];
+        buffer[0] = 0;
+        ssize_t buffer_len = vmp_fd_to_path(vmp_profile_fileno(), buffer, 4096);
+        if (buffer_len == -1) {
+            PyErr_Format(PyExc_NotImplementedError, "not implemented platform %s", vmp_machine_os_name());
+            return NULL;
+        }
+        return PyStr_n_NEW(buffer, buffer_len);
+    }
+    Py_RETURN_NONE;
+}
+#endif
+
 static PyMethodDef VMProfMethods[] = {
     {"enable",  enable_vmprof, METH_VARARGS, "Enable profiling."},
-    {"disable", disable_vmprof, METH_NOARGS, "Disable profiling."},
+    {"disable", disable_vmprof, METH_VARARGS, "Disable profiling."},
     {"write_all_code_objects", write_all_code_objects, METH_NOARGS,
      "Write eagerly all the IDs of code objects"},
     {"sample_stack_now", sample_stack_now, METH_VARARGS, "Sample the stack now"},
 #ifdef VMP_SUPPORTS_NATIVE_PROFILING
     {"resolve_addr", resolve_addr, METH_VARARGS, "Return the name of the addr"},
 #endif
+    {"is_enabled", vmp_is_enabled, METH_NOARGS, "Indicates if vmprof is currently sampling."},
+#ifdef VMPROF_UNIX
+    {"get_profile_path", vmp_get_profile_path, METH_NOARGS, "Profile path the profiler logs to."},
+#endif
     {NULL, NULL, 0, NULL}        /* Sentinel */
 };
 
diff --git a/rpython/rlib/rvmprof/src/shared/compat.h b/rpython/rlib/rvmprof/src/shared/compat.h
--- a/rpython/rlib/rvmprof/src/shared/compat.h
+++ b/rpython/rlib/rvmprof/src/shared/compat.h
@@ -7,11 +7,13 @@
       #define PyStr_AS_STRING PyBytes_AS_STRING
       #define PyStr_GET_SIZE PyBytes_GET_SIZE
       #define PyStr_NEW      PyUnicode_FromString
+      #define PyStr_n_NEW      PyUnicode_FromStringAndSize
       #define PyLong_NEW     PyLong_FromSsize_t
 #  else
       #define PyStr_AS_STRING PyString_AS_STRING
       #define PyStr_GET_SIZE PyString_GET_SIZE
       #define PyStr_NEW      PyString_FromString
+      #define PyStr_n_NEW      PyString_FromStringAndSize
       #define PyLong_NEW     PyInt_FromSsize_t
       #define PyLong_AsLong  PyInt_AsLong
 #  endif
diff --git a/rpython/rlib/rvmprof/src/shared/khash.h b/rpython/rlib/rvmprof/src/shared/khash.h
new file mode 100644
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/khash.h
@@ -0,0 +1,627 @@
+/* The MIT License
+
+   Copyright (c) 2008, 2009, 2011 by Attractive Chaos <attractor at live.co.uk>
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+*/
+
+/*
+  An example:
+
+#include "khash.h"
+KHASH_MAP_INIT_INT(32, char)
+int main() {
+	int ret, is_missing;
+	khiter_t k;
+	khash_t(32) *h = kh_init(32);
+	k = kh_put(32, h, 5, &ret);
+	kh_value(h, k) = 10;
+	k = kh_get(32, h, 10);
+	is_missing = (k == kh_end(h));
+	k = kh_get(32, h, 5);
+	kh_del(32, h, k);
+	for (k = kh_begin(h); k != kh_end(h); ++k)
+		if (kh_exist(h, k)) kh_value(h, k) = 1;
+	kh_destroy(32, h);
+	return 0;
+}
+*/
+
+/*
+  2013-05-02 (0.2.8):
+
+	* Use quadratic probing. When the capacity is power of 2, stepping function
+	  i*(i+1)/2 guarantees to traverse each bucket. It is better than double
+	  hashing on cache performance and is more robust than linear probing.
+
+	  In theory, double hashing should be more robust than quadratic probing.
+	  However, my implementation is probably not for large hash tables, because
+	  the second hash function is closely tied to the first hash function,
+	  which reduce the effectiveness of double hashing.
+
+	Reference: http://research.cs.vt.edu/AVresearch/hashing/quadratic.php
+
+  2011-12-29 (0.2.7):
+
+    * Minor code clean up; no actual effect.
+
+  2011-09-16 (0.2.6):
+
+	* The capacity is a power of 2. This seems to dramatically improve the
+	  speed for simple keys. Thank Zilong Tan for the suggestion. Reference:
+
+	   - http://code.google.com/p/ulib/
+	   - http://nothings.org/computer/judy/
+
+	* Allow to optionally use linear probing which usually has better
+	  performance for random input. Double hashing is still the default as it
+	  is more robust to certain non-random input.
+
+	* Added Wang's integer hash function (not used by default). This hash
+	  function is more robust to certain non-random input.
+
+  2011-02-14 (0.2.5):
+
+    * Allow to declare global functions.
+
+  2009-09-26 (0.2.4):
+
+    * Improve portability
+
+  2008-09-19 (0.2.3):
+
+	* Corrected the example
+	* Improved interfaces
+
+  2008-09-11 (0.2.2):
+
+	* Improved speed a little in kh_put()
+
+  2008-09-10 (0.2.1):
+
+	* Added kh_clear()
+	* Fixed a compiling error
+
+  2008-09-02 (0.2.0):
+
+	* Changed to token concatenation which increases flexibility.
+
+  2008-08-31 (0.1.2):
+
+	* Fixed a bug in kh_get(), which has not been tested previously.
+
+  2008-08-31 (0.1.1):
+
+	* Added destructor
+*/
+
+
+#ifndef __AC_KHASH_H
+#define __AC_KHASH_H
+
+/*!
+  @header
+
+  Generic hash table library.
+ */
+
+#define AC_VERSION_KHASH_H "0.2.8"
+
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+/* compiler specific configuration */
+
+#if UINT_MAX == 0xffffffffu
+typedef unsigned int khint32_t;
+#elif ULONG_MAX == 0xffffffffu
+typedef unsigned long khint32_t;
+#endif
+
+#if ULONG_MAX == ULLONG_MAX
+typedef unsigned long khint64_t;
+#else
+typedef unsigned long long khint64_t;
+#endif
+
+#ifndef kh_inline
+#ifdef _MSC_VER
+#define kh_inline __inline
+#else
+#define kh_inline inline
+#endif
+#endif /* kh_inline */
+
+#ifndef klib_unused
+#if (defined __clang__ && __clang_major__ >= 3) || (defined __GNUC__ && __GNUC__ >= 3)
+#define klib_unused __attribute__ ((__unused__))
+#else
+#define klib_unused
+#endif
+#endif /* klib_unused */
+
+typedef khint32_t khint_t;
+typedef khint_t khiter_t;
+
+#define __ac_isempty(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&2)
+#define __ac_isdel(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&1)
+#define __ac_iseither(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&3)
+#define __ac_set_isdel_false(flag, i) (flag[i>>4]&=~(1ul<<((i&0xfU)<<1)))
+#define __ac_set_isempty_false(flag, i) (flag[i>>4]&=~(2ul<<((i&0xfU)<<1)))
+#define __ac_set_isboth_false(flag, i) (flag[i>>4]&=~(3ul<<((i&0xfU)<<1)))
+#define __ac_set_isdel_true(flag, i) (flag[i>>4]|=1ul<<((i&0xfU)<<1))
+
+#define __ac_fsize(m) ((m) < 16? 1 : (m)>>4)
+
+#ifndef kroundup32
+#define kroundup32(x) (--(x), (x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16, ++(x))
+#endif
+
+#ifndef kcalloc
+#define kcalloc(N,Z) calloc(N,Z)
+#endif
+#ifndef kmalloc
+#define kmalloc(Z) malloc(Z)
+#endif
+#ifndef krealloc
+#define krealloc(P,Z) realloc(P,Z)
+#endif
+#ifndef kfree
+#define kfree(P) free(P)
+#endif
+
+static const double __ac_HASH_UPPER = 0.77;
+
+#define __KHASH_TYPE(name, khkey_t, khval_t) \
+	typedef struct kh_##name##_s { \
+		khint_t n_buckets, size, n_occupied, upper_bound; \
+		khint32_t *flags; \
+		khkey_t *keys; \
+		khval_t *vals; \
+	} kh_##name##_t;
+
+#define __KHASH_PROTOTYPES(name, khkey_t, khval_t)	 					\
+	extern kh_##name##_t *kh_init_##name(void);							\
+	extern void kh_destroy_##name(kh_##name##_t *h);					\
+	extern void kh_clear_##name(kh_##name##_t *h);						\
+	extern khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); 	\
+	extern int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
+	extern khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \
+	extern void kh_del_##name(kh_##name##_t *h, khint_t x);
+
+#define __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	SCOPE kh_##name##_t *kh_init_##name(void) {							\
+		return (kh_##name##_t*)kcalloc(1, sizeof(kh_##name##_t));		\
+	}																	\
+	SCOPE void kh_destroy_##name(kh_##name##_t *h)						\
+	{																	\
+		if (h) {														\
+			kfree((void *)h->keys); kfree(h->flags);					\
+			kfree((void *)h->vals);										\
+			kfree(h);													\
+		}																\
+	}																	\
+	SCOPE void kh_clear_##name(kh_##name##_t *h)						\
+	{																	\
+		if (h && h->flags) {											\
+			memset(h->flags, 0xaa, __ac_fsize(h->n_buckets) * sizeof(khint32_t)); \
+			h->size = h->n_occupied = 0;								\
+		}																\
+	}																	\
+	SCOPE khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) 	\
+	{																	\
+		if (h->n_buckets) {												\
+			khint_t k, i, last, mask, step = 0; \
+			mask = h->n_buckets - 1;									\
+			k = __hash_func(key); i = k & mask;							\
+			last = i; \
+			while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
+				i = (i + (++step)) & mask; \
+				if (i == last) return h->n_buckets;						\
+			}															\
+			return __ac_iseither(h->flags, i)? h->n_buckets : i;		\
+		} else return 0;												\
+	}																	\
+	SCOPE int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
+	{ /* This function uses 0.25*n_buckets bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets. */ \
+		khint32_t *new_flags = 0;										\
+		khint_t j = 1;													\
+		{																\
+			kroundup32(new_n_buckets); 									\
+			if (new_n_buckets < 4) new_n_buckets = 4;					\
+			if (h->size >= (khint_t)(new_n_buckets * __ac_HASH_UPPER + 0.5)) j = 0;	/* requested size is too small */ \
+			else { /* hash table size to be changed (shrink or expand); rehash */ \
+				new_flags = (khint32_t*)kmalloc(__ac_fsize(new_n_buckets) * sizeof(khint32_t));	\
+				if (!new_flags) return -1;								\
+				memset(new_flags, 0xaa, __ac_fsize(new_n_buckets) * sizeof(khint32_t)); \
+				if (h->n_buckets < new_n_buckets) {	/* expand */		\
+					khkey_t *new_keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
+					if (!new_keys) { kfree(new_flags); return -1; }		\
+					h->keys = new_keys;									\
+					if (kh_is_map) {									\
+						khval_t *new_vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \
+						if (!new_vals) { kfree(new_flags); return -1; }	\
+						h->vals = new_vals;								\
+					}													\
+				} /* otherwise shrink */								\
+			}															\
+		}																\
+		if (j) { /* rehashing is needed */								\
+			for (j = 0; j != h->n_buckets; ++j) {						\
+				if (__ac_iseither(h->flags, j) == 0) {					\
+					khkey_t key = h->keys[j];							\
+					khval_t val;										\
+					khint_t new_mask;									\
+					new_mask = new_n_buckets - 1; 						\
+					if (kh_is_map) val = h->vals[j];					\
+					__ac_set_isdel_true(h->flags, j);					\
+					while (1) { /* kick-out process; sort of like in Cuckoo hashing */ \
+						khint_t k, i, step = 0; \
+						k = __hash_func(key);							\
+						i = k & new_mask;								\
+						while (!__ac_isempty(new_flags, i)) i = (i + (++step)) & new_mask; \
+						__ac_set_isempty_false(new_flags, i);			\
+						if (i < h->n_buckets && __ac_iseither(h->flags, i) == 0) { /* kick out the existing element */ \
+							{ khkey_t tmp = h->keys[i]; h->keys[i] = key; key = tmp; } \
+							if (kh_is_map) { khval_t tmp = h->vals[i]; h->vals[i] = val; val = tmp; } \
+							__ac_set_isdel_true(h->flags, i); /* mark it as deleted in the old hash table */ \
+						} else { /* write the element and jump out of the loop */ \
+							h->keys[i] = key;							\
+							if (kh_is_map) h->vals[i] = val;			\
+							break;										\
+						}												\
+					}													\
+				}														\
+			}															\
+			if (h->n_buckets > new_n_buckets) { /* shrink the hash table */ \
+				h->keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
+				if (kh_is_map) h->vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \
+			}															\
+			kfree(h->flags); /* free the working space */				\
+			h->flags = new_flags;										\
+			h->n_buckets = new_n_buckets;								\
+			h->n_occupied = h->size;									\
+			h->upper_bound = (khint_t)(h->n_buckets * __ac_HASH_UPPER + 0.5); \
+		}																\
+		return 0;														\
+	}																	\
+	SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \
+	{																	\
+		khint_t x;														\
+		if (h->n_occupied >= h->upper_bound) { /* update the hash table */ \
+			if (h->n_buckets > (h->size<<1)) {							\
+				if (kh_resize_##name(h, h->n_buckets - 1) < 0) { /* clear "deleted" elements */ \
+					*ret = -1; return h->n_buckets;						\
+				}														\
+			} else if (kh_resize_##name(h, h->n_buckets + 1) < 0) { /* expand the hash table */ \
+				*ret = -1; return h->n_buckets;							\
+			}															\
+		} /* TODO: to implement automatically shrinking; resize() already support shrinking */ \
+		{																\
+			khint_t k, i, site, last, mask = h->n_buckets - 1, step = 0; \
+			x = site = h->n_buckets; k = __hash_func(key); i = k & mask; \
+			if (__ac_isempty(h->flags, i)) x = i; /* for speed up */	\
+			else {														\
+				last = i; \
+				while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
+					if (__ac_isdel(h->flags, i)) site = i;				\
+					i = (i + (++step)) & mask; \
+					if (i == last) { x = site; break; }					\
+				}														\
+				if (x == h->n_buckets) {								\
+					if (__ac_isempty(h->flags, i) && site != h->n_buckets) x = site; \
+					else x = i;											\
+				}														\
+			}															\
+		}																\
+		if (__ac_isempty(h->flags, x)) { /* not present at all */		\
+			h->keys[x] = key;											\
+			__ac_set_isboth_false(h->flags, x);							\
+			++h->size; ++h->n_occupied;									\
+			*ret = 1;													\
+		} else if (__ac_isdel(h->flags, x)) { /* deleted */				\
+			h->keys[x] = key;											\
+			__ac_set_isboth_false(h->flags, x);							\
+			++h->size;													\
+			*ret = 2;													\
+		} else *ret = 0; /* Don't touch h->keys[x] if present and not deleted */ \
+		return x;														\
+	}																	\
+	SCOPE void kh_del_##name(kh_##name##_t *h, khint_t x)				\
+	{																	\
+		if (x != h->n_buckets && !__ac_iseither(h->flags, x)) {			\
+			__ac_set_isdel_true(h->flags, x);							\
+			--h->size;													\
+		}																\
+	}
+
+#define KHASH_DECLARE(name, khkey_t, khval_t)		 					\
+	__KHASH_TYPE(name, khkey_t, khval_t) 								\
+	__KHASH_PROTOTYPES(name, khkey_t, khval_t)
+
+#define KHASH_INIT2(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	__KHASH_TYPE(name, khkey_t, khval_t) 								\
+	__KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal)
+
+#define KHASH_INIT(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	KHASH_INIT2(name, static kh_inline klib_unused, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal)
+
+/* --- BEGIN OF HASH FUNCTIONS --- */
+
+/*! @function
+  @abstract     Integer hash function
+  @param  key   The integer [khint32_t]
+  @return       The hash value [khint_t]
+ */
+#define kh_int_hash_func(key) (khint32_t)(key)
+/*! @function
+  @abstract     Integer comparison function
+ */
+#define kh_int_hash_equal(a, b) ((a) == (b))
+/*! @function
+  @abstract     64-bit integer hash function
+  @param  key   The integer [khint64_t]
+  @return       The hash value [khint_t]
+ */
+#define kh_int64_hash_func(key) (khint32_t)((key)>>33^(key)^(key)<<11)
+/*! @function
+  @abstract     64-bit integer comparison function
+ */
+#define kh_int64_hash_equal(a, b) ((a) == (b))
+/*! @function
+  @abstract     const char* hash function
+  @param  s     Pointer to a null terminated string
+  @return       The hash value
+ */
+static kh_inline khint_t __ac_X31_hash_string(const char *s)
+{
+	khint_t h = (khint_t)*s;
+	if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)*s;
+	return h;
+}
+/*! @function
+  @abstract     Another interface to const char* hash function
+  @param  key   Pointer to a null terminated string [const char*]
+  @return       The hash value [khint_t]
+ */
+#define kh_str_hash_func(key) __ac_X31_hash_string(key)
+/*! @function
+  @abstract     Const char* comparison function
+ */
+#define kh_str_hash_equal(a, b) (strcmp(a, b) == 0)
+
+static kh_inline khint_t __ac_Wang_hash(khint_t key)
+{
+    key += ~(key << 15);
+    key ^=  (key >> 10);
+    key +=  (key << 3);
+    key ^=  (key >> 6);
+    key += ~(key << 11);
+    key ^=  (key >> 16);
+    return key;
+}
+#define kh_int_hash_func2(key) __ac_Wang_hash((khint_t)key)
+
+/* --- END OF HASH FUNCTIONS --- */
+
+/* Other convenient macros... */
+
+/*!
+  @abstract Type of the hash table.
+  @param  name  Name of the hash table [symbol]
+ */
+#define khash_t(name) kh_##name##_t
+
+/*! @function
+  @abstract     Initiate a hash table.
+  @param  name  Name of the hash table [symbol]
+  @return       Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_init(name) kh_init_##name()
+
+/*! @function
+  @abstract     Destroy a hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_destroy(name, h) kh_destroy_##name(h)
+
+/*! @function
+  @abstract     Reset a hash table without deallocating memory.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_clear(name, h) kh_clear_##name(h)
+
+/*! @function
+  @abstract     Resize a hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  s     New size [khint_t]
+ */
+#define kh_resize(name, h, s) kh_resize_##name(h, s)
+
+/*! @function
+  @abstract     Insert a key to the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Key [type of keys]
+  @param  r     Extra return code: -1 if the operation failed;
+                0 if the key is present in the hash table;
+                1 if the bucket is empty (never used); 2 if the element in
+				the bucket has been deleted [int*]
+  @return       Iterator to the inserted element [khint_t]
+ */
+#define kh_put(name, h, k, r) kh_put_##name(h, k, r)
+
+/*! @function
+  @abstract     Retrieve a key from the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Key [type of keys]
+  @return       Iterator to the found element, or kh_end(h) if the element is absent [khint_t]
+ */
+#define kh_get(name, h, k) kh_get_##name(h, k)
+
+/*! @function
+  @abstract     Remove a key from the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Iterator to the element to be deleted [khint_t]
+ */
+#define kh_del(name, h, k) kh_del_##name(h, k)
+
+/*! @function
+  @abstract     Test whether a bucket contains data.
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       1 if containing data; 0 otherwise [int]
+ */
+#define kh_exist(h, x) (!__ac_iseither((h)->flags, (x)))
+
+/*! @function
+  @abstract     Get key given an iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       Key [type of keys]
+ */
+#define kh_key(h, x) ((h)->keys[x])
+
+/*! @function
+  @abstract     Get value given an iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       Value [type of values]
+  @discussion   For hash sets, calling this results in segfault.
+ */
+#define kh_val(h, x) ((h)->vals[x])
+
+/*! @function
+  @abstract     Alias of kh_val()
+ */
+#define kh_value(h, x) ((h)->vals[x])
+
+/*! @function
+  @abstract     Get the start iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       The start iterator [khint_t]
+ */
+#define kh_begin(h) (khint_t)(0)
+
+/*! @function
+  @abstract     Get the end iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       The end iterator [khint_t]
+ */
+#define kh_end(h) ((h)->n_buckets)
+
+/*! @function
+  @abstract     Get the number of elements in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       Number of elements in the hash table [khint_t]
+ */
+#define kh_size(h) ((h)->size)
+
+/*! @function
+  @abstract     Get the number of buckets in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       Number of buckets in the hash table [khint_t]
+ */
+#define kh_n_buckets(h) ((h)->n_buckets)
+
+/*! @function
+  @abstract     Iterate over the entries in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  kvar  Variable to which key will be assigned
+  @param  vvar  Variable to which value will be assigned
+  @param  code  Block of code to execute
+ */
+#define kh_foreach(h, kvar, vvar, code) { khint_t __i;		\
+	for (__i = kh_begin(h); __i != kh_end(h); ++__i) {		\
+		if (!kh_exist(h,__i)) continue;						\
+		(kvar) = kh_key(h,__i);								\
+		(vvar) = kh_val(h,__i);								\
+		code;												\
+	} }
+
+/*! @function
+  @abstract     Iterate over the values in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  vvar  Variable to which value will be assigned
+  @param  code  Block of code to execute
+ */
+#define kh_foreach_value(h, vvar, code) { khint_t __i;		\
+	for (__i = kh_begin(h); __i != kh_end(h); ++__i) {		\
+		if (!kh_exist(h,__i)) continue;						\
+		(vvar) = kh_val(h,__i);								\
+		code;												\
+	} }
+
+/* More conenient interfaces */
+
+/*! @function
+  @abstract     Instantiate a hash set containing integer keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_INT(name)										\
+	KHASH_INIT(name, khint32_t, char, 0, kh_int_hash_func, kh_int_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing integer keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_INT(name, khval_t)								\
+	KHASH_INIT(name, khint32_t, khval_t, 1, kh_int_hash_func, kh_int_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing 64-bit integer keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_INT64(name)										\
+	KHASH_INIT(name, khint64_t, char, 0, kh_int64_hash_func, kh_int64_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing 64-bit integer keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_INT64(name, khval_t)								\
+	KHASH_INIT(name, khint64_t, khval_t, 1, kh_int64_hash_func, kh_int64_hash_equal)
+
+typedef const char *kh_cstr_t;
+/*! @function
+  @abstract     Instantiate a hash map containing const char* keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_STR(name)										\
+	KHASH_INIT(name, kh_cstr_t, char, 0, kh_str_hash_func, kh_str_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing const char* keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_STR(name, khval_t)								\
+	KHASH_INIT(name, kh_cstr_t, khval_t, 1, kh_str_hash_func, kh_str_hash_equal)
+
+#endif /* __AC_KHASH_H */
diff --git a/rpython/rlib/rvmprof/src/shared/machine.c b/rpython/rlib/rvmprof/src/shared/machine.c
--- a/rpython/rlib/rvmprof/src/shared/machine.c
+++ b/rpython/rlib/rvmprof/src/shared/machine.c
@@ -3,6 +3,11 @@
 #include "vmprof.h"
 #include <stdio.h>
 
+#ifdef VMPROF_UNIX
+#include <unistd.h>
+#include <fcntl.h>
+#endif
+
 int vmp_machine_bits(void)
 {
     return sizeof(void*)*8;
@@ -27,3 +32,15 @@
 #endif
 }
 
+long vmp_fd_to_path(int fd, char * buffer, long buffer_len)
+{
+#ifdef VMPROF_LINUX
+    char proffs[24];
+    (void)snprintf(proffs, 24, "/proc/self/fd/%d", fd);
+    return readlink(proffs, buffer, buffer_len);
+#elif defined(VMPROF_UNIX)
+    fcntl(fd, F_GETPATH, buffer);
+    return strlen(buffer);
+#endif
+    return -1;
+}
diff --git a/rpython/rlib/rvmprof/src/shared/machine.h b/rpython/rlib/rvmprof/src/shared/machine.h
--- a/rpython/rlib/rvmprof/src/shared/machine.h
+++ b/rpython/rlib/rvmprof/src/shared/machine.h
@@ -10,3 +10,9 @@
  */
 const char * vmp_machine_os_name(void);
 
+/**
+ * Writes the filename into buffer. Returns -1 if the platform is not
+ * implemented.
+ */
+long vmp_fd_to_path(int fd, char * buffer, long buffer_len);
+
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c b/rpython/rlib/rvmprof/src/shared/symboltable.c
--- a/rpython/rlib/rvmprof/src/shared/symboltable.c
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.c
@@ -3,11 +3,15 @@
 #include "vmprof.h"
 #include "machine.h"
 
+#include "khash.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <assert.h>
 #include <dlfcn.h>
+
 #if defined(VMPROF_LINUX)
 #include <link.h>
 #endif
@@ -206,15 +210,20 @@
 struct backtrace_state * bstate = NULL;
 int vmp_resolve_addr(void * addr, char * name, int name_len, int * lineno, char * srcfile, int srcfile_len) {
 #ifdef __APPLE__
-    Dl_info info;
-    if (dladdr((const void*)addr, &info) == 0) {
+    Dl_info dlinfo;
+    if (dladdr((const void*)addr, &dlinfo) == 0) {
         return 1;
     }
-    if (info.dli_sname != NULL) {
-        (void)strncpy(name, info.dli_sname, name_len-1);
+    if (dlinfo.dli_sname != NULL) {
+        (void)strncpy(name, dlinfo.dli_sname, name_len-1);
         name[name_len-1] = 0;
     }
-    lookup_vmprof_debug_info(name, info.dli_fbase, srcfile, srcfile_len, lineno);
+    lookup_vmprof_debug_info(name, dlinfo.dli_fbase, srcfile, srcfile_len, lineno);
+    // copy the shared object name to the source file name if source cannot be determined
+    if (srcfile[0] == 0 && dlinfo.dli_fname != NULL) {
+        (void)strncpy(srcfile, dlinfo.dli_fname, srcfile_len-1);
+        srcfile[srcfile_len-1] = 0;
+    }
 #elif defined(VMPROF_LINUX)
     if (bstate == NULL) {
         bstate = backtrace_create_state (NULL, 1, backtrace_error_cb, NULL);
@@ -238,6 +247,18 @@
             (void)strncpy(info.name, dlinfo.dli_sname, info.name_len-1);
             name[name_len-1] = 0;
         }
+
+    }
+
+    // copy the shared object name to the source file name if source cannot be determined
+    if (srcfile[0] == 0) {
+        Dl_info dlinfo;
+        dlinfo.dli_fname = NULL;
+        (void)dladdr((const void*)addr, &dlinfo);
+        if (dlinfo.dli_fname != NULL) {
+            (void)strncpy(srcfile, dlinfo.dli_fname, srcfile_len-1);
+            srcfile[srcfile_len-1] = 0;
+        }
     }
 #endif
     return 0;
@@ -338,8 +359,9 @@
     return 0;
 }
 
+KHASH_MAP_INIT_INT(ptr, intptr_t)
 
-void dump_native_symbols(int fileno)
+void vmp_scan_profile(int fileno, int dump_nat_sym, void *all_code_uids)
 {
     off_t orig_pos, cur_pos;
     char marker;
@@ -350,6 +372,9 @@
     fsync(fileno);
     orig_pos = lseek(fileno, 0, SEEK_CUR);
 
+    khash_t(ptr) * nat_syms = kh_init(ptr);
+    khiter_t it;
+
     lseek(fileno, 5*WORD_SIZE, SEEK_SET);
 
     while (1) {
@@ -363,11 +388,17 @@
             case MARKER_HEADER: {
                 LOG("header 0x%llx\n", cur_pos);
                 if (_skip_header(fileno, &version, &flags) != 0) {
+                    kh_destroy(ptr, nat_syms);
                     return;
                 }
                 memory = (flags & PROFILE_MEMORY) != 0;
                 native = (flags & PROFILE_NATIVE) != 0;
                 lines = (flags & PROFILE_LINES) != 0;
+                if (!native && dump_nat_sym) {
+                    lseek(fileno, 0, SEEK_END);
+                    kh_destroy(ptr, nat_syms);
+                    return;
+                }
                 break;
             } case MARKER_META: {
                 LOG("meta 0x%llx\n", cur_pos);
@@ -400,19 +431,46 @@
 #else
                 for (i = 0; i < depth; i++) {
                     void * addr = _read_addr(fileno);
+                    if (lines && i % 2 == 0) {
+                        continue;
+                    }
                     if (((intptr_t)addr & 0x1) == 1) {
 #endif
-                        LOG("found kind %p\n", addr);
-                        char name[MAXLEN];
-                        char srcfile[MAXLEN];
-                        name[0] = 0;
-                        srcfile[0] = 0;
-                        int lineno = 0;
-                        if (vmp_resolve_addr(addr, name, MAXLEN, &lineno, srcfile, MAXLEN) == 0) {
-                            LOG("dumping add %p, name %s, %s:%d\n", addr, name, srcfile, lineno);
-                            _dump_native_symbol(fileno, addr, name, lineno, srcfile);
+                        /* dump the native symbol to disk */
+                        if (dump_nat_sym) {
+                            LOG("found kind %p\n", addr);
+
+                            // if the address has already been dumped,
+                            // do not log it again!
+                            it = kh_get(ptr, nat_syms, (intptr_t)addr);
+                            if (it == kh_end(nat_syms)) {
+                                char name[MAXLEN];
+                                char srcfile[MAXLEN];
+                                name[0] = 0;
+                                srcfile[0] = 0;
+                                int lineno = 0;
+                                if (vmp_resolve_addr(addr, name, MAXLEN, &lineno, srcfile, MAXLEN) == 0) {
+                                    LOG("dumping add %p, name %s, %s:%d\n", addr, name, srcfile, lineno);
+                                    _dump_native_symbol(fileno, addr, name, lineno, srcfile);
+                                    int ret;
+                                    it = kh_put(ptr, nat_syms, (intptr_t)addr, &ret);
+                                    kh_value(nat_syms, it) = 1;
+                                }
+                            }
+                        }
+#ifdef RPYTHON_VMPROF
+                    }
+#else
+                    } else {
+                        // cpython adds all addresses into a set to get the intersection
+                        // of all gc known code addresses
+                        if (all_code_uids != NULL) {
+                            PyObject *co_uid = PyLong_FromVoidPtr(addr);
+                            int check = PySet_Add(all_code_uids, co_uid);
+                            Py_CLEAR(co_uid);
                         }
                     }
+#endif
                 }
                 LOG("passed  memory %d \n", memory);
 
@@ -427,6 +485,7 @@
             } default: {
                 fprintf(stderr, "unknown marker 0x%x\n", marker);
                 lseek(fileno, 0, SEEK_END);
+                kh_destroy(ptr, nat_syms);
                 return;
             }
         }
@@ -437,5 +496,11 @@
         }
     }
 
+    kh_destroy(ptr, nat_syms);
     lseek(fileno, 0, SEEK_END);
 }
+
+void dump_native_symbols(int fileno)
+{
+    vmp_scan_profile(fileno, 1, NULL);
+}
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.h b/rpython/rlib/rvmprof/src/shared/symboltable.h
--- a/rpython/rlib/rvmprof/src/shared/symboltable.h
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.h
@@ -17,5 +17,7 @@
  */
 void dump_all_known_symbols(int fd);
 
+void dump_native_symbols(int fd);
+
 int vmp_resolve_addr(void * addr, char * name, int name_len, int * lineno,
                       char * srcfile, int srcfile_len);
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_main.h b/rpython/rlib/rvmprof/src/shared/vmprof_main.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof_main.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof_main.h
@@ -218,7 +218,7 @@
         if (p == NULL) {
             /* ignore this signal: there are no free buffers right now */
         } else {
-#ifdef RPYTHON_VMPORF
+#ifdef RPYTHON_VMPROF
             commit = _vmprof_sample_stack(p, NULL, (ucontext_t*)ucontext);
 #else
             commit = _vmprof_sample_stack(p, tstate, (ucontext_t*)ucontext);

From pypy.commits at gmail.com  Wed Apr 26 16:07:45 2017
From: pypy.commits at gmail.com (mattip)
Date: Wed, 26 Apr 2017 13:07:45 -0700 (PDT)
Subject: [pypy-commit] pypy cpyext-obj-stealing: cleanup, add check
Message-ID: <5900fe11.073eed0a.52c8a.18b3@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-obj-stealing
Changeset: r91134:e9792355d656
Date: 2017-04-26 07:02 +0300
http://bitbucket.org/pypy/pypy/changeset/e9792355d656/

Log:	cleanup, add check

diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@ -1557,7 +1557,6 @@
 
 @specialize.memo()
 def make_generic_cpy_call(FT, expect_null):
-    from pypy.module.cpyext.pyobject import make_ref, from_ref
     from pypy.module.cpyext.pyobject import is_pyobj, as_pyobj
     from pypy.module.cpyext.pyobject import get_w_obj_and_decref
     from pypy.module.cpyext.pyerrors import PyErr_Occurred
diff --git a/pypy/module/cpyext/pyobject.py b/pypy/module/cpyext/pyobject.py
--- a/pypy/module/cpyext/pyobject.py
+++ b/pypy/module/cpyext/pyobject.py
@@ -274,13 +274,14 @@
     """
     if is_pyobj(obj):
         pyobj = rffi.cast(PyObject, obj)
+        assert pyobj.c_ob_refcnt > 0
     else:
         pyobj = as_pyobj(space, obj, w_userdata)
-    if pyobj:
-        assert pyobj.c_ob_refcnt > 0
-        pyobj.c_ob_refcnt += 1
-        if not is_pyobj(obj):
+        if not pyobj:
             keepalive_until_here(obj)
+            return pyobj
+        assert pyobj.c_ob_refcnt >= rawrefcount.REFCNT_FROM_PYPY
+    pyobj.c_ob_refcnt += 1
     return pyobj
 
 
diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py
--- a/pypy/module/cpyext/typeobject.py
+++ b/pypy/module/cpyext/typeobject.py
@@ -24,7 +24,7 @@
     W_PyCMethodObject, W_PyCFunctionObject)
 from pypy.module.cpyext.modsupport import convert_method_defs
 from pypy.module.cpyext.pyobject import (
-    PyObject, make_ref, create_ref, from_ref, get_typedescr, make_typedescr,
+    PyObject, make_ref, from_ref, get_typedescr, make_typedescr,
     track_reference, Py_DecRef, as_pyobj)
 from pypy.module.cpyext.slotdefs import (
     slotdefs_for_tp_slots, slotdefs_for_wrappers, get_slot_tp_function,

From pypy.commits at gmail.com  Wed Apr 26 16:07:48 2017
From: pypy.commits at gmail.com (mattip)
Date: Wed, 26 Apr 2017 13:07:48 -0700 (PDT)
Subject: [pypy-commit] pypy cpyext-obj-stealing: make listobject set/get
 refcount semantics exactly match cpython
Message-ID: <5900fe14.d610370a.bf4e0.1874@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-obj-stealing
Changeset: r91135:8a55a93fe3df
Date: 2017-04-26 22:22 +0300
http://bitbucket.org/pypy/pypy/changeset/8a55a93fe3df/

Log:	make listobject set/get refcount semantics exactly match cpython

diff --git a/pypy/module/cpyext/listobject.py b/pypy/module/cpyext/listobject.py
--- a/pypy/module/cpyext/listobject.py
+++ b/pypy/module/cpyext/listobject.py
@@ -3,7 +3,7 @@
 from pypy.module.cpyext.api import (cpython_api, CANNOT_FAIL, Py_ssize_t,
                                     build_type_checkers)
 from pypy.module.cpyext.pyerrors import PyErr_BadInternalCall
-from pypy.module.cpyext.pyobject import Py_DecRef, PyObject, make_ref
+from pypy.module.cpyext.pyobject import decref, PyObject, make_ref, w_obj_has_pyobj
 from pypy.objspace.std.listobject import W_ListObject
 from pypy.interpreter.error import oefmt
 
@@ -24,18 +24,15 @@
 @cpython_api([rffi.VOIDP, Py_ssize_t, PyObject], PyObject, error=CANNOT_FAIL,
              result_borrowed=True)
 def PyList_SET_ITEM(space, w_list, index, w_item):
-    """Macro form of PyList_SetItem() without error checking. This is normally
+    """Form of PyList_SetItem() without error checking. This is normally
     only used to fill in new lists where there is no previous content.
 
-    This function "steals" a reference to item, and, unlike PyList_SetItem(),
-    does not discard a reference to any item that it being replaced; any
-    reference in list at position i will be leaked.
+    "steals" a reference to item, and, unlike PyList_SetItem(), does not
+    discard a reference to any item that it being replaced; any reference in
+    list at position i will be leaked.
     """
     assert isinstance(w_list, W_ListObject)
     assert 0 <= index < w_list.length()
-    # Deliberately leak, so that it can be safely decref'd.
-    make_ref(space, w_list.getitem(index))
-    Py_DecRef(space, w_item)
     w_list.setitem(index, w_item)
     return w_item
 
@@ -48,11 +45,19 @@
     This function "steals" a reference to item and discards a reference to
     an item already in the list at the affected position.
     """
+    from pypy.module.cpyext.sequence import CPyListStrategy
+    cpy_strategy = space.fromcache(CPyListStrategy)
     if not isinstance(w_list, W_ListObject):
+        decref(space, w_item)
         PyErr_BadInternalCall(space)
     if index < 0 or index >= w_list.length():
+        decref(space, w_item)
         raise oefmt(space.w_IndexError, "list assignment index out of range")
-    #Py_DecRef(space, w_item)
+    if w_list.strategy is not cpy_strategy:
+        w_list.ensure_object_strategy() # make sure we can use borrowed obj
+    w_old = w_list.getitem(index)
+    if w_obj_has_pyobj(w_old):
+        decref(space, w_old)
     w_list.setitem(index, w_item)
     return 0
 
@@ -63,11 +68,11 @@
     supported.  If pos is out of bounds, return NULL and set an
     IndexError exception."""
     from pypy.module.cpyext.sequence import CPyListStrategy
+    cpy_strategy = space.fromcache(CPyListStrategy)
     if not isinstance(w_list, W_ListObject):
         PyErr_BadInternalCall(space)
     if index < 0 or index >= w_list.length():
         raise oefmt(space.w_IndexError, "list index out of range")
-    cpy_strategy = space.fromcache(CPyListStrategy)
     if w_list.strategy is not cpy_strategy:
         w_list.ensure_object_strategy() # make sure we can return a borrowed obj
     w_res = w_list.getitem(index)
@@ -78,6 +83,7 @@
 def PyList_Append(space, w_list, w_item):
     if not isinstance(w_list, W_ListObject):
         PyErr_BadInternalCall(space)
+    make_ref(space, w_item)
     w_list.append(w_item)
     return 0
 
@@ -86,6 +92,7 @@
     """Insert the item item into list list in front of index index.  Return
     0 if successful; return -1 and set an exception if unsuccessful.
     Analogous to list.insert(index, item)."""
+    make_ref(space, w_item)
     space.call_method(space.w_list, "insert", w_list, space.newint(index), w_item)
     return 0
 
diff --git a/pypy/module/cpyext/pyobject.py b/pypy/module/cpyext/pyobject.py
--- a/pypy/module/cpyext/pyobject.py
+++ b/pypy/module/cpyext/pyobject.py
@@ -249,6 +249,8 @@
     w_obj = rawrefcount.to_obj(W_Root, pyobj)
     return w_obj is not None and w_obj is not w_marker_deallocating
 
+def w_obj_has_pyobj(w_obj):
+    return bool(rawrefcount.from_obj(PyObject, w_obj))
 
 def is_pyobj(x):
     if x is None or isinstance(x, W_Root):
diff --git a/pypy/module/cpyext/test/test_listobject.py b/pypy/module/cpyext/test/test_listobject.py
--- a/pypy/module/cpyext/test/test_listobject.py
+++ b/pypy/module/cpyext/test/test_listobject.py
@@ -200,22 +200,29 @@
              ("test_refcount_diff_after_setitem", "METH_NOARGS",
              """
                 PyObject* o = PyList_New(0);
-                PyObject* o2 = PyList_New(0);
+                PyObject* o2 = PyLong_FromLong(0);
+                Py_INCREF(o2);
                 Py_ssize_t refcount, new_refcount;
 
-                PyList_Append(o, o2);  // does not steal o2
+                refcount = Py_REFCNT(o2); // 1
 
-                refcount = Py_REFCNT(o2);
+                PyList_Append(o, o2); 
 
-                // Steal a reference to o2, but leak the old reference to o2.
+                new_refcount = Py_REFCNT(o2);
+
+                if (new_refcount != refcount + 1)
+                    return PyLong_FromSsize_t(-10);
+                refcount = new_refcount;
+
+                // Steal a reference to o2, leak the old reference to o2.
                 // The net result should be no change in refcount.
                 PyList_SET_ITEM(o, 0, o2);
 
                 new_refcount = Py_REFCNT(o2);
 
-                Py_CLEAR(o);
                 Py_DECREF(o2); // append incref'd.
-                // Py_CLEAR(o2);  // naive implementation would fail here.
+                Py_DECREF(o);
+                Py_DECREF(o2);
                 return PyLong_FromSsize_t(new_refcount - refcount);
              """)])
         assert module.test_refcount_diff_after_setitem() == 0

From pypy.commits at gmail.com  Thu Apr 27 06:54:03 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 27 Apr 2017 03:54:03 -0700 (PDT)
Subject: [pypy-commit] pypy.org extradoc: update the values
Message-ID: <5901cdcb.49a4370a.b388e.8299@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r883:9f402b101c68
Date: 2017-04-27 12:53 +0200
http://bitbucket.org/pypy/pypy.org/changeset/9f402b101c68/

Log:	update the values

diff --git a/don1.html b/don1.html
--- a/don1.html
+++ b/don1.html
@@ -15,7 +15,7 @@
 </script>
 
    <!-- Income:PyPy:Donations:Py3k / 0.95 -->
-   $66820 of $105000 (63.6%)
+   $66829 of $105000 (63.6%)
    <div id="progressbar">
    </div>
 
@@ -23,7 +23,7 @@
   <li>
   <span id="donate_text">This donation goes towards supporting Python 3 in PyPy.
   Current status:
-    we have $2624 left
+    we have $2633 left
   in the account.</br> <a href="py3donate.html">Read proposal</a></span>
   </li>
   <li>

From pypy.commits at gmail.com  Thu Apr 27 10:25:12 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 27 Apr 2017 07:25:12 -0700 (PDT)
Subject: [pypy-commit] pypy default: document merged branch
Message-ID: <5901ff48.532f1c0a.c3352.1d0d@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: 
Changeset: r91138:55f162358a12
Date: 2017-04-27 15:24 +0100
http://bitbucket.org/pypy/pypy/changeset/55f162358a12/

Log:	document merged branch

diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -30,3 +30,7 @@
 large constants is reused across instructions.
 
 .. branch: vmprof-0.4.4
+
+.. branch: controller-refactor
+
+Refactor rpython.rtyper.controllerentry.

From pypy.commits at gmail.com  Thu Apr 27 12:03:21 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 27 Apr 2017 09:03:21 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: hg merge default
Message-ID: <59021649.86aedf0a.8d170.1703@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r91139:f57c8f393890
Date: 2017-04-27 17:02 +0100
http://bitbucket.org/pypy/pypy/changeset/f57c8f393890/

Log:	hg merge default

diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -30,3 +30,7 @@
 large constants is reused across instructions.
 
 .. branch: vmprof-0.4.4
+
+.. branch: controller-refactor
+
+Refactor rpython.rtyper.controllerentry.
diff --git a/rpython/memory/gctransform/shadowstack.py b/rpython/memory/gctransform/shadowstack.py
--- a/rpython/memory/gctransform/shadowstack.py
+++ b/rpython/memory/gctransform/shadowstack.py
@@ -75,6 +75,7 @@
         BaseRootWalker.__init__(self, gctransformer)
         # NB. 'self' is frozen, but we can use self.gcdata to store state
         gcdata = self.gcdata
+        gcdata.can_look_at_partial_stack = True
 
         def incr_stack(n):
             top = gcdata.root_stack_top
@@ -109,7 +110,19 @@
         BaseRootWalker.setup_root_walker(self)
 
     def walk_stack_roots(self, collect_stack_root, is_minor=False):
+        # Note that if we're the first minor collection after a thread
+        # switch, then we also need to disable the 'is_minor'
+        # optimization.  The reason is subtle: we need to walk the whole
+        # stack because otherwise, we can be in the middle of an
+        # incremental major collection, and the new stack was just moved
+        # off a ShadowStackRef object (gctransform/shadowstack.py) which
+        # was not seen yet.  We might completely miss some old objects
+        # from the parts of that stack that are skipped by this is_minor
+        # optimization.
         gcdata = self.gcdata
+        if is_minor and not gcdata.can_look_at_partial_stack:
+            is_minor = False
+            gcdata.can_look_at_partial_stack = True
         walk_stack_root(self.invoke_collect_stack_root, collect_stack_root,
                         None, gcdata.root_stack_base, gcdata.root_stack_top,
                         is_minor=is_minor)
@@ -298,6 +311,7 @@
                   "restore_state_from: broken shadowstack")
         self.gcdata.root_stack_base = shadowstackref.base
         self.gcdata.root_stack_top  = shadowstackref.top
+        self.gcdata.can_look_at_partial_stack = False
         self._cleanup(shadowstackref)
 
     def start_fresh_new_state(self):
diff --git a/rpython/rtyper/controllerentry.py b/rpython/rtyper/controllerentry.py
--- a/rpython/rtyper/controllerentry.py
+++ b/rpython/rtyper/controllerentry.py
@@ -1,6 +1,10 @@
+from rpython.flowspace.model import Constant
+from rpython.flowspace.operation import op
 from rpython.annotator import model as annmodel
 from rpython.tool.pairtype import pairtype
 from rpython.annotator.bookkeeper import getbookkeeper
+from rpython.rlib.objectmodel import specialize
+from rpython.rtyper.rmodel import Repr
 from rpython.rtyper.extregistry import ExtRegistryEntry
 from rpython.rtyper.annlowlevel import cachedtype
 from rpython.rtyper.error import TyperError
@@ -10,7 +14,14 @@
 
     def compute_result_annotation(self, *args_s, **kwds_s):
         controller = self.getcontroller(*args_s, **kwds_s)
-        return controller.ctrl_new_ex(self.bookkeeper, *args_s, **kwds_s)
+        if kwds_s:
+            raise TypeError("cannot handle keyword arguments in %s" % (
+                self.new,))
+        s_real_obj = delegate(controller.new, *args_s)
+        if s_real_obj == annmodel.s_ImpossibleValue:
+            return annmodel.s_ImpossibleValue
+        else:
+            return SomeControlledInstance(s_real_obj, controller)
 
     def getcontroller(self, *args_s, **kwds_s):
         return self._controller_()
@@ -19,9 +30,10 @@
         if hop.s_result == annmodel.s_ImpossibleValue:
             raise TyperError("object creation always raises: %s" % (
                 hop.spaceop,))
+        assert not kwds_i
         controller = hop.s_result.controller
-        return controller.rtype_new(hop, **kwds_i)
-
+        return rtypedelegate(controller.new, hop, revealargs=[],
+            revealresult=True)
 
 
 def controlled_instance_box(controller, obj):
@@ -53,91 +65,25 @@
     def _freeze_(self):
         return True
 
+    @specialize.arg(0)
     def box(self, obj):
         return controlled_instance_box(self, obj)
-    box._annspecialcase_ = 'specialize:arg(0)'
 
+    @specialize.arg(0)
     def unbox(self, obj):
         return controlled_instance_unbox(self, obj)
-    unbox._annspecialcase_ = 'specialize:arg(0)'
 
+    @specialize.arg(0)
     def is_box(self, obj):
         return controlled_instance_is_box(self, obj)
-    is_box._annspecialcase_ = 'specialize:arg(0)'
 
-    def ctrl_new(self, *args_s, **kwds_s):
-        if kwds_s:
-            raise TypeError("cannot handle keyword arguments in %s" % (
-                self.new,))
-        s_real_obj = delegate(self.new, *args_s)
-        if s_real_obj == annmodel.s_ImpossibleValue:
-            return annmodel.s_ImpossibleValue
-        else:
-            return SomeControlledInstance(s_real_obj, controller=self)
-
-    def ctrl_new_ex(self, bookkeeper, *args_s, **kwds_s):
-        return self.ctrl_new(*args_s, **kwds_s)
-
-    def rtype_new(self, hop):
-        from rpython.rtyper.rcontrollerentry import rtypedelegate
-        return rtypedelegate(self.new, hop, revealargs=[], revealresult=True)
-
+    @specialize.arg(0, 2)
     def getattr(self, obj, attr):
         return getattr(self, 'get_' + attr)(obj)
-    getattr._annspecialcase_ = 'specialize:arg(0, 2)'
 
-    def ctrl_getattr(self, s_obj, s_attr):
-        return delegate(self.getattr, s_obj, s_attr)
-
-    def rtype_getattr(self, hop):
-        from rpython.rtyper.rcontrollerentry import rtypedelegate
-        return rtypedelegate(self.getattr, hop)
-
+    @specialize.arg(0, 2)
     def setattr(self, obj, attr, value):
         return getattr(self, 'set_' + attr)(obj, value)
-    setattr._annspecialcase_ = 'specialize:arg(0, 2)'
-
-    def ctrl_setattr(self, s_obj, s_attr, s_value):
-        return delegate(self.setattr, s_obj, s_attr, s_value)
-
-    def rtype_setattr(self, hop):
-        from rpython.rtyper.rcontrollerentry import rtypedelegate
-        return rtypedelegate(self.setattr, hop)
-
-    def ctrl_getitem(self, s_obj, s_key):
-        return delegate(self.getitem, s_obj, s_key)
-
-    def rtype_getitem(self, hop):
-        from rpython.rtyper.rcontrollerentry import rtypedelegate
-        return rtypedelegate(self.getitem, hop)
-
-    def ctrl_setitem(self, s_obj, s_key, s_value):
-        return delegate(self.setitem, s_obj, s_key, s_value)
-
-    def rtype_setitem(self, hop):
-        from rpython.rtyper.rcontrollerentry import rtypedelegate
-        return rtypedelegate(self.setitem, hop)
-
-    def ctrl_delitem(self, s_obj, s_key):
-        return delegate(self.delitem, s_obj, s_key)
-
-    def rtype_delitem(self, hop):
-        from rpython.rtyper.rcontrollerentry import rtypedelegate
-        return rtypedelegate(self.delitem, hop)
-
-    def ctrl_bool(self, s_obj):
-        return delegate(self.bool, s_obj)
-
-    def rtype_bool(self, hop):
-        from rpython.rtyper.rcontrollerentry import rtypedelegate
-        return rtypedelegate(self.bool, hop)
-
-    def ctrl_call(self, s_obj, *args_s):
-        return delegate(self.call, s_obj, *args_s)
-
-    def rtype_call(self, hop):
-        from rpython.rtyper.rcontrollerentry import rtypedelegate
-        return rtypedelegate(self.call, hop)
 
 
 def delegate(boundmethod, *args_s):
@@ -158,7 +104,6 @@
             return SomeControlledInstance(s_real_obj, controller=controller)
 
     def specialize_call(self, hop):
-        from rpython.rtyper.rcontrollerentry import ControlledInstanceRepr
         if not isinstance(hop.r_result, ControlledInstanceRepr):
             raise TyperError("box() should return ControlledInstanceRepr,\n"
                              "got %r" % (hop.r_result,))
@@ -176,7 +121,6 @@
             return s_obj.s_real_obj
 
     def specialize_call(self, hop):
-        from rpython.rtyper.rcontrollerentry import ControlledInstanceRepr
         if not isinstance(hop.args_r[1], ControlledInstanceRepr):
             raise TyperError("unbox() should take a ControlledInstanceRepr,\n"
                              "got %r" % (hop.args_r[1],))
@@ -219,41 +163,40 @@
         return SomeControlledInstance(self.s_real_obj, self.controller)
 
     def rtyper_makerepr(self, rtyper):
-        from rpython.rtyper.rcontrollerentry import ControlledInstanceRepr
         return ControlledInstanceRepr(rtyper, self.s_real_obj, self.controller)
 
     def rtyper_makekey(self):
         real_key = self.s_real_obj.rtyper_makekey()
         return self.__class__, real_key, self.controller
 
+    def getattr(self, s_attr):
+        assert s_attr.is_constant()
+        ctrl = self.controller
+        return delegate(ctrl.getattr, self.s_real_obj, s_attr)
 
-class __extend__(SomeControlledInstance):
+    def setattr(self, s_attr, s_value):
+        assert s_attr.is_constant()
+        ctrl = self.controller
+        return delegate(ctrl.setattr, self.s_real_obj, s_attr, s_value)
 
-    def getattr(s_cin, s_attr):
-        assert s_attr.is_constant()
-        return s_cin.controller.ctrl_getattr(s_cin.s_real_obj, s_attr)
+    def bool(self):
+        ctrl = self.controller
+        return delegate(ctrl.bool, self.s_real_obj)
 
-    def setattr(s_cin, s_attr, s_value):
-        assert s_attr.is_constant()
-        s_cin.controller.ctrl_setattr(s_cin.s_real_obj, s_attr, s_value)
-
-    def bool(s_cin):
-        return s_cin.controller.ctrl_is_true(s_cin.s_real_obj)
-
-    def simple_call(s_cin, *args_s):
-        return s_cin.controller.ctrl_call(s_cin.s_real_obj, *args_s)
+    def simple_call(self, *args_s):
+        return delegate(self.controller.call, self.s_real_obj, *args_s)
 
 
 class __extend__(pairtype(SomeControlledInstance, annmodel.SomeObject)):
 
     def getitem((s_cin, s_key)):
-        return s_cin.controller.ctrl_getitem(s_cin.s_real_obj, s_key)
+        return delegate(s_cin.controller.getitem, s_cin.s_real_obj, s_key)
 
     def setitem((s_cin, s_key), s_value):
-        s_cin.controller.ctrl_setitem(s_cin.s_real_obj, s_key, s_value)
+        delegate(s_cin.controller.setitem, s_cin.s_real_obj, s_key, s_value)
 
     def delitem((s_cin, s_key)):
-        s_cin.controller.ctrl_delitem(s_cin.s_real_obj, s_key)
+        delegate(s_cin.controller.delitem, s_cin.s_real_obj, s_key)
 
 
 class __extend__(pairtype(SomeControlledInstance, SomeControlledInstance)):
@@ -264,3 +207,75 @@
         return SomeControlledInstance(annmodel.unionof(s_cin1.s_real_obj,
                                                        s_cin2.s_real_obj),
                                       s_cin1.controller)
+
+class ControlledInstanceRepr(Repr):
+
+    def __init__(self, rtyper, s_real_obj, controller):
+        self.rtyper = rtyper
+        self.s_real_obj = s_real_obj
+        self.r_real_obj = rtyper.getrepr(s_real_obj)
+        self.controller = controller
+        self.lowleveltype = self.r_real_obj.lowleveltype
+
+    def convert_const(self, value):
+        real_value = self.controller.convert(value)
+        return self.r_real_obj.convert_const(real_value)
+
+    def reveal(self, r):
+        if r is not self:
+            raise TyperError("expected %r, got %r" % (self, r))
+        return self.s_real_obj, self.r_real_obj
+
+    def rtype_getattr(self, hop):
+        return rtypedelegate(self.controller.getattr, hop)
+
+    def rtype_setattr(self, hop):
+        return rtypedelegate(self.controller.setattr, hop)
+
+    def rtype_bool(self, hop):
+        return rtypedelegate(self.controller.bool, hop)
+
+    def rtype_simple_call(self, hop):
+        return rtypedelegate(self.controller.call, hop)
+
+
+class __extend__(pairtype(ControlledInstanceRepr, Repr)):
+
+    def rtype_getitem((r_controlled, r_key), hop):
+        return rtypedelegate(r_controlled.controller.getitem, hop)
+
+    def rtype_setitem((r_controlled, r_key), hop):
+        return rtypedelegate(r_controlled.controller.setitem, hop)
+
+    def rtype_delitem((r_controlled, r_key), hop):
+        return rtypedelegate(r_controlled.controller.delitem, hop)
+
+
+def rtypedelegate(callable, hop, revealargs=[0], revealresult=False):
+    bk = hop.rtyper.annotator.bookkeeper
+    c_meth = Constant(callable)
+    s_meth = bk.immutablevalue(callable)
+    hop2 = hop.copy()
+    for index in revealargs:
+        r_controlled = hop2.args_r[index]
+        if not isinstance(r_controlled, ControlledInstanceRepr):
+            raise TyperError("args_r[%d] = %r, expected ControlledInstanceRepr"
+                             % (index, r_controlled))
+        s_new, r_new = r_controlled.s_real_obj, r_controlled.r_real_obj
+        hop2.args_s[index], hop2.args_r[index] = s_new, r_new
+        v = hop2.args_v[index]
+        if isinstance(v, Constant):
+            real_value = r_controlled.controller.convert(v.value)
+            hop2.args_v[index] = Constant(real_value)
+    if revealresult:
+        r_controlled = hop2.r_result
+        if not isinstance(r_controlled, ControlledInstanceRepr):
+            raise TyperError("r_result = %r, expected ControlledInstanceRepr"
+                             % (r_controlled,))
+        s_new, r_new = r_controlled.s_real_obj, r_controlled.r_real_obj
+        hop2.s_result, hop2.r_result = s_new, r_new
+    hop2.v_s_insertfirstarg(c_meth, s_meth)
+    spaceop = op.simple_call(*hop2.args_v)
+    spaceop.result = hop2.spaceop.result
+    hop2.spaceop = spaceop
+    return hop2.dispatch()
diff --git a/rpython/rtyper/rcontrollerentry.py b/rpython/rtyper/rcontrollerentry.py
deleted file mode 100644
--- a/rpython/rtyper/rcontrollerentry.py
+++ /dev/null
@@ -1,78 +0,0 @@
-from rpython.flowspace.model import Constant
-from rpython.flowspace.operation import op
-from rpython.rtyper.error import TyperError
-from rpython.rtyper.rmodel import Repr
-from rpython.tool.pairtype import pairtype
-
-
-class ControlledInstanceRepr(Repr):
-
-    def __init__(self, rtyper, s_real_obj, controller):
-        self.rtyper = rtyper
-        self.s_real_obj = s_real_obj
-        self.r_real_obj = rtyper.getrepr(s_real_obj)
-        self.controller = controller
-        self.lowleveltype = self.r_real_obj.lowleveltype
-
-    def convert_const(self, value):
-        real_value = self.controller.convert(value)
-        return self.r_real_obj.convert_const(real_value)
-
-    def reveal(self, r):
-        if r is not self:
-            raise TyperError("expected %r, got %r" % (self, r))
-        return self.s_real_obj, self.r_real_obj
-
-    def rtype_getattr(self, hop):
-        return self.controller.rtype_getattr(hop)
-
-    def rtype_setattr(self, hop):
-        return self.controller.rtype_setattr(hop)
-
-    def rtype_bool(self, hop):
-        return self.controller.rtype_bool(hop)
-
-    def rtype_simple_call(self, hop):
-        return self.controller.rtype_call(hop)
-
-
-class __extend__(pairtype(ControlledInstanceRepr, Repr)):
-
-    def rtype_getitem((r_controlled, r_key), hop):
-        return r_controlled.controller.rtype_getitem(hop)
-
-    def rtype_setitem((r_controlled, r_key), hop):
-        return r_controlled.controller.rtype_setitem(hop)
-
-    def rtype_delitem((r_controlled, r_key), hop):
-        return r_controlled.controller.rtype_delitem(hop)
-
-
-def rtypedelegate(callable, hop, revealargs=[0], revealresult=False):
-    bk = hop.rtyper.annotator.bookkeeper
-    c_meth = Constant(callable)
-    s_meth = bk.immutablevalue(callable)
-    hop2 = hop.copy()
-    for index in revealargs:
-        r_controlled = hop2.args_r[index]
-        if not isinstance(r_controlled, ControlledInstanceRepr):
-            raise TyperError("args_r[%d] = %r, expected ControlledInstanceRepr"
-                             % (index, r_controlled))
-        s_new, r_new = r_controlled.s_real_obj, r_controlled.r_real_obj
-        hop2.args_s[index], hop2.args_r[index] = s_new, r_new
-        v = hop2.args_v[index]
-        if isinstance(v, Constant):
-            real_value = r_controlled.controller.convert(v.value)
-            hop2.args_v[index] = Constant(real_value)
-    if revealresult:
-        r_controlled = hop2.r_result
-        if not isinstance(r_controlled, ControlledInstanceRepr):
-            raise TyperError("r_result = %r, expected ControlledInstanceRepr"
-                             % (r_controlled,))
-        s_new, r_new = r_controlled.s_real_obj, r_controlled.r_real_obj
-        hop2.s_result, hop2.r_result = s_new, r_new
-    hop2.v_s_insertfirstarg(c_meth, s_meth)
-    spaceop = op.simple_call(*hop2.args_v)
-    spaceop.result = hop2.spaceop.result
-    hop2.spaceop = spaceop
-    return hop2.dispatch()

From pypy.commits at gmail.com  Thu Apr 27 12:04:19 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 27 Apr 2017 09:04:19 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: hg merge py3.5
Message-ID: <59021683.82461c0a.43e1c.229b@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91140:31b70719e9ba
Date: 2017-04-27 17:03 +0100
http://bitbucket.org/pypy/pypy/changeset/31b70719e9ba/

Log:	hg merge py3.5

diff too long, truncating to 2000 out of 2287 lines

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -51,6 +51,11 @@
 ^rpython/translator/goal/target.+-c$
 ^rpython/translator/goal/.+\.exe$
 ^rpython/translator/goal/.+\.dll$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/Makefile$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.guess$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.h$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.log$
+^rpython/rlib/rvmprof/src/shared/libbacktrace/config.status$
 ^pypy/goal/pypy-translation-snapshot$
 ^pypy/goal/pypy-c
 ^pypy/goal/pypy3-c
diff --git a/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py b/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
--- a/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
+++ b/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
@@ -63,6 +63,12 @@
 */
 
 #ifdef _WIN32
+#ifdef _MSC_VER
+#ifdef inline
+#undef inline
+#endif
+#define inline __inline
+#endif
 #include <Windows.h>
 typedef CRITICAL_SECTION mutex1_t;
 static inline void mutex1_init(mutex1_t *mutex) {
diff --git a/lib_pypy/_lzma_build.py b/lib_pypy/_lzma_build.py
--- a/lib_pypy/_lzma_build.py
+++ b/lib_pypy/_lzma_build.py
@@ -235,6 +235,9 @@
 """)
 
 ffi.set_source('_lzma_cffi', """
+#ifdef _MSC_VER
+#define LZMA_API_STATIC
+#endif
 #include <lzma.h>
 #include <stdlib.h>
 void _pylzma_stream_init(lzma_stream *strm) {
diff --git a/lib_pypy/_md5.py b/lib_pypy/_md5.py
--- a/lib_pypy/_md5.py
+++ b/lib_pypy/_md5.py
@@ -53,10 +53,10 @@
     j = 0
     i = 0
     while i < imax:
-        b0 = ord(list[j])
-        b1 = ord(list[j+1]) << 8
-        b2 = ord(list[j+2]) << 16
-        b3 = ord(list[j+3]) << 24
+        b0 = list[j]
+        b1 = list[j+1] << 8
+        b2 = list[j+2] << 16
+        b3 = list[j+3] << 24
         hl[i] = b0 | b1 |b2 | b3
         i = i+1
         j = j+4
@@ -319,7 +319,7 @@
         else:
             padLen = 120 - index
 
-        padding = [b'\200'] + [b'\000'] * 63
+        padding = [128] + [0] * 63
         self.update(padding[:padLen])
 
         # Append length (before padding).
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -28,3 +28,9 @@
 Performance tweaks in the x86 JIT-generated machine code: rarely taken
 blocks are moved off-line.  Also, the temporary register used to contain
 large constants is reused across instructions.
+
+.. branch: vmprof-0.4.4
+
+.. branch: controller-refactor
+
+Refactor rpython.rtyper.controllerentry.
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -27,7 +27,7 @@
 made it available as the `Microsoft Visual C++ Compiler for Python 2.7`_ (the link
 was checked in Nov 2016). Note that the compiler suite will be installed in
 ``C:\Users\<user name>\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python``.
-Using a current version of ``setuptools`` will be able to find it there. For
+A current version of ``setuptools`` will be able to find it there. For
 Windows 10, you must right-click the download, and under ``Properties`` ->
 ``Compatibility`` mark it as ``Run run this program in comatibility mode for``
 ``Previous version...``. Also, you must download and install the ``.Net Framework 3.5``,
@@ -40,8 +40,9 @@
 Translating PyPy with Visual Studio
 -----------------------------------
 
-We routinely test translation using Visual Studio 2008, Express
-Edition.  Other configurations may work as well.
+We routinely test translation using v9, also known as Visual Studio 2008.
+Our buildbot is still using the Express Edition, not the compiler noted above.
+Other configurations may work as well.
 
 The translation scripts will set up the appropriate environment variables
 for the compiler, so you do not need to run vcvars before translation.
@@ -117,6 +118,9 @@
 -----------------------------------------------------------
 
 Download the versions of all the external packages from
+https://bitbucket.org/pypy/pypy/downloads/local_5.8.zip
+(for post-5.7.1 builds) with sha256 checksum 
+``f1510452293f22e84d6059464e11f4c62ffd0e2ee97a52be9195bec8a70c6dce`` or
 https://bitbucket.org/pypy/pypy/downloads/local_2.4.zip
 (for 2.4 release and later) or
 https://bitbucket.org/pypy/pypy/downloads/local.zip
@@ -173,13 +177,14 @@
 The zlib compression library
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Download http://www.gzip.org/zlib/zlib-1.2.3.tar.gz and extract it in
-the base directory.  Then compile as a static library::
+Download http://www.gzip.org/zlib/zlib-1.2.11.tar.gz and extract it in
+the base directory.  Then compile::
 
-    cd zlib-1.2.3
+    cd zlib-1.2.11
     nmake -f win32\Makefile.msc
     copy zlib.lib <somewhere in LIB>
     copy zlib.h zconf.h <somewhere in INCLUDE>
+    copy zlib1.dll <in PATH> # (needed for tests via ll2ctypes)
 
 
 The bz2 compression library
@@ -198,22 +203,23 @@
 
 PyPy uses cffi to interact with sqlite3.dll. Only the dll is needed, the cffi
 wrapper is compiled when the module is imported for the first time.
-The sqlite3.dll should be version 3.6.21 for CPython2.7 compatablility.
+The sqlite3.dll should be version 3.8.11 for CPython2.7 compatablility.
 
 
 The expat XML parser
 ~~~~~~~~~~~~~~~~~~~~
 
 Download the source code of expat on sourceforge:
-http://sourceforge.net/projects/expat/ and extract it in the base directory.
-Version 2.1.0 is known to pass tests. Then open the project file ``expat.dsw``
+https://github.com/libexpat/libexpat/releases and extract it in the base directory.
+Version 2.1.1 is known to pass tests. Then open the project file ``expat.dsw``
 with Visual Studio; follow the instruction for converting the project files,
 switch to the "Release" configuration, use the ``expat_static`` project,
-reconfigure the runtime for Multi-threaded DLL (/MD) and build.
+reconfigure the runtime for Multi-threaded DLL (/MD) and build. Do the same for
+the ``expat`` project to build the ``expat.dll`` (for tests via ll2ctypes)
 
-Then, copy the file ``win32\bin\release\libexpat.lib`` somewhere in somewhere
-in LIB, and both ``lib\expat.h`` and ``lib\expat_external.h`` somewhere in
-INCLUDE.
+Then, copy the file ``win32\bin\release\libexpat.lib`` into
+LIB, and both ``lib\expat.h`` and ``lib\expat_external.h`` in
+INCLUDE, and ``win32\bin\release\libexpat.dll`` into PATH.
 
 
 The OpenSSL library
@@ -222,15 +228,13 @@
 OpenSSL needs a Perl interpreter to configure its makefile.  You may
 use the one distributed by ActiveState, or the one from cygwin.::
 
-    svn export http://svn.python.org/projects/external/openssl-1.0.1i
-    cd openssl-1.0.1i
+    svn export http://svn.python.org/projects/external/openssl-1.0.2k
+    cd openssl-1.0.2k
     perl Configure VC-WIN32 no-idea no-mdc2
     ms\do_ms.bat
     nmake -f ms\nt.mak install
-
-Then, copy the files ``out32\*.lib`` somewhere in
-somewhere in LIB, and the entire ``include\openssl`` directory as-is somewhere
-in INCLUDE.
+    copy out32\*.lib <somewhere in LIB>
+    xcopy /S include\openssl <somewhere in INCLUDE>
 
 
 TkInter module support
@@ -263,6 +267,9 @@
 http://tukaani.org/xz/xz-5.0.5-windows.zip, check the signature
 http://tukaani.org/xz/xz-5.0.5-windows.zip.sig
 
+Then copy the headers to the include directory, rename ``liblzma.a`` to 
+``lzma.lib`` and copy it to the lib directory
+
 
 Using the mingw compiler
 ------------------------
diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -321,6 +321,11 @@
         elif config.objspace.usemodules.pypyjit:
             config.translation.jit = True
 
+        if config.translation.sandbox:
+            assert 0, ("--sandbox is not tested nor maintained.  If you "
+                       "really want to try it anyway, remove this line in "
+                       "pypy/goal/targetpypystandalone.py.")
+
         if config.objspace.usemodules.cpyext:
             if config.translation.gc not in ('incminimark', 'boehm'):
                 raise Exception("The 'cpyext' module requires the 'incminimark'"
diff --git a/pypy/interpreter/test/test_syntax.py b/pypy/interpreter/test/test_syntax.py
--- a/pypy/interpreter/test/test_syntax.py
+++ b/pypy/interpreter/test/test_syntax.py
@@ -315,7 +315,7 @@
         s = """
 from __future__ import unicode_literals; from __future__ import print_function
 """
-        exec s in {}
+        exec(s, {})
 
 
 class AppTestComprehensions:
diff --git a/pypy/module/_vmprof/__init__.py b/pypy/module/_vmprof/__init__.py
--- a/pypy/module/_vmprof/__init__.py
+++ b/pypy/module/_vmprof/__init__.py
@@ -12,6 +12,8 @@
         'enable': 'interp_vmprof.enable',
         'disable': 'interp_vmprof.disable',
         'write_all_code_objects': 'interp_vmprof.write_all_code_objects',
+        'is_enabled': 'interp_vmprof.is_enabled',
+        'get_profile_path': 'interp_vmprof.get_profile_path',
         'VMProfError': 'space.fromcache(interp_vmprof.Cache).w_VMProfError',
     }
 
diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -4,6 +4,7 @@
 from pypy.interpreter.pycode import PyCode
 from pypy.interpreter.baseobjspace import W_Root
 from rpython.rlib import rvmprof, jit
+from pypy.interpreter.error import oefmt
 
 # ____________________________________________________________
 
@@ -82,3 +83,16 @@
         rvmprof.disable()
     except rvmprof.VMProfError as e:
         raise VMProfError(space, e)
+
+def is_enabled(space):
+    return space.newbool(rvmprof.is_enabled())
+
+def get_profile_path(space):
+    path = rvmprof.get_profile_path(space)
+    if path is None:
+        # profiling is not enabled
+        return space.w_None
+    if path == "":
+        # Indicates an error! Assume platform does not implement the function call
+        raise oefmt(space.w_NotImplementedError, "platform not implemented")
+    return space.newtext(path)
diff --git a/pypy/module/_vmprof/test/test__vmprof.py b/pypy/module/_vmprof/test/test__vmprof.py
--- a/pypy/module/_vmprof/test/test__vmprof.py
+++ b/pypy/module/_vmprof/test/test__vmprof.py
@@ -97,3 +97,24 @@
         raises(_vmprof.VMProfError, _vmprof.enable, 2, 1e300 * 1e300, 0, 0, 0)
         NaN = (1e300*1e300) / (1e300*1e300)
         raises(_vmprof.VMProfError, _vmprof.enable, 2, NaN, 0, 0, 0)
+
+    def test_is_enabled(self):
+        import _vmprof
+        tmpfile = open(self.tmpfilename, 'wb')
+        assert _vmprof.is_enabled() is False
+        _vmprof.enable(tmpfile.fileno(), 0.01, 0, 0, 0)
+        assert _vmprof.is_enabled() is True
+        _vmprof.disable()
+        assert _vmprof.is_enabled() is False
+
+    def test_get_profile_path(self):
+        import _vmprof
+        tmpfile = open(self.tmpfilename, 'wb')
+        assert _vmprof.get_profile_path() is None
+        _vmprof.enable(tmpfile.fileno(), 0.01, 0, 0, 0)
+        path = _vmprof.get_profile_path()
+        if path != tmpfile.name:
+            with open(path, "rb") as fd1:
+                assert fd1.read() == tmpfile.read()
+        _vmprof.disable()
+        assert _vmprof.get_profile_path() is None
diff --git a/pypy/module/cpyext/test/issue2482.c b/pypy/module/cpyext/test/issue2482.c
new file mode 100644
--- /dev/null
+++ b/pypy/module/cpyext/test/issue2482.c
@@ -0,0 +1,107 @@
+
+#include "Python.h"
+//#define ISSUE_2482
+
+typedef struct {
+    PyObject_HEAD
+    // Some extra storage:
+    char blank[500];
+} instance;
+
+static PyObject * get_basicsize(PyObject *self, PyObject * arg)
+{
+    return PyLong_FromLong(((PyTypeObject*)arg)->tp_basicsize);
+}
+
+const char *name = "issue2482_object";
+static
+PyObject *make_object_base_type(void) {
+
+    PyHeapTypeObject *heap_type = (PyHeapTypeObject *) PyType_Type.tp_alloc(&PyType_Type, 0);
+    if (!heap_type) return NULL;
+
+    PyTypeObject *type = &heap_type->ht_type;
+    type->tp_name = name;
+#ifdef ISSUE_2482
+    type->tp_base = &PyBaseObject_Type; /*fails */
+#else 
+    type->tp_base = &PyType_Type;
+#endif
+    type->tp_basicsize = sizeof(instance);
+    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
+
+    if (PyType_Ready(type) < 0)
+        return NULL;
+
+    return (PyObject *) heap_type;
+};
+
+static PyMethodDef issue2482_functions[] = {
+    {"get_basicsize", (PyCFunction)get_basicsize, METH_O, NULL},
+    {NULL,        NULL}    /* Sentinel */
+};
+
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef moduledef = {
+    PyModuleDef_HEAD_INIT,
+    "issue2482",
+    "Module Doc",
+    -1,
+    issue2482_functions, 
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+};
+#define INITERROR return NULL
+
+/* Initialize this module. */
+#ifdef __GNUC__
+extern __attribute__((visibility("default")))
+#else
+extern __declspec(dllexport)
+#endif
+
+PyMODINIT_FUNC
+PyInit_issue2482(void)
+
+#else
+
+#define INITERROR return
+
+/* Initialize this module. */
+#ifdef __GNUC__
+extern __attribute__((visibility("default")))
+#else
+extern __declspec(dllexport)
+#endif
+
+PyMODINIT_FUNC
+initissue2482(void)
+#endif
+{
+#if PY_MAJOR_VERSION >= 3
+    PyObject *module = PyModule_Create(&moduledef);
+#else
+    PyObject *module = Py_InitModule("issue2482", issue2482_functions);
+#endif
+    if (module == NULL)
+        INITERROR;
+
+    PyHeapTypeObject *heap_type = (PyHeapTypeObject *) PyType_Type.tp_alloc(&PyType_Type, 0);
+    if (!heap_type) INITERROR;
+
+    PyTypeObject *type = &heap_type->ht_type;
+    type->tp_name = name;
+
+    PyObject *base = make_object_base_type();
+    if (! base) INITERROR;
+    Py_INCREF(base);
+    type->tp_base = (PyTypeObject *) base;
+    type->tp_basicsize = ((PyTypeObject *) base)->tp_basicsize;
+    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE | Py_TPFLAGS_CHECKTYPES;
+
+    if (PyType_Ready(type) < 0) INITERROR;
+
+    PyModule_AddObject(module, name, (PyObject *) type);
+};
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -1210,3 +1210,27 @@
         # doesn't call tp_getattr at all, also on CPython
         raises(AttributeError, type(module.gettype1).__getattribute__,
                                module.gettype1, 'dcBA')
+
+    def test_multiple_inheritance_tp_basicsize(self):
+        module = self.import_module(name='issue2482')
+
+        class PyBase(object):
+            pass
+
+        basesize = module.get_basicsize(PyBase)
+
+        CBase = module.issue2482_object
+        class A(CBase, PyBase):
+            def __init__(self, i):
+                CBase.__init__(self)
+                PyBase.__init__(self)
+
+        class B(PyBase, CBase):
+            def __init__(self, i):
+                PyBase.__init__(self)
+                CBase.__init__(self)
+
+        Asize = module.get_basicsize(A)
+        Bsize = module.get_basicsize(B)
+        assert Asize == Bsize
+        assert Asize > basesize
diff --git a/pypy/module/test_lib_pypy/test_md5_extra.py b/pypy/module/test_lib_pypy/test_md5_extra.py
--- a/pypy/module/test_lib_pypy/test_md5_extra.py
+++ b/pypy/module/test_lib_pypy/test_md5_extra.py
@@ -36,32 +36,32 @@
     def test_update(self):
         """Test updating cloned objects."""
         cases = (
-            "123",
-            "1234",
-            "12345",
-            "123456",
-            "1234567",
-            "12345678",
-            "123456789 123456789 123456789 ",
-            "123456789 123456789 ",
-            "123456789 123456789 1",
-            "123456789 123456789 12",
-            "123456789 123456789 123",
-            "123456789 123456789 1234",
-            "123456789 123456789 123456789 1",
-            "123456789 123456789 123456789 12",
-            "123456789 123456789 123456789 123",
-            "123456789 123456789 123456789 1234",
-            "123456789 123456789 123456789 12345",
-            "123456789 123456789 123456789 123456",
-            "123456789 123456789 123456789 1234567",
-            "123456789 123456789 123456789 12345678",
+            b"123",
+            b"1234",
+            b"12345",
+            b"123456",
+            b"1234567",
+            b"12345678",
+            b"123456789 123456789 123456789 ",
+            b"123456789 123456789 ",
+            b"123456789 123456789 1",
+            b"123456789 123456789 12",
+            b"123456789 123456789 123",
+            b"123456789 123456789 1234",
+            b"123456789 123456789 123456789 1",
+            b"123456789 123456789 123456789 12",
+            b"123456789 123456789 123456789 123",
+            b"123456789 123456789 123456789 1234",
+            b"123456789 123456789 123456789 12345",
+            b"123456789 123456789 123456789 123456",
+            b"123456789 123456789 123456789 1234567",
+            b"123456789 123456789 123456789 12345678",
             )
         space = self.space
         w__md5 = import_lib_pypy(space, '_md5')
 
         # Load both with same prefix.
-        prefix1 = 2**10 * 'a'
+        prefix1 = 2**10 * b'a'
 
         # The host md5
         m1 = md5.md5()
@@ -70,17 +70,15 @@
 
         # The app-level _md5
         w_m2 = space.call_method(w__md5, 'md5')
-        space.call_method(w_m2, 'update', space.wrap(prefix1))
+        space.call_method(w_m2, 'update', space.newbytes(prefix1))
         w_m2c = space.call_method(w_m2, 'copy')
 
         # Update and compare...
-        for i in range(len(cases)):
-            message = cases[i][0]
-
+        for message in cases:
             m1c.update(message)
             d1 = m1c.hexdigest()
 
-            space.call_method(w_m2c, 'update', space.wrap(message))
+            space.call_method(w_m2c, 'update', space.newbytes(message))
             w_d2 = space.call_method(w_m2c, 'hexdigest')
             d2 = space.str_w(w_d2)
 
@@ -138,78 +136,73 @@
     def test1(self):
         """Test cases with known digest result."""
         cases = (
-            ("",
+            (b"",
              "d41d8cd98f00b204e9800998ecf8427e"),
-            ("a",
+            (b"a",
              "0cc175b9c0f1b6a831c399e269772661"),
-            ("abc",
+            (b"abc",
              "900150983cd24fb0d6963f7d28e17f72"),
-            ("message digest",
+            (b"message digest",
              "f96b697d7cb7938d525a2f31aaf161d0"),
-            ("abcdefghijklmnopqrstuvwxyz",
+            (b"abcdefghijklmnopqrstuvwxyz",
              "c3fcd3d76192e4007dfb496cca67e13b"),
-            ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+            (b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
              "d174ab98d277d9f5a5611c2c9f419d9f"),
-            ("1234567890"*8,
+            (b"1234567890"*8,
              "57edf4a22be3c955ac49da2e2107b67a"),
             )
 
-        for i in range(len(cases)):
-            res = self.compare(cases[i][0])
+        for message, expectedResult in cases:
+            res = self.compare(message)
             if res is not None:
                 d1, d2 = res
-                message, expectedResult = cases[i][0], None
-                if len(cases[i]) == 2:
-                    expectedResult = cases[i][1]
                 self.print_diff(message, d1, d2, expectedResult)
             assert res is None
 
     def test2(self):
         """Test cases without known digest result."""
         cases = (
-            "123",
-            "1234",
-            "12345",
-            "123456",
-            "1234567",
-            "12345678",
-            "123456789 123456789 123456789 ",
-            "123456789 123456789 ",
-            "123456789 123456789 1",
-            "123456789 123456789 12",
-            "123456789 123456789 123",
-            "123456789 123456789 1234",
-            "123456789 123456789 123456789 1",
-            "123456789 123456789 123456789 12",
-            "123456789 123456789 123456789 123",
-            "123456789 123456789 123456789 1234",
-            "123456789 123456789 123456789 12345",
-            "123456789 123456789 123456789 123456",
-            "123456789 123456789 123456789 1234567",
-            "123456789 123456789 123456789 12345678",
+            b"123",
+            b"1234",
+            b"12345",
+            b"123456",
+            b"1234567",
+            b"12345678",
+            b"123456789 123456789 123456789 ",
+            b"123456789 123456789 ",
+            b"123456789 123456789 1",
+            b"123456789 123456789 12",
+            b"123456789 123456789 123",
+            b"123456789 123456789 1234",
+            b"123456789 123456789 123456789 1",
+            b"123456789 123456789 123456789 12",
+            b"123456789 123456789 123456789 123",
+            b"123456789 123456789 123456789 1234",
+            b"123456789 123456789 123456789 12345",
+            b"123456789 123456789 123456789 123456",
+            b"123456789 123456789 123456789 1234567",
+            b"123456789 123456789 123456789 12345678",
             )
 
-        for i in range(len(cases)):
-            res = self.compare(cases[i][0])
+        for message in cases:
+            res = self.compare(message)
             if res is not None:
                 d1, d2 = res
-                message = cases[i][0]
                 self.print_diff(message, d1, d2)
             assert res is None
 
     def test3(self):
         """Test cases with long messages (can take a while)."""
         cases = (
-            (2**10*'a',),
-            (2**10*'abcd',),
-            #(2**20*'a',),  # 1 MB, takes about 160 sec. on a 233 Mhz Pentium.
+            2**10*b'a',
+            2**10*b'abcd',
+            #2**20*b'a',  # 1 MB, takes about 160 sec. on a 233 Mhz Pentium.
             )
 
-        for i in range(len(cases)):
-            res = self.compare(cases[i][0])
+        for message in cases:
+            res = self.compare(message)
             if res is not None:
                 d1, d2 = res
-                message = cases[i][0]
                 self.print_diff(message, d1, d2)
             assert res is None
 
@@ -217,7 +210,7 @@
         """Test cases with increasingly growing message lengths."""
         i = 0
         while i < 2**5:
-            message = i * 'a'
+            message = i * b'a'
             res = self.compare(message)
             if res is not None:
                 d1, d2 = res
diff --git a/rpython/memory/gctransform/shadowstack.py b/rpython/memory/gctransform/shadowstack.py
--- a/rpython/memory/gctransform/shadowstack.py
+++ b/rpython/memory/gctransform/shadowstack.py
@@ -75,6 +75,7 @@
         BaseRootWalker.__init__(self, gctransformer)
         # NB. 'self' is frozen, but we can use self.gcdata to store state
         gcdata = self.gcdata
+        gcdata.can_look_at_partial_stack = True
 
         def incr_stack(n):
             top = gcdata.root_stack_top
@@ -109,7 +110,19 @@
         BaseRootWalker.setup_root_walker(self)
 
     def walk_stack_roots(self, collect_stack_root, is_minor=False):
+        # Note that if we're the first minor collection after a thread
+        # switch, then we also need to disable the 'is_minor'
+        # optimization.  The reason is subtle: we need to walk the whole
+        # stack because otherwise, we can be in the middle of an
+        # incremental major collection, and the new stack was just moved
+        # off a ShadowStackRef object (gctransform/shadowstack.py) which
+        # was not seen yet.  We might completely miss some old objects
+        # from the parts of that stack that are skipped by this is_minor
+        # optimization.
         gcdata = self.gcdata
+        if is_minor and not gcdata.can_look_at_partial_stack:
+            is_minor = False
+            gcdata.can_look_at_partial_stack = True
         walk_stack_root(self.invoke_collect_stack_root, collect_stack_root,
                         None, gcdata.root_stack_base, gcdata.root_stack_top,
                         is_minor=is_minor)
@@ -298,6 +311,7 @@
                   "restore_state_from: broken shadowstack")
         self.gcdata.root_stack_base = shadowstackref.base
         self.gcdata.root_stack_top  = shadowstackref.top
+        self.gcdata.can_look_at_partial_stack = False
         self._cleanup(shadowstackref)
 
     def start_fresh_new_state(self):
diff --git a/rpython/rlib/rvmprof/__init__.py b/rpython/rlib/rvmprof/__init__.py
--- a/rpython/rlib/rvmprof/__init__.py
+++ b/rpython/rlib/rvmprof/__init__.py
@@ -3,6 +3,7 @@
 from rpython.rlib.rvmprof.rvmprof import vmprof_execute_code, MAX_FUNC_NAME
 from rpython.rlib.rvmprof.rvmprof import _was_registered
 from rpython.rlib.rvmprof.cintf import VMProfPlatformUnsupported
+from rpython.rtyper.lltypesystem import rffi
 
 #
 # See README.txt.
@@ -37,3 +38,21 @@
 
 def disable():
     _get_vmprof().disable()
+
+def is_enabled():
+    vmp = _get_vmprof()
+    return vmp.is_enabled
+
+def get_profile_path(space):
+    vmp = _get_vmprof()
+    if not vmp.is_enabled:
+        return None
+
+    with rffi.scoped_alloc_buffer(4096) as buf:
+        length = vmp.cintf.vmprof_get_profile_path(buf.raw, buf.size) 
+        if length == -1:
+            return ""
+        return buf.str(length)
+
+    return None
+
diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -107,6 +107,10 @@
                                   lltype.Signed, compilation_info=eci,
                                   _nowrapper=True)
 
+    vmprof_get_profile_path = rffi.llexternal("vmprof_get_profile_path", [rffi.CCHARP, lltype.Signed],
+                                              lltype.Signed, compilation_info=eci,
+                                              _nowrapper=True)
+
     return CInterface(locals())
 
 
diff --git a/rpython/rlib/rvmprof/rvmprof.py b/rpython/rlib/rvmprof/rvmprof.py
--- a/rpython/rlib/rvmprof/rvmprof.py
+++ b/rpython/rlib/rvmprof/rvmprof.py
@@ -178,23 +178,6 @@
     arguments given to the decorated function.
 
     'result_class' is ignored (backward compatibility).
-
-    ====================================
-    TRANSLATION NOTE CALL THIS ONLY ONCE
-    ====================================
-
-    This function can only be called once during translation.
-    It generates a C function called __vmprof_eval_vmprof which is used by
-    the vmprof C source code and is bound as an extern function.
-    This is necessary while walking the native stack.
-    If you see __vmprof_eval_vmprof defined twice during
-    translation, read on:
-
-    To remove this restriction do the following:
-
-    *) Extend the macro IS_VMPROF_EVAL in the vmprof source repo to check several
-       sybmols.
-    *) Give each function provided to this decorator a unique symbol name in C
     """
     if _hack_update_stack_untranslated:
         from rpython.rtyper.annlowlevel import llhelper
diff --git a/rpython/rlib/rvmprof/src/rvmprof.c b/rpython/rlib/rvmprof/src/rvmprof.c
--- a/rpython/rlib/rvmprof/src/rvmprof.c
+++ b/rpython/rlib/rvmprof/src/rvmprof.c
@@ -29,3 +29,9 @@
     return ptr == __vmprof_eval_vmprof;
 }
 #endif
+
+
+long vmprof_get_profile_path(const char * buffer, long size)
+{
+    return vmp_fd_to_path(vmp_profile_fileno(), buffer, size);
+}
diff --git a/rpython/rlib/rvmprof/src/rvmprof.h b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -37,6 +37,7 @@
 RPY_EXTERN long vmprof_stack_pop(void*);
 RPY_EXTERN void vmprof_stack_free(void*);
 RPY_EXTERN intptr_t vmprof_get_traceback(void *, void *, intptr_t*, intptr_t);
+RPY_EXTERN long vmprof_get_profile_path(const char *, long);
 
 long vmprof_write_header_for_jit_addr(intptr_t *result, long n,
                                       intptr_t addr, int max_depth);
diff --git a/rpython/rlib/rvmprof/src/shared/_vmprof.c b/rpython/rlib/rvmprof/src/shared/_vmprof.c
--- a/rpython/rlib/rvmprof/src/shared/_vmprof.c
+++ b/rpython/rlib/rvmprof/src/shared/_vmprof.c
@@ -1,8 +1,7 @@
-/*[clinic input]
-module _vmprof
-[clinic start generated code]*/
-/*[clinic end generated code: output=da39a3ee5e6b4b0d input=b443489e38f2be7d]*/
-
+/**
+ * This file is the CPython module _vmprof. It does not share code
+ * with PyPy. PyPy's _vmprof module is included in the main repo.
+ */
 #define _GNU_SOURCE 1
 
 #include <Python.h>
@@ -14,7 +13,7 @@
 static volatile int is_enabled = 0;
 static destructor Original_code_dealloc = 0;
 static PyObject* (*_default_eval_loop)(PyFrameObject *, int) = 0;
-void dump_native_symbols(int fileno);
+void vmp_scan_profile(int fileno, int dump_native, void *all_code_uids);
 
 #if VMPROF_UNIX
 #include "trampoline.h"
@@ -109,6 +108,33 @@
     return 0;
 }
 
+static int _look_for_code_object_seen(PyObject *o, void *all_codes)
+{
+    if (PyCode_Check(o) && PySet_GET_SIZE(all_codes)) {
+        Py_ssize_t i;
+        PyCodeObject *co = (PyCodeObject *)o;
+        PyObject *uid_co = PyLong_FromVoidPtr((void*)CODE_ADDR_TO_UID(co));
+        int check = PySet_Discard(all_codes, uid_co);
+
+        Py_CLEAR(uid_co);
+
+        if (check < 0)
+            return -1;
+
+        if (check && emit_code_object(co) < 0)
+            return -1;
+
+        i = PyTuple_Size(co->co_consts);
+        while (i > 0) {
+            --i;
+            if (_look_for_code_object(PyTuple_GET_ITEM(co->co_consts, i),
+                                      all_codes) < 0)
+                return -1;
+        }
+    }
+    return 0;
+}
+
 static void emit_all_code_objects(void)
 {
     PyObject *gc_module = NULL, *lst = NULL, *all_codes = NULL;
@@ -118,6 +144,48 @@
     if (gc_module == NULL)
         goto error;
 
+    // lst contains all objects that are known by the gc
+    lst = PyObject_CallMethod(gc_module, "get_objects", "");
+    if (lst == NULL || !PyList_Check(lst))
+        goto error;
+
+    // the set only includes the code objects found in the profile
+    all_codes = PySet_New(NULL);
+    if (all_codes == NULL)
+        goto error;
+
+    size = PyList_GET_SIZE(lst);
+    for (i = 0; i < size; i++) {
+        PyObject *o = PyList_GET_ITEM(lst, i);
+        if (o->ob_type->tp_traverse &&
+            o->ob_type->tp_traverse(o, _look_for_code_object, (void *)all_codes)
+                < 0)
+            goto error;
+    }
+
+ error:
+    Py_XDECREF(all_codes);
+    Py_XDECREF(lst);
+    Py_XDECREF(gc_module);
+}
+
+static int add_code_addr(void *all_code_uids, void *addr)
+{
+    PyObject *co_uid = PyLong_FromVoidPtr(addr);
+    int check = PySet_Add((PyObject*) all_code_uids, co_uid);
+    Py_CLEAR(co_uid);
+    return check;
+}
+
+static void emit_all_code_objects_seen(int fileno)
+{
+    PyObject *gc_module = NULL, *lst = NULL, *all_codes = NULL;
+    Py_ssize_t i, size;
+
+    gc_module = PyImport_ImportModuleNoBlock("gc");
+    if (gc_module == NULL)
+        goto error;
+
     lst = PyObject_CallMethod(gc_module, "get_objects", "");
     if (lst == NULL || !PyList_Check(lst))
         goto error;
@@ -126,16 +194,21 @@
     if (all_codes == NULL)
         goto error;
 
+    // fill up all_codes with every code object found in the profile
+    vmp_scan_profile(fileno, 0, all_codes);
+
+    // intersect the list with the set and dump only the code objects
+    // found in the set!
     size = PyList_GET_SIZE(lst);
     for (i = 0; i < size; i++) {
         PyObject *o = PyList_GET_ITEM(lst, i);
         if (o->ob_type->tp_traverse &&
-            o->ob_type->tp_traverse(o, _look_for_code_object, (void *)all_codes)
-                < 0)
+                o->ob_type->tp_traverse(o, _look_for_code_object_seen, (void *) all_codes)
+            < 0)
             goto error;
     }
 
- error:
+    error:
     Py_XDECREF(all_codes);
     Py_XDECREF(lst);
     Py_XDECREF(gc_module);
@@ -162,8 +235,16 @@
     if (!PyArg_ParseTuple(args, "id|iii", &fd, &interval, &memory, &lines, &native)) {
         return NULL;
     }
-    assert(fd >= 0 && "file descripter provided to vmprof must not" \
-                      " be less then zero.");
+
+    if (write(fd, NULL, 0) != 0) {
+        PyErr_SetString(PyExc_ValueError, "file descriptor must be writeable");
+        return NULL;
+    }
+
+    if ((read(fd, NULL, 0) != 0) && (native != 0)) {
+        PyErr_SetString(PyExc_ValueError, "file descriptor must be readable for native profiling");
+        return NULL;
+    }
 
     if (is_enabled) {
         PyErr_SetString(PyExc_ValueError, "vmprof is already enabled");
@@ -194,16 +275,53 @@
     return Py_None;
 }
 
+static PyObject * vmp_is_enabled(PyObject *module, PyObject *noargs) {
+    if (is_enabled) {
+        Py_RETURN_TRUE;
+    }
+    Py_RETURN_FALSE;
+}
+
 static PyObject *
-disable_vmprof(PyObject *module, PyObject *noarg)
+disable_vmprof(PyObject *module, PyObject *args)
 {
+    int fd = vmp_profile_fileno();
+    int only_needed = 0;
+
+    if (!PyArg_ParseTuple(args, "|i", &only_needed)) {
+        return NULL;
+    }
+
+#if VMPROF_UNIX
+    if ((read(fd, NULL, 0) != 0) && (only_needed != 0)) {
+        PyErr_SetString(PyExc_ValueError,
+                        "file descriptor must be readable to save only needed code objects");
+        return NULL;
+    }
+#else
+    if (only_needed) {
+        PyErr_SetString(PyExc_ValueError,
+                        "saving only needed code objects is not supported for windows");
+        return NULL;
+    }
+#endif
+
     if (!is_enabled) {
         PyErr_SetString(PyExc_ValueError, "vmprof is not enabled");
         return NULL;
     }
+
     is_enabled = 0;
     vmprof_ignore_signals(1);
+
+#if VMPROF_UNIX
+    if (only_needed)
+        emit_all_code_objects_seen(fd);
+    else
+        emit_all_code_objects();
+#else
     emit_all_code_objects();
+#endif
 
     if (vmprof_disable() < 0) {
         PyErr_SetFromErrno(PyExc_OSError);
@@ -320,15 +438,36 @@
 }
 #endif
 
+#ifdef VMPROF_UNIX
+static PyObject * vmp_get_profile_path(PyObject *module, PyObject *noargs) {
+    PyObject * o;
+    if (is_enabled) {
+        char buffer[4096];
+        buffer[0] = 0;
+        ssize_t buffer_len = vmp_fd_to_path(vmp_profile_fileno(), buffer, 4096);
+        if (buffer_len == -1) {
+            PyErr_Format(PyExc_NotImplementedError, "not implemented platform %s", vmp_machine_os_name());
+            return NULL;
+        }
+        return PyStr_n_NEW(buffer, buffer_len);
+    }
+    Py_RETURN_NONE;
+}
+#endif
+
 static PyMethodDef VMProfMethods[] = {
     {"enable",  enable_vmprof, METH_VARARGS, "Enable profiling."},
-    {"disable", disable_vmprof, METH_NOARGS, "Disable profiling."},
+    {"disable", disable_vmprof, METH_VARARGS, "Disable profiling."},
     {"write_all_code_objects", write_all_code_objects, METH_NOARGS,
      "Write eagerly all the IDs of code objects"},
     {"sample_stack_now", sample_stack_now, METH_VARARGS, "Sample the stack now"},
 #ifdef VMP_SUPPORTS_NATIVE_PROFILING
     {"resolve_addr", resolve_addr, METH_VARARGS, "Return the name of the addr"},
 #endif
+    {"is_enabled", vmp_is_enabled, METH_NOARGS, "Indicates if vmprof is currently sampling."},
+#ifdef VMPROF_UNIX
+    {"get_profile_path", vmp_get_profile_path, METH_NOARGS, "Profile path the profiler logs to."},
+#endif
     {NULL, NULL, 0, NULL}        /* Sentinel */
 };
 
diff --git a/rpython/rlib/rvmprof/src/shared/compat.h b/rpython/rlib/rvmprof/src/shared/compat.h
--- a/rpython/rlib/rvmprof/src/shared/compat.h
+++ b/rpython/rlib/rvmprof/src/shared/compat.h
@@ -7,11 +7,13 @@
       #define PyStr_AS_STRING PyBytes_AS_STRING
       #define PyStr_GET_SIZE PyBytes_GET_SIZE
       #define PyStr_NEW      PyUnicode_FromString
+      #define PyStr_n_NEW      PyUnicode_FromStringAndSize
       #define PyLong_NEW     PyLong_FromSsize_t
 #  else
       #define PyStr_AS_STRING PyString_AS_STRING
       #define PyStr_GET_SIZE PyString_GET_SIZE
       #define PyStr_NEW      PyString_FromString
+      #define PyStr_n_NEW      PyString_FromStringAndSize
       #define PyLong_NEW     PyInt_FromSsize_t
       #define PyLong_AsLong  PyInt_AsLong
 #  endif
diff --git a/rpython/rlib/rvmprof/src/shared/khash.h b/rpython/rlib/rvmprof/src/shared/khash.h
new file mode 100644
--- /dev/null
+++ b/rpython/rlib/rvmprof/src/shared/khash.h
@@ -0,0 +1,627 @@
+/* The MIT License
+
+   Copyright (c) 2008, 2009, 2011 by Attractive Chaos <attractor at live.co.uk>
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+*/
+
+/*
+  An example:
+
+#include "khash.h"
+KHASH_MAP_INIT_INT(32, char)
+int main() {
+	int ret, is_missing;
+	khiter_t k;
+	khash_t(32) *h = kh_init(32);
+	k = kh_put(32, h, 5, &ret);
+	kh_value(h, k) = 10;
+	k = kh_get(32, h, 10);
+	is_missing = (k == kh_end(h));
+	k = kh_get(32, h, 5);
+	kh_del(32, h, k);
+	for (k = kh_begin(h); k != kh_end(h); ++k)
+		if (kh_exist(h, k)) kh_value(h, k) = 1;
+	kh_destroy(32, h);
+	return 0;
+}
+*/
+
+/*
+  2013-05-02 (0.2.8):
+
+	* Use quadratic probing. When the capacity is power of 2, stepping function
+	  i*(i+1)/2 guarantees to traverse each bucket. It is better than double
+	  hashing on cache performance and is more robust than linear probing.
+
+	  In theory, double hashing should be more robust than quadratic probing.
+	  However, my implementation is probably not for large hash tables, because
+	  the second hash function is closely tied to the first hash function,
+	  which reduce the effectiveness of double hashing.
+
+	Reference: http://research.cs.vt.edu/AVresearch/hashing/quadratic.php
+
+  2011-12-29 (0.2.7):
+
+    * Minor code clean up; no actual effect.
+
+  2011-09-16 (0.2.6):
+
+	* The capacity is a power of 2. This seems to dramatically improve the
+	  speed for simple keys. Thank Zilong Tan for the suggestion. Reference:
+
+	   - http://code.google.com/p/ulib/
+	   - http://nothings.org/computer/judy/
+
+	* Allow to optionally use linear probing which usually has better
+	  performance for random input. Double hashing is still the default as it
+	  is more robust to certain non-random input.
+
+	* Added Wang's integer hash function (not used by default). This hash
+	  function is more robust to certain non-random input.
+
+  2011-02-14 (0.2.5):
+
+    * Allow to declare global functions.
+
+  2009-09-26 (0.2.4):
+
+    * Improve portability
+
+  2008-09-19 (0.2.3):
+
+	* Corrected the example
+	* Improved interfaces
+
+  2008-09-11 (0.2.2):
+
+	* Improved speed a little in kh_put()
+
+  2008-09-10 (0.2.1):
+
+	* Added kh_clear()
+	* Fixed a compiling error
+
+  2008-09-02 (0.2.0):
+
+	* Changed to token concatenation which increases flexibility.
+
+  2008-08-31 (0.1.2):
+
+	* Fixed a bug in kh_get(), which has not been tested previously.
+
+  2008-08-31 (0.1.1):
+
+	* Added destructor
+*/
+
+
+#ifndef __AC_KHASH_H
+#define __AC_KHASH_H
+
+/*!
+  @header
+
+  Generic hash table library.
+ */
+
+#define AC_VERSION_KHASH_H "0.2.8"
+
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+/* compiler specific configuration */
+
+#if UINT_MAX == 0xffffffffu
+typedef unsigned int khint32_t;
+#elif ULONG_MAX == 0xffffffffu
+typedef unsigned long khint32_t;
+#endif
+
+#if ULONG_MAX == ULLONG_MAX
+typedef unsigned long khint64_t;
+#else
+typedef unsigned long long khint64_t;
+#endif
+
+#ifndef kh_inline
+#ifdef _MSC_VER
+#define kh_inline __inline
+#else
+#define kh_inline inline
+#endif
+#endif /* kh_inline */
+
+#ifndef klib_unused
+#if (defined __clang__ && __clang_major__ >= 3) || (defined __GNUC__ && __GNUC__ >= 3)
+#define klib_unused __attribute__ ((__unused__))
+#else
+#define klib_unused
+#endif
+#endif /* klib_unused */
+
+typedef khint32_t khint_t;
+typedef khint_t khiter_t;
+
+#define __ac_isempty(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&2)
+#define __ac_isdel(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&1)
+#define __ac_iseither(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&3)
+#define __ac_set_isdel_false(flag, i) (flag[i>>4]&=~(1ul<<((i&0xfU)<<1)))
+#define __ac_set_isempty_false(flag, i) (flag[i>>4]&=~(2ul<<((i&0xfU)<<1)))
+#define __ac_set_isboth_false(flag, i) (flag[i>>4]&=~(3ul<<((i&0xfU)<<1)))
+#define __ac_set_isdel_true(flag, i) (flag[i>>4]|=1ul<<((i&0xfU)<<1))
+
+#define __ac_fsize(m) ((m) < 16? 1 : (m)>>4)
+
+#ifndef kroundup32
+#define kroundup32(x) (--(x), (x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16, ++(x))
+#endif
+
+#ifndef kcalloc
+#define kcalloc(N,Z) calloc(N,Z)
+#endif
+#ifndef kmalloc
+#define kmalloc(Z) malloc(Z)
+#endif
+#ifndef krealloc
+#define krealloc(P,Z) realloc(P,Z)
+#endif
+#ifndef kfree
+#define kfree(P) free(P)
+#endif
+
+static const double __ac_HASH_UPPER = 0.77;
+
+#define __KHASH_TYPE(name, khkey_t, khval_t) \
+	typedef struct kh_##name##_s { \
+		khint_t n_buckets, size, n_occupied, upper_bound; \
+		khint32_t *flags; \
+		khkey_t *keys; \
+		khval_t *vals; \
+	} kh_##name##_t;
+
+#define __KHASH_PROTOTYPES(name, khkey_t, khval_t)	 					\
+	extern kh_##name##_t *kh_init_##name(void);							\
+	extern void kh_destroy_##name(kh_##name##_t *h);					\
+	extern void kh_clear_##name(kh_##name##_t *h);						\
+	extern khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); 	\
+	extern int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
+	extern khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \
+	extern void kh_del_##name(kh_##name##_t *h, khint_t x);
+
+#define __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	SCOPE kh_##name##_t *kh_init_##name(void) {							\
+		return (kh_##name##_t*)kcalloc(1, sizeof(kh_##name##_t));		\
+	}																	\
+	SCOPE void kh_destroy_##name(kh_##name##_t *h)						\
+	{																	\
+		if (h) {														\
+			kfree((void *)h->keys); kfree(h->flags);					\
+			kfree((void *)h->vals);										\
+			kfree(h);													\
+		}																\
+	}																	\
+	SCOPE void kh_clear_##name(kh_##name##_t *h)						\
+	{																	\
+		if (h && h->flags) {											\
+			memset(h->flags, 0xaa, __ac_fsize(h->n_buckets) * sizeof(khint32_t)); \
+			h->size = h->n_occupied = 0;								\
+		}																\
+	}																	\
+	SCOPE khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) 	\
+	{																	\
+		if (h->n_buckets) {												\
+			khint_t k, i, last, mask, step = 0; \
+			mask = h->n_buckets - 1;									\
+			k = __hash_func(key); i = k & mask;							\
+			last = i; \
+			while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
+				i = (i + (++step)) & mask; \
+				if (i == last) return h->n_buckets;						\
+			}															\
+			return __ac_iseither(h->flags, i)? h->n_buckets : i;		\
+		} else return 0;												\
+	}																	\
+	SCOPE int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
+	{ /* This function uses 0.25*n_buckets bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets. */ \
+		khint32_t *new_flags = 0;										\
+		khint_t j = 1;													\
+		{																\
+			kroundup32(new_n_buckets); 									\
+			if (new_n_buckets < 4) new_n_buckets = 4;					\
+			if (h->size >= (khint_t)(new_n_buckets * __ac_HASH_UPPER + 0.5)) j = 0;	/* requested size is too small */ \
+			else { /* hash table size to be changed (shrink or expand); rehash */ \
+				new_flags = (khint32_t*)kmalloc(__ac_fsize(new_n_buckets) * sizeof(khint32_t));	\
+				if (!new_flags) return -1;								\
+				memset(new_flags, 0xaa, __ac_fsize(new_n_buckets) * sizeof(khint32_t)); \
+				if (h->n_buckets < new_n_buckets) {	/* expand */		\
+					khkey_t *new_keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
+					if (!new_keys) { kfree(new_flags); return -1; }		\
+					h->keys = new_keys;									\
+					if (kh_is_map) {									\
+						khval_t *new_vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \
+						if (!new_vals) { kfree(new_flags); return -1; }	\
+						h->vals = new_vals;								\
+					}													\
+				} /* otherwise shrink */								\
+			}															\
+		}																\
+		if (j) { /* rehashing is needed */								\
+			for (j = 0; j != h->n_buckets; ++j) {						\
+				if (__ac_iseither(h->flags, j) == 0) {					\
+					khkey_t key = h->keys[j];							\
+					khval_t val;										\
+					khint_t new_mask;									\
+					new_mask = new_n_buckets - 1; 						\
+					if (kh_is_map) val = h->vals[j];					\
+					__ac_set_isdel_true(h->flags, j);					\
+					while (1) { /* kick-out process; sort of like in Cuckoo hashing */ \
+						khint_t k, i, step = 0; \
+						k = __hash_func(key);							\
+						i = k & new_mask;								\
+						while (!__ac_isempty(new_flags, i)) i = (i + (++step)) & new_mask; \
+						__ac_set_isempty_false(new_flags, i);			\
+						if (i < h->n_buckets && __ac_iseither(h->flags, i) == 0) { /* kick out the existing element */ \
+							{ khkey_t tmp = h->keys[i]; h->keys[i] = key; key = tmp; } \
+							if (kh_is_map) { khval_t tmp = h->vals[i]; h->vals[i] = val; val = tmp; } \
+							__ac_set_isdel_true(h->flags, i); /* mark it as deleted in the old hash table */ \
+						} else { /* write the element and jump out of the loop */ \
+							h->keys[i] = key;							\
+							if (kh_is_map) h->vals[i] = val;			\
+							break;										\
+						}												\
+					}													\
+				}														\
+			}															\
+			if (h->n_buckets > new_n_buckets) { /* shrink the hash table */ \
+				h->keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
+				if (kh_is_map) h->vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \
+			}															\
+			kfree(h->flags); /* free the working space */				\
+			h->flags = new_flags;										\
+			h->n_buckets = new_n_buckets;								\
+			h->n_occupied = h->size;									\
+			h->upper_bound = (khint_t)(h->n_buckets * __ac_HASH_UPPER + 0.5); \
+		}																\
+		return 0;														\
+	}																	\
+	SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \
+	{																	\
+		khint_t x;														\
+		if (h->n_occupied >= h->upper_bound) { /* update the hash table */ \
+			if (h->n_buckets > (h->size<<1)) {							\
+				if (kh_resize_##name(h, h->n_buckets - 1) < 0) { /* clear "deleted" elements */ \
+					*ret = -1; return h->n_buckets;						\
+				}														\
+			} else if (kh_resize_##name(h, h->n_buckets + 1) < 0) { /* expand the hash table */ \
+				*ret = -1; return h->n_buckets;							\
+			}															\
+		} /* TODO: to implement automatically shrinking; resize() already support shrinking */ \
+		{																\
+			khint_t k, i, site, last, mask = h->n_buckets - 1, step = 0; \
+			x = site = h->n_buckets; k = __hash_func(key); i = k & mask; \
+			if (__ac_isempty(h->flags, i)) x = i; /* for speed up */	\
+			else {														\
+				last = i; \
+				while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
+					if (__ac_isdel(h->flags, i)) site = i;				\
+					i = (i + (++step)) & mask; \
+					if (i == last) { x = site; break; }					\
+				}														\
+				if (x == h->n_buckets) {								\
+					if (__ac_isempty(h->flags, i) && site != h->n_buckets) x = site; \
+					else x = i;											\
+				}														\
+			}															\
+		}																\
+		if (__ac_isempty(h->flags, x)) { /* not present at all */		\
+			h->keys[x] = key;											\
+			__ac_set_isboth_false(h->flags, x);							\
+			++h->size; ++h->n_occupied;									\
+			*ret = 1;													\
+		} else if (__ac_isdel(h->flags, x)) { /* deleted */				\
+			h->keys[x] = key;											\
+			__ac_set_isboth_false(h->flags, x);							\
+			++h->size;													\
+			*ret = 2;													\
+		} else *ret = 0; /* Don't touch h->keys[x] if present and not deleted */ \
+		return x;														\
+	}																	\
+	SCOPE void kh_del_##name(kh_##name##_t *h, khint_t x)				\
+	{																	\
+		if (x != h->n_buckets && !__ac_iseither(h->flags, x)) {			\
+			__ac_set_isdel_true(h->flags, x);							\
+			--h->size;													\
+		}																\
+	}
+
+#define KHASH_DECLARE(name, khkey_t, khval_t)		 					\
+	__KHASH_TYPE(name, khkey_t, khval_t) 								\
+	__KHASH_PROTOTYPES(name, khkey_t, khval_t)
+
+#define KHASH_INIT2(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	__KHASH_TYPE(name, khkey_t, khval_t) 								\
+	__KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal)
+
+#define KHASH_INIT(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+	KHASH_INIT2(name, static kh_inline klib_unused, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal)
+
+/* --- BEGIN OF HASH FUNCTIONS --- */
+
+/*! @function
+  @abstract     Integer hash function
+  @param  key   The integer [khint32_t]
+  @return       The hash value [khint_t]
+ */
+#define kh_int_hash_func(key) (khint32_t)(key)
+/*! @function
+  @abstract     Integer comparison function
+ */
+#define kh_int_hash_equal(a, b) ((a) == (b))
+/*! @function
+  @abstract     64-bit integer hash function
+  @param  key   The integer [khint64_t]
+  @return       The hash value [khint_t]
+ */
+#define kh_int64_hash_func(key) (khint32_t)((key)>>33^(key)^(key)<<11)
+/*! @function
+  @abstract     64-bit integer comparison function
+ */
+#define kh_int64_hash_equal(a, b) ((a) == (b))
+/*! @function
+  @abstract     const char* hash function
+  @param  s     Pointer to a null terminated string
+  @return       The hash value
+ */
+static kh_inline khint_t __ac_X31_hash_string(const char *s)
+{
+	khint_t h = (khint_t)*s;
+	if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)*s;
+	return h;
+}
+/*! @function
+  @abstract     Another interface to const char* hash function
+  @param  key   Pointer to a null terminated string [const char*]
+  @return       The hash value [khint_t]
+ */
+#define kh_str_hash_func(key) __ac_X31_hash_string(key)
+/*! @function
+  @abstract     Const char* comparison function
+ */
+#define kh_str_hash_equal(a, b) (strcmp(a, b) == 0)
+
+static kh_inline khint_t __ac_Wang_hash(khint_t key)
+{
+    key += ~(key << 15);
+    key ^=  (key >> 10);
+    key +=  (key << 3);
+    key ^=  (key >> 6);
+    key += ~(key << 11);
+    key ^=  (key >> 16);
+    return key;
+}
+#define kh_int_hash_func2(key) __ac_Wang_hash((khint_t)key)
+
+/* --- END OF HASH FUNCTIONS --- */
+
+/* Other convenient macros... */
+
+/*!
+  @abstract Type of the hash table.
+  @param  name  Name of the hash table [symbol]
+ */
+#define khash_t(name) kh_##name##_t
+
+/*! @function
+  @abstract     Initiate a hash table.
+  @param  name  Name of the hash table [symbol]
+  @return       Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_init(name) kh_init_##name()
+
+/*! @function
+  @abstract     Destroy a hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_destroy(name, h) kh_destroy_##name(h)
+
+/*! @function
+  @abstract     Reset a hash table without deallocating memory.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+ */
+#define kh_clear(name, h) kh_clear_##name(h)
+
+/*! @function
+  @abstract     Resize a hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  s     New size [khint_t]
+ */
+#define kh_resize(name, h, s) kh_resize_##name(h, s)
+
+/*! @function
+  @abstract     Insert a key to the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Key [type of keys]
+  @param  r     Extra return code: -1 if the operation failed;
+                0 if the key is present in the hash table;
+                1 if the bucket is empty (never used); 2 if the element in
+				the bucket has been deleted [int*]
+  @return       Iterator to the inserted element [khint_t]
+ */
+#define kh_put(name, h, k, r) kh_put_##name(h, k, r)
+
+/*! @function
+  @abstract     Retrieve a key from the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Key [type of keys]
+  @return       Iterator to the found element, or kh_end(h) if the element is absent [khint_t]
+ */
+#define kh_get(name, h, k) kh_get_##name(h, k)
+
+/*! @function
+  @abstract     Remove a key from the hash table.
+  @param  name  Name of the hash table [symbol]
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  k     Iterator to the element to be deleted [khint_t]
+ */
+#define kh_del(name, h, k) kh_del_##name(h, k)
+
+/*! @function
+  @abstract     Test whether a bucket contains data.
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       1 if containing data; 0 otherwise [int]
+ */
+#define kh_exist(h, x) (!__ac_iseither((h)->flags, (x)))
+
+/*! @function
+  @abstract     Get key given an iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       Key [type of keys]
+ */
+#define kh_key(h, x) ((h)->keys[x])
+
+/*! @function
+  @abstract     Get value given an iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  x     Iterator to the bucket [khint_t]
+  @return       Value [type of values]
+  @discussion   For hash sets, calling this results in segfault.
+ */
+#define kh_val(h, x) ((h)->vals[x])
+
+/*! @function
+  @abstract     Alias of kh_val()
+ */
+#define kh_value(h, x) ((h)->vals[x])
+
+/*! @function
+  @abstract     Get the start iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       The start iterator [khint_t]
+ */
+#define kh_begin(h) (khint_t)(0)
+
+/*! @function
+  @abstract     Get the end iterator
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       The end iterator [khint_t]
+ */
+#define kh_end(h) ((h)->n_buckets)
+
+/*! @function
+  @abstract     Get the number of elements in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       Number of elements in the hash table [khint_t]
+ */
+#define kh_size(h) ((h)->size)
+
+/*! @function
+  @abstract     Get the number of buckets in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @return       Number of buckets in the hash table [khint_t]
+ */
+#define kh_n_buckets(h) ((h)->n_buckets)
+
+/*! @function
+  @abstract     Iterate over the entries in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  kvar  Variable to which key will be assigned
+  @param  vvar  Variable to which value will be assigned
+  @param  code  Block of code to execute
+ */
+#define kh_foreach(h, kvar, vvar, code) { khint_t __i;		\
+	for (__i = kh_begin(h); __i != kh_end(h); ++__i) {		\
+		if (!kh_exist(h,__i)) continue;						\
+		(kvar) = kh_key(h,__i);								\
+		(vvar) = kh_val(h,__i);								\
+		code;												\
+	} }
+
+/*! @function
+  @abstract     Iterate over the values in the hash table
+  @param  h     Pointer to the hash table [khash_t(name)*]
+  @param  vvar  Variable to which value will be assigned
+  @param  code  Block of code to execute
+ */
+#define kh_foreach_value(h, vvar, code) { khint_t __i;		\
+	for (__i = kh_begin(h); __i != kh_end(h); ++__i) {		\
+		if (!kh_exist(h,__i)) continue;						\
+		(vvar) = kh_val(h,__i);								\
+		code;												\
+	} }
+
+/* More conenient interfaces */
+
+/*! @function
+  @abstract     Instantiate a hash set containing integer keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_INT(name)										\
+	KHASH_INIT(name, khint32_t, char, 0, kh_int_hash_func, kh_int_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing integer keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_INT(name, khval_t)								\
+	KHASH_INIT(name, khint32_t, khval_t, 1, kh_int_hash_func, kh_int_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing 64-bit integer keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_INT64(name)										\
+	KHASH_INIT(name, khint64_t, char, 0, kh_int64_hash_func, kh_int64_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing 64-bit integer keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_INT64(name, khval_t)								\
+	KHASH_INIT(name, khint64_t, khval_t, 1, kh_int64_hash_func, kh_int64_hash_equal)
+
+typedef const char *kh_cstr_t;
+/*! @function
+  @abstract     Instantiate a hash map containing const char* keys
+  @param  name  Name of the hash table [symbol]
+ */
+#define KHASH_SET_INIT_STR(name)										\
+	KHASH_INIT(name, kh_cstr_t, char, 0, kh_str_hash_func, kh_str_hash_equal)
+
+/*! @function
+  @abstract     Instantiate a hash map containing const char* keys
+  @param  name  Name of the hash table [symbol]
+  @param  khval_t  Type of values [type]
+ */
+#define KHASH_MAP_INIT_STR(name, khval_t)								\
+	KHASH_INIT(name, kh_cstr_t, khval_t, 1, kh_str_hash_func, kh_str_hash_equal)
+
+#endif /* __AC_KHASH_H */
diff --git a/rpython/rlib/rvmprof/src/shared/machine.c b/rpython/rlib/rvmprof/src/shared/machine.c
--- a/rpython/rlib/rvmprof/src/shared/machine.c
+++ b/rpython/rlib/rvmprof/src/shared/machine.c
@@ -3,6 +3,11 @@
 #include "vmprof.h"
 #include <stdio.h>
 
+#ifdef VMPROF_UNIX
+#include <unistd.h>
+#include <fcntl.h>
+#endif
+
 int vmp_machine_bits(void)
 {
     return sizeof(void*)*8;
@@ -27,3 +32,15 @@
 #endif
 }
 
+long vmp_fd_to_path(int fd, char * buffer, long buffer_len)
+{
+#ifdef VMPROF_LINUX
+    char proffs[24];
+    (void)snprintf(proffs, 24, "/proc/self/fd/%d", fd);
+    return readlink(proffs, buffer, buffer_len);
+#elif defined(VMPROF_UNIX)
+    fcntl(fd, F_GETPATH, buffer);
+    return strlen(buffer);
+#endif
+    return -1;
+}
diff --git a/rpython/rlib/rvmprof/src/shared/machine.h b/rpython/rlib/rvmprof/src/shared/machine.h
--- a/rpython/rlib/rvmprof/src/shared/machine.h
+++ b/rpython/rlib/rvmprof/src/shared/machine.h
@@ -10,3 +10,9 @@
  */
 const char * vmp_machine_os_name(void);
 
+/**
+ * Writes the filename into buffer. Returns -1 if the platform is not
+ * implemented.
+ */
+long vmp_fd_to_path(int fd, char * buffer, long buffer_len);
+
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c b/rpython/rlib/rvmprof/src/shared/symboltable.c
--- a/rpython/rlib/rvmprof/src/shared/symboltable.c
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.c
@@ -3,11 +3,15 @@
 #include "vmprof.h"
 #include "machine.h"
 
+#include "khash.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <assert.h>
 #include <dlfcn.h>
+
 #if defined(VMPROF_LINUX)
 #include <link.h>
 #endif
@@ -206,15 +210,20 @@
 struct backtrace_state * bstate = NULL;
 int vmp_resolve_addr(void * addr, char * name, int name_len, int * lineno, char * srcfile, int srcfile_len) {
 #ifdef __APPLE__
-    Dl_info info;
-    if (dladdr((const void*)addr, &info) == 0) {
+    Dl_info dlinfo;
+    if (dladdr((const void*)addr, &dlinfo) == 0) {
         return 1;
     }
-    if (info.dli_sname != NULL) {
-        (void)strncpy(name, info.dli_sname, name_len-1);
+    if (dlinfo.dli_sname != NULL) {
+        (void)strncpy(name, dlinfo.dli_sname, name_len-1);
         name[name_len-1] = 0;
     }
-    lookup_vmprof_debug_info(name, info.dli_fbase, srcfile, srcfile_len, lineno);
+    lookup_vmprof_debug_info(name, dlinfo.dli_fbase, srcfile, srcfile_len, lineno);
+    // copy the shared object name to the source file name if source cannot be determined
+    if (srcfile[0] == 0 && dlinfo.dli_fname != NULL) {
+        (void)strncpy(srcfile, dlinfo.dli_fname, srcfile_len-1);
+        srcfile[srcfile_len-1] = 0;
+    }
 #elif defined(VMPROF_LINUX)
     if (bstate == NULL) {
         bstate = backtrace_create_state (NULL, 1, backtrace_error_cb, NULL);
@@ -238,6 +247,18 @@
             (void)strncpy(info.name, dlinfo.dli_sname, info.name_len-1);
             name[name_len-1] = 0;
         }
+
+    }
+
+    // copy the shared object name to the source file name if source cannot be determined
+    if (srcfile[0] == 0) {
+        Dl_info dlinfo;
+        dlinfo.dli_fname = NULL;
+        (void)dladdr((const void*)addr, &dlinfo);
+        if (dlinfo.dli_fname != NULL) {
+            (void)strncpy(srcfile, dlinfo.dli_fname, srcfile_len-1);
+            srcfile[srcfile_len-1] = 0;
+        }
     }
 #endif
     return 0;
@@ -338,8 +359,9 @@
     return 0;
 }
 
+KHASH_MAP_INIT_INT(ptr, intptr_t)
 
-void dump_native_symbols(int fileno)
+void vmp_scan_profile(int fileno, int dump_nat_sym, void *all_code_uids)
 {
     off_t orig_pos, cur_pos;
     char marker;
@@ -350,6 +372,9 @@
     fsync(fileno);
     orig_pos = lseek(fileno, 0, SEEK_CUR);
 
+    khash_t(ptr) * nat_syms = kh_init(ptr);
+    khiter_t it;
+
     lseek(fileno, 5*WORD_SIZE, SEEK_SET);
 
     while (1) {
@@ -363,11 +388,17 @@
             case MARKER_HEADER: {
                 LOG("header 0x%llx\n", cur_pos);
                 if (_skip_header(fileno, &version, &flags) != 0) {
+                    kh_destroy(ptr, nat_syms);
                     return;
                 }
                 memory = (flags & PROFILE_MEMORY) != 0;
                 native = (flags & PROFILE_NATIVE) != 0;
                 lines = (flags & PROFILE_LINES) != 0;
+                if (!native && dump_nat_sym) {
+                    lseek(fileno, 0, SEEK_END);
+                    kh_destroy(ptr, nat_syms);
+                    return;
+                }
                 break;
             } case MARKER_META: {
                 LOG("meta 0x%llx\n", cur_pos);
@@ -400,19 +431,46 @@
 #else
                 for (i = 0; i < depth; i++) {
                     void * addr = _read_addr(fileno);
+                    if (lines && i % 2 == 0) {
+                        continue;
+                    }
                     if (((intptr_t)addr & 0x1) == 1) {
 #endif
-                        LOG("found kind %p\n", addr);
-                        char name[MAXLEN];
-                        char srcfile[MAXLEN];
-                        name[0] = 0;
-                        srcfile[0] = 0;
-                        int lineno = 0;
-                        if (vmp_resolve_addr(addr, name, MAXLEN, &lineno, srcfile, MAXLEN) == 0) {
-                            LOG("dumping add %p, name %s, %s:%d\n", addr, name, srcfile, lineno);
-                            _dump_native_symbol(fileno, addr, name, lineno, srcfile);
+                        /* dump the native symbol to disk */
+                        if (dump_nat_sym) {
+                            LOG("found kind %p\n", addr);
+
+                            // if the address has already been dumped,
+                            // do not log it again!
+                            it = kh_get(ptr, nat_syms, (intptr_t)addr);
+                            if (it == kh_end(nat_syms)) {
+                                char name[MAXLEN];
+                                char srcfile[MAXLEN];
+                                name[0] = 0;
+                                srcfile[0] = 0;
+                                int lineno = 0;
+                                if (vmp_resolve_addr(addr, name, MAXLEN, &lineno, srcfile, MAXLEN) == 0) {
+                                    LOG("dumping add %p, name %s, %s:%d\n", addr, name, srcfile, lineno);
+                                    _dump_native_symbol(fileno, addr, name, lineno, srcfile);
+                                    int ret;
+                                    it = kh_put(ptr, nat_syms, (intptr_t)addr, &ret);
+                                    kh_value(nat_syms, it) = 1;
+                                }
+                            }
+                        }
+#ifdef RPYTHON_VMPROF
+                    }
+#else
+                    } else {
+                        // cpython adds all addresses into a set to get the intersection
+                        // of all gc known code addresses
+                        if (all_code_uids != NULL) {
+                            PyObject *co_uid = PyLong_FromVoidPtr(addr);
+                            int check = PySet_Add(all_code_uids, co_uid);
+                            Py_CLEAR(co_uid);
                         }
                     }
+#endif
                 }
                 LOG("passed  memory %d \n", memory);
 
@@ -427,6 +485,7 @@
             } default: {
                 fprintf(stderr, "unknown marker 0x%x\n", marker);
                 lseek(fileno, 0, SEEK_END);
+                kh_destroy(ptr, nat_syms);
                 return;
             }
         }
@@ -437,5 +496,11 @@
         }
     }
 
+    kh_destroy(ptr, nat_syms);
     lseek(fileno, 0, SEEK_END);
 }
+
+void dump_native_symbols(int fileno)
+{
+    vmp_scan_profile(fileno, 1, NULL);
+}
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.h b/rpython/rlib/rvmprof/src/shared/symboltable.h
--- a/rpython/rlib/rvmprof/src/shared/symboltable.h
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.h
@@ -17,5 +17,7 @@
  */
 void dump_all_known_symbols(int fd);
 
+void dump_native_symbols(int fd);
+
 int vmp_resolve_addr(void * addr, char * name, int name_len, int * lineno,
                       char * srcfile, int srcfile_len);
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_main.h b/rpython/rlib/rvmprof/src/shared/vmprof_main.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof_main.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof_main.h
@@ -218,7 +218,7 @@
         if (p == NULL) {
             /* ignore this signal: there are no free buffers right now */
         } else {
-#ifdef RPYTHON_VMPORF
+#ifdef RPYTHON_VMPROF
             commit = _vmprof_sample_stack(p, NULL, (ucontext_t*)ucontext);
 #else
             commit = _vmprof_sample_stack(p, tstate, (ucontext_t*)ucontext);
diff --git a/rpython/rtyper/controllerentry.py b/rpython/rtyper/controllerentry.py
--- a/rpython/rtyper/controllerentry.py
+++ b/rpython/rtyper/controllerentry.py
@@ -1,6 +1,10 @@
+from rpython.flowspace.model import Constant
+from rpython.flowspace.operation import op
 from rpython.annotator import model as annmodel
 from rpython.tool.pairtype import pairtype
 from rpython.annotator.bookkeeper import getbookkeeper
+from rpython.rlib.objectmodel import specialize
+from rpython.rtyper.rmodel import Repr
 from rpython.rtyper.extregistry import ExtRegistryEntry
 from rpython.rtyper.annlowlevel import cachedtype
 from rpython.rtyper.error import TyperError
@@ -10,7 +14,14 @@
 
     def compute_result_annotation(self, *args_s, **kwds_s):
         controller = self.getcontroller(*args_s, **kwds_s)
-        return controller.ctrl_new_ex(self.bookkeeper, *args_s, **kwds_s)
+        if kwds_s:
+            raise TypeError("cannot handle keyword arguments in %s" % (
+                self.new,))
+        s_real_obj = delegate(controller.new, *args_s)
+        if s_real_obj == annmodel.s_ImpossibleValue:
+            return annmodel.s_ImpossibleValue
+        else:
+            return SomeControlledInstance(s_real_obj, controller)
 
     def getcontroller(self, *args_s, **kwds_s):
         return self._controller_()
@@ -19,9 +30,10 @@
         if hop.s_result == annmodel.s_ImpossibleValue:
             raise TyperError("object creation always raises: %s" % (
                 hop.spaceop,))
+        assert not kwds_i
         controller = hop.s_result.controller
-        return controller.rtype_new(hop, **kwds_i)
-
+        return rtypedelegate(controller.new, hop, revealargs=[],
+            revealresult=True)
 
 
 def controlled_instance_box(controller, obj):
@@ -53,91 +65,25 @@
     def _freeze_(self):
         return True
 
+    @specialize.arg(0)
     def box(self, obj):
         return controlled_instance_box(self, obj)
-    box._annspecialcase_ = 'specialize:arg(0)'
 
+    @specialize.arg(0)
     def unbox(self, obj):
         return controlled_instance_unbox(self, obj)
-    unbox._annspecialcase_ = 'specialize:arg(0)'
 
+    @specialize.arg(0)
     def is_box(self, obj):
         return controlled_instance_is_box(self, obj)
-    is_box._annspecialcase_ = 'specialize:arg(0)'
 
-    def ctrl_new(self, *args_s, **kwds_s):
-        if kwds_s:
-            raise TypeError("cannot handle keyword arguments in %s" % (
-                self.new,))
-        s_real_obj = delegate(self.new, *args_s)
-        if s_real_obj == annmodel.s_ImpossibleValue:
-            return annmodel.s_ImpossibleValue
-        else:
-            return SomeControlledInstance(s_real_obj, controller=self)
-
-    def ctrl_new_ex(self, bookkeeper, *args_s, **kwds_s):
-        return self.ctrl_new(*args_s, **kwds_s)
-
-    def rtype_new(self, hop):
-        from rpython.rtyper.rcontrollerentry import rtypedelegate
-        return rtypedelegate(self.new, hop, revealargs=[], revealresult=True)
-
+    @specialize.arg(0, 2)
     def getattr(self, obj, attr):
         return getattr(self, 'get_' + attr)(obj)
-    getattr._annspecialcase_ = 'specialize:arg(0, 2)'
 
-    def ctrl_getattr(self, s_obj, s_attr):
-        return delegate(self.getattr, s_obj, s_attr)

From pypy.commits at gmail.com  Thu Apr 27 13:24:47 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 27 Apr 2017 10:24:47 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: Merge RawBuffer and ByteBuffer
Message-ID: <5902295f.9988df0a.bbbeb.99da@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91142:0db5e3751f7b
Date: 2017-04-27 18:24 +0100
http://bitbucket.org/pypy/pypy/changeset/0db5e3751f7b/

Log:	Merge RawBuffer and ByteBuffer

diff --git a/pypy/module/_io/interp_bufferedio.py b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -9,9 +9,7 @@
 from pypy.interpreter.gateway import interp2app, unwrap_spec, WrappedDefault
 from pypy.interpreter.buffer import SimpleView
 
-from rpython.rlib.buffer import Buffer, SubBuffer
-from rpython.rlib.rgc import (
-    nonmoving_raw_ptr_for_resizable_list, resizable_list_supporting_raw_ptr)
+from rpython.rlib.buffer import ByteBuffer, SubBuffer
 from rpython.rlib.rstring import StringBuilder
 from rpython.rlib.rarithmetic import r_longlong, intmask
 from rpython.rlib import rposix
@@ -160,26 +158,6 @@
     readinto1 = interp2app(W_BufferedIOBase.readinto1_w),
 )
 
-class RawBuffer(Buffer):
-    _immutable_ = True
-
-    def __init__(self, n):
-        self.length = n
-        self.buf = resizable_list_supporting_raw_ptr(['\0'] * n)
-        self.readonly = False
-
-    def getlength(self):
-        return self.length
-
-    def getitem(self, index):
-        return self.buf[index]
-
-    def setitem(self, index, char):
-        self.buf[index] = char
-
-    def get_raw_address(self):
-        return nonmoving_raw_ptr_for_resizable_list(self.buf)
-
 class BufferedMixin:
     _mixin_ = True
 
@@ -218,7 +196,7 @@
             raise oefmt(space.w_ValueError,
                         "buffer size must be strictly positive")
 
-        self.buffer = RawBuffer(self.buffer_size)
+        self.buffer = ByteBuffer(self.buffer_size)
 
         self.lock = TryLock(space)
 
@@ -626,7 +604,7 @@
         if n <= current_size:
             return self._read_fast(n)
 
-        result_buffer = RawBuffer(n)
+        result_buffer = ByteBuffer(n)
         remaining = n
         written = 0
         if current_size:
@@ -742,8 +720,8 @@
                 pos = 0
                 found = False
                 while pos < have:
-                    # 'buffer.buf[]' instead of 'buffer[]' because RPython...
-                    c = self.buffer.buf[pos]
+                    # 'buffer.data[]' instead of 'buffer[]' because RPython...
+                    c = self.buffer.data[pos]
                     pos += 1
                     if c == '\n':
                         self.pos = pos
@@ -802,7 +780,7 @@
                 # Make some place by shifting the buffer
                 for i in range(self.write_pos, self.write_end):
                     # XXX: messing with buffer internals
-                    self.buffer.buf[i - self.write_pos] = self.buffer.buf[i]
+                    self.buffer.data[i - self.write_pos] = self.buffer.data[i]
                 self.write_end -= self.write_pos
                 self.raw_pos -= self.write_pos
                 newpos = self.pos - self.write_pos
diff --git a/rpython/rlib/buffer.py b/rpython/rlib/buffer.py
--- a/rpython/rlib/buffer.py
+++ b/rpython/rlib/buffer.py
@@ -1,7 +1,8 @@
 """
 Buffer protocol support.
 """
-from rpython.rlib.rgc import nonmoving_raw_ptr_for_resizable_list
+from rpython.rlib.rgc import (
+    nonmoving_raw_ptr_for_resizable_list, resizable_list_supporting_raw_ptr)
 from rpython.rlib.signature import signature
 from rpython.rlib import types
 
@@ -62,8 +63,8 @@
 class ByteBuffer(Buffer):
     _immutable_ = True
 
-    def __init__(self, len):
-        self.data = ['\x00'] * len
+    def __init__(self, n):
+        self.data = resizable_list_supporting_raw_ptr(['\0'] * n)
         self.readonly = False
 
     def getlength(self):
@@ -117,7 +118,8 @@
     _attrs_ = ['buffer', 'offset', 'size', 'readonly']
     _immutable_ = True
 
-    @signature(types.any(), types.instance(Buffer), types.int(), types.int(), returns=types.none())
+    @signature(types.any(), types.instance(Buffer), types.int(), types.int(),
+               returns=types.none())
     def __init__(self, buffer, offset, size):
         self.readonly = buffer.readonly
         if isinstance(buffer, SubBuffer):     # don't nest them
diff --git a/rpython/rlib/rstring.py b/rpython/rlib/rstring.py
--- a/rpython/rlib/rstring.py
+++ b/rpython/rlib/rstring.py
@@ -8,7 +8,6 @@
 from rpython.rlib import jit
 from rpython.rlib.objectmodel import newlist_hint, resizelist_hint, specialize, not_rpython
 from rpython.rlib.rarithmetic import ovfcheck, LONG_BIT as BLOOM_WIDTH
-from rpython.rlib.buffer import Buffer
 from rpython.rlib.unicodedata import unicodedb_5_2_0 as unicodedb
 from rpython.rtyper.extregistry import ExtRegistryEntry
 from rpython.tool.pairtype import pairtype

From pypy.commits at gmail.com  Thu Apr 27 13:24:45 2017
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 27 Apr 2017 10:24:45 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: fixes
Message-ID: <5902295d.11ad1c0a.83fa8.0726@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91141:b3701341d1aa
Date: 2017-04-27 17:57 +0100
http://bitbucket.org/pypy/pypy/changeset/b3701341d1aa/

Log:	fixes

diff --git a/pypy/module/__pypy__/bytebuffer.py b/pypy/module/__pypy__/bytebuffer.py
--- a/pypy/module/__pypy__/bytebuffer.py
+++ b/pypy/module/__pypy__/bytebuffer.py
@@ -2,7 +2,9 @@
 # A convenient read-write buffer.  Located here for want of a better place.
 #
 
-from pypy.interpreter.buffer import SimpleView, ByteBuffer
+from rpython.rlib.buffer import ByteBuffer
+
+from pypy.interpreter.buffer import SimpleView
 from pypy.interpreter.gateway import unwrap_spec
 
 @unwrap_spec(length=int)
diff --git a/pypy/module/struct/interp_struct.py b/pypy/module/struct/interp_struct.py
--- a/pypy/module/struct/interp_struct.py
+++ b/pypy/module/struct/interp_struct.py
@@ -127,7 +127,7 @@
     """Unpack the buffer, containing packed C structure data, according to
 fmt, starting at offset. Requires len(buffer[offset:]) >= calcsize(fmt)."""
     size = _calcsize(space, format)
-    buf = space.readbuf_w(w_buffer, space.BUF_SIMPLE)
+    buf = space.readbuf_w(w_buffer)
     if offset < 0:
         offset += buf.getlength()
     if offset < 0 or (buf.getlength() - offset) < size:
@@ -140,7 +140,7 @@
 
 class W_UnpackIter(W_Root):
     def __init__(self, space, w_struct, w_buffer):
-        buf = space.readbuf_w(w_buffer, space.BUF_SIMPLE)
+        buf = space.readbuf_w(w_buffer)
         if w_struct.size <= 0:
             raise oefmt(get_error(space),
                 "cannot iteratively unpack with a struct of length %d",

From pypy.commits at gmail.com  Thu Apr 27 16:44:05 2017
From: pypy.commits at gmail.com (arigo)
Date: Thu, 27 Apr 2017 13:44:05 -0700 (PDT)
Subject: [pypy-commit] pypy.org extradoc: update the values
Message-ID: <59025815.02aa1c0a.b7cb5.ac7b@mx.google.com>

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r884:3c445eee1b27
Date: 2017-04-27 22:43 +0200
http://bitbucket.org/pypy/pypy.org/changeset/3c445eee1b27/

Log:	update the values

diff --git a/don1.html b/don1.html
--- a/don1.html
+++ b/don1.html
@@ -9,13 +9,13 @@
 <script>
   $(function() {
     $("#progressbar").progressbar({
-      value: 63.6
+      value: 63.7
    });
   });
 </script>
 
    <!-- Income:PyPy:Donations:Py3k / 0.95 -->
-   $66829 of $105000 (63.6%)
+   $66846 of $105000 (63.7%)
    <div id="progressbar">
    </div>
 
@@ -23,7 +23,7 @@
   <li>
   <span id="donate_text">This donation goes towards supporting Python 3 in PyPy.
   Current status:
-    we have $2633 left
+    we have $2648 left
   in the account.</br> <a href="py3donate.html">Read proposal</a></span>
   </li>
   <li>

From pypy.commits at gmail.com  Fri Apr 28 09:14:00 2017
From: pypy.commits at gmail.com (mattip)
Date: Fri, 28 Apr 2017 06:14:00 -0700 (PDT)
Subject: [pypy-commit] pypy cpyext-obj-stealing: rework test as per irc
 discussion, passes with -A and untranslated
Message-ID: <59034018.91811c0a.e8755.de18@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-obj-stealing
Changeset: r91143:2bf4323abb8e
Date: 2017-04-28 13:38 +0300
http://bitbucket.org/pypy/pypy/changeset/2bf4323abb8e/

Log:	rework test as per irc discussion, passes with -A and untranslated

diff --git a/pypy/module/cpyext/test/test_listobject.py b/pypy/module/cpyext/test/test_listobject.py
--- a/pypy/module/cpyext/test/test_listobject.py
+++ b/pypy/module/cpyext/test/test_listobject.py
@@ -194,35 +194,60 @@
              """)])
         assert module.test_get_item() == 0
 
-    def test_set_item_macro(self):
+    def test_item_refcounts(self):
         """PyList_SET_ITEM leaks a reference to the target."""
         module = self.import_extension('foo', [
-             ("test_refcount_diff_after_setitem", "METH_NOARGS",
+             ("test_refcount_diff", "METH_NOARGS",
              """
-                PyObject* o = PyList_New(0);
-                PyObject* o2 = PyLong_FromLong(0);
-                Py_INCREF(o2);
-                Py_ssize_t refcount, new_refcount;
+                #define CHECKCOUNT(diff1, diff2, action) \
+                    new_count1 = Py_REFCNT(i1); \
+                    new_count2 = Py_REFCNT(i2); \
+                    diff = new_count1 - old_count1; \
+                    if (diff != diff1) {\
+                        sprintf(errbuffer, action \
+                            " i1 expected diff of %ld got %ld", (long)diff1, (long)diff); \
+                    PyErr_SetString(PyExc_AssertionError, errbuffer); \
+                    return NULL; } \
+                    diff = new_count2 - old_count2; \
+                    if (diff != diff2) {\
+                        sprintf(errbuffer, action \
+                            " i2 expected diff of %ld got %ld", (long)diff2, (long)diff); \
+                    PyErr_SetString(PyExc_AssertionError, errbuffer); \
+                    return NULL; } \
+                    old_count1 = new_count1; \
+                    old_count2 = new_count2;
 
-                refcount = Py_REFCNT(o2); // 1
+                PyObject* tmp, *o = PyList_New(0);
+                char errbuffer[1024];
+                PyObject* i1 = PyBytes_FromString("random string 1");
+                PyObject* i2 = PyBytes_FromString("random string 2");
+                Py_ssize_t old_count1, new_count1;
+                Py_ssize_t old_count2, new_count2;
+                Py_ssize_t diff;
 
-                PyList_Append(o, o2); 
+                old_count1 = Py_REFCNT(i1); // 1
+                old_count2 = Py_REFCNT(i2); // 1
 
-                new_refcount = Py_REFCNT(o2);
+                PyList_Append(o, i1);
+                CHECKCOUNT(1, 0, "PyList_Append");
 
-                if (new_refcount != refcount + 1)
-                    return PyLong_FromSsize_t(-10);
-                refcount = new_refcount;
+                PyList_SET_ITEM(o, 0, i2);
+                CHECKCOUNT(0, 0, "PyList_SET_ITEM");
 
-                // Steal a reference to o2, leak the old reference to o2.
-                // The net result should be no change in refcount.
-                PyList_SET_ITEM(o, 0, o2);
+                tmp = PyList_GET_ITEM(o, 0);
+                // XXX should tmp be the original i2?
+                //     use CPyListStrategy?
+                if (strcmp(PyString_AsString(tmp), PyString_AsString(i2))) 
+                {
+                    sprintf(errbuffer, "GETITEM did not return i2");
+                    PyErr_SetString(PyExc_AssertionError, errbuffer); 
+                    return NULL;
+                }
+                CHECKCOUNT(0, 0, "PyList_GET_ITEM");
 
-                new_refcount = Py_REFCNT(o2);
-
-                Py_DECREF(o2); // append incref'd.
-                Py_DECREF(o);
-                Py_DECREF(o2);
-                return PyLong_FromSsize_t(new_refcount - refcount);
+                Py_DECREF(i1); // append incref'd.
+                Py_DECREF(o); // decref's stolen reference to i2
+                Py_DECREF(i1); 
+                return PyLong_FromSsize_t(0);
              """)])
-        assert module.test_refcount_diff_after_setitem() == 0
+        assert module.test_refcount_diff() == 0

From pypy.commits at gmail.com  Fri Apr 28 09:14:04 2017
From: pypy.commits at gmail.com (mattip)
Date: Fri, 28 Apr 2017 06:14:04 -0700 (PDT)
Subject: [pypy-commit] pypy cpyext-obj-stealing: test shows that
 w_list.getitem returns a new PyObject with wrong refcount
Message-ID: <5903401c.17a4df0a.7195e.1b89@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-obj-stealing
Changeset: r91145:ae8d9aacb75e
Date: 2017-04-28 16:13 +0300
http://bitbucket.org/pypy/pypy/changeset/ae8d9aacb75e/

Log:	test shows that w_list.getitem returns a new PyObject with wrong
	refcount

diff --git a/pypy/module/cpyext/test/test_listobject.py b/pypy/module/cpyext/test/test_listobject.py
--- a/pypy/module/cpyext/test/test_listobject.py
+++ b/pypy/module/cpyext/test/test_listobject.py
@@ -243,9 +243,10 @@
                 tmp = PyList_GET_ITEM(o, 0);
                 // XXX should tmp be the original i2?
                 //     use CPyListStrategy?
-                if (strcmp(PyString_AsString(tmp), PyString_AsString(i2))) 
+                if ((Py_REFCNT(tmp) != Py_REFCNT(i2))) 
                 {
-                    sprintf(errbuffer, "GETITEM did not return i2");
+                    sprintf(errbuffer, "GETITEM return (%ld) and i2 (%ld)refcounts"
+                            " unequal", (long)Py_REFCNT(tmp), (long)Py_REFCNT(i2));
                     PyErr_SetString(PyExc_AssertionError, errbuffer); 
                     return NULL;
                 }

From pypy.commits at gmail.com  Fri Apr 28 09:14:02 2017
From: pypy.commits at gmail.com (mattip)
Date: Fri, 28 Apr 2017 06:14:02 -0700 (PDT)
Subject: [pypy-commit] pypy cpyext-obj-stealing: PyList_SetItem passes -A,
 fails untranslated
Message-ID: <5903401a.07ac1c0a.308c2.bf7a@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-obj-stealing
Changeset: r91144:e156ec5e5e89
Date: 2017-04-28 13:59 +0300
http://bitbucket.org/pypy/pypy/changeset/e156ec5e5e89/

Log:	PyList_SetItem passes -A, fails untranslated

diff --git a/pypy/module/cpyext/test/test_listobject.py b/pypy/module/cpyext/test/test_listobject.py
--- a/pypy/module/cpyext/test/test_listobject.py
+++ b/pypy/module/cpyext/test/test_listobject.py
@@ -199,6 +199,10 @@
         module = self.import_extension('foo', [
              ("test_refcount_diff", "METH_NOARGS",
              """
+                /* test that the refcount differences for functions
+                 * are correct. diff1 - expected refcount diff for i1,
+                 *              diff2 - expected refcount diff for i2
+                 */
                 #define CHECKCOUNT(diff1, diff2, action) \
                     new_count1 = Py_REFCNT(i1); \
                     new_count2 = Py_REFCNT(i2); \
@@ -225,6 +229,8 @@
                 Py_ssize_t old_count2, new_count2;
                 Py_ssize_t diff;
 
+                Py_INCREF(i2); // since it is used in macros
+
                 old_count1 = Py_REFCNT(i1); // 1
                 old_count2 = Py_REFCNT(i2); // 1
 
@@ -245,8 +251,22 @@
                 }
                 CHECKCOUNT(0, 0, "PyList_GET_ITEM");
 
+                PyList_SetItem(o, 0, i1);
+                CHECKCOUNT(0, -1, "PyList_Set_Item");
+
+                PyList_GetItem(o, 0);
+                CHECKCOUNT(0, 0, "PyList_Get_Item");
+
+                Py_DECREF(o); // decref's stolen reference to i2
+                #ifdef PYPY_VERSION
+                    // XXX TODO
+                #else
+                    if (Py_REFCNT(i1) != 1)
+                        return PyLong_FromSsize_t(1);
+                    if (Py_REFCNT(i2) != 1)
+                        return PyLong_FromSsize_t(2);
+                #endif
                 Py_DECREF(i1); // append incref'd.
-                Py_DECREF(o); // decref's stolen reference to i2
                 Py_DECREF(i1); 
                 return PyLong_FromSsize_t(0);
              """)])

From pypy.commits at gmail.com  Fri Apr 28 13:23:11 2017
From: pypy.commits at gmail.com (rlamy)
Date: Fri, 28 Apr 2017 10:23:11 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: fix test
Message-ID: <59037a7f.c486df0a.f4d00.8d26@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91146:c03bad787f66
Date: 2017-04-28 18:22 +0100
http://bitbucket.org/pypy/pypy/changeset/c03bad787f66/

Log:	fix test

diff --git a/pypy/module/_socket/test/test_sock_app.py b/pypy/module/_socket/test/test_sock_app.py
--- a/pypy/module/_socket/test/test_sock_app.py
+++ b/pypy/module/_socket/test/test_sock_app.py
@@ -555,11 +555,11 @@
         except _socket.gaierror as ex:
             skip("GAIError - probably no connection: %s" % str(ex.args))
         exc = raises(TypeError, s.send, None)
-        assert str(exc.value) == "'NoneType' does not support the buffer interface"
+        assert str(exc.value).startswith("a bytes-like object is required,")
         assert s.send(memoryview(b'')) == 0
         assert s.sendall(memoryview(b'')) is None
         exc = raises(TypeError, s.send, '')
-        assert str(exc.value) == "'str' does not support the buffer interface"
+        assert str(exc.value).startswith("a bytes-like object is required,")
         raises(TypeError, s.sendall, '')
         s.close()
         s = _socket.socket(_socket.AF_INET, _socket.SOCK_DGRAM, 0)

From pypy.commits at gmail.com  Fri Apr 28 15:32:16 2017
From: pypy.commits at gmail.com (rlamy)
Date: Fri, 28 Apr 2017 12:32:16 -0700 (PDT)
Subject: [pypy-commit] pypy PyBuffer: 'fix' test by documenting a difference
 with CPython
Message-ID: <590398c0.48b4df0a.5afec.0c05@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: PyBuffer
Changeset: r91147:65cc783b56e6
Date: 2017-04-28 20:29 +0100
http://bitbucket.org/pypy/pypy/changeset/65cc783b56e6/

Log:	'fix' test by documenting a difference with CPython

diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -403,6 +403,8 @@
         machine values, as if it had been read from a file using the
         fromfile() method).
         """
+        # For some reason, CPython rejects arguments with itemsize != 1 here
+        # (like array.array('i')). We don't apply that restriction.
         s = space.charbuf_w(w_s)
         self._frombytes(space, s)
 
diff --git a/pypy/module/array/test/test_array.py b/pypy/module/array/test/test_array.py
--- a/pypy/module/array/test/test_array.py
+++ b/pypy/module/array/test/test_array.py
@@ -170,6 +170,7 @@
             assert len(b) == 2 and b[0] == 0 and b[1] == 0
 
     def test_frombytes(self):
+        import sys
         for t in 'bBhHiIlLfd':
             a = self.array(t)
             a.frombytes(b'\x00' * a.itemsize * 2)
@@ -199,7 +200,12 @@
                     # bad I suppose.
                     assert a.tolist() == old_items * 2
             else:
-                raises(TypeError, a.frombytes, a)
+                if '__pypy__' in sys.modules:
+                    old_items = a.tolist()
+                    a.frombytes(a)
+                    assert a.tolist() == old_items * 2
+                else:
+                    raises(TypeError, a.frombytes, a)
 
     def test_fromfile(self):
         def myfile(c, s):

From pypy.commits at gmail.com  Sat Apr 29 05:31:22 2017
From: pypy.commits at gmail.com (tobweber)
Date: Sat, 29 Apr 2017 02:31:22 -0700 (PDT)
Subject: [pypy-commit] stmgc c8-adaptive-trx-length: Implement quick and
 dirty adaptive mode prototype
Message-ID: <59045d6a.532f1c0a.c3352.0253@mx.google.com>

Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-adaptive-trx-length
Changeset: r2044:2d9a2b1a8249
Date: 2017-04-29 11:26 +0200
http://bitbucket.org/pypy/stmgc/changeset/2d9a2b1a8249/

Log:	Implement quick and dirty adaptive mode prototype

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -289,6 +289,11 @@
                         /* conflict! */
                         dprintf(("_stm_validate() failed for obj %p\n", obj));
 
+                        /* disregard race conditions */
+                        if (stm_global_conflicts < stm_max_conflicts) {
+                            stm_global_conflicts += 1;
+                        }
+
                         /* first reset all modified objects from the backup
                            copies as soon as the first conflict is detected;
                            then we will proceed below to update our segment
@@ -1163,6 +1168,7 @@
 
     if (repeat_count == 0) {  /* else, 'nursery_mark' was already set
                                  in abort_data_structures_from_segment_num() */
+        stm_update_transaction_length();
         STM_SEGMENT->nursery_mark = ((stm_char *)_stm_nursery_start +
                                      stm_fill_mark_nursery_bytes);
     }
diff --git a/c8/stm/nursery.c b/c8/stm/nursery.c
--- a/c8/stm/nursery.c
+++ b/c8/stm/nursery.c
@@ -13,14 +13,26 @@
 
 static uintptr_t _stm_nursery_start;
 
+#define DEFAULT_FILL_MARK_NURSERY_BYTES (NURSERY_SIZE / 4)
+#define LARGE_FILL_MARK_NURSERY_BYTES   0x3000000000000000L;
 
-#define DEFAULT_FILL_MARK_NURSERY_BYTES   (NURSERY_SIZE / 4)
+// uintptr_t stm_fill_mark_nursery_bytes = DEFAULT_FILL_MARK_NURSERY_BYTES;
+uintptr_t stm_fill_mark_nursery_bytes = LARGE_FILL_MARK_NURSERY_BYTES;
 
-uintptr_t stm_fill_mark_nursery_bytes = DEFAULT_FILL_MARK_NURSERY_BYTES;
+static uint32_t stm_max_conflicts = 1000;
+static uint32_t stm_global_conflicts = 0;
+
+static void stm_update_transaction_length(void) {
+    float relative_conflicts = (float) stm_global_conflicts / stm_max_conflicts;
+    uintptr_t max_reduction =
+        LARGE_FILL_MARK_NURSERY_BYTES - DEFAULT_FILL_MARK_NURSERY_BYTES;
+    stm_fill_mark_nursery_bytes =
+        LARGE_FILL_MARK_NURSERY_BYTES - (relative_conflicts * max_reduction);
+}
+
 
 /************************************************************/
 
-
 static void setup_nursery(void)
 {
     assert(_STM_FAST_ALLOC <= NURSERY_SIZE);
diff --git a/c8/stm/nursery.h b/c8/stm/nursery.h
--- a/c8/stm/nursery.h
+++ b/c8/stm/nursery.h
@@ -56,4 +56,9 @@
 static inline struct object_s *mark_loc(object_t *obj);
 static inline bool _is_from_same_transaction(object_t *obj);
 
+static uint32_t stm_max_conflicts;
+static uint32_t stm_global_conflicts;
+
+static void stm_update_transaction_length(void);
+
 #endif

From pypy.commits at gmail.com  Sat Apr 29 05:31:35 2017
From: pypy.commits at gmail.com (tobweber)
Date: Sat, 29 Apr 2017 02:31:35 -0700 (PDT)
Subject: [pypy-commit] stmgc c8-long-transactions: Make single thread mode
 transactions inevitable only if there are less than two segments in use
Message-ID: <59045d77.9d451c0a.9e4fe.7911@mx.google.com>

Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-long-transactions
Changeset: r2045:e2d2d2abc99c
Date: 2017-04-26 21:01 +0200
http://bitbucket.org/pypy/stmgc/changeset/e2d2d2abc99c/

Log:	Make single thread mode transactions inevitable only if there are
	less than two segments in use

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -1170,7 +1170,9 @@
                 segments_in_use));
         if (segments_in_use <= single_thread_mode_segments_in_use_limit) {
             start_single_thread_mode();
-            _stm_become_inevitable("execute_in_single_thread_mode");
+            if (segments_in_use < 2) {
+                _stm_become_inevitable("execute_in_single_thread_mode");
+            }
         } else if (stm_single_thread_mode_active) {
             end_single_thread_mode();
         }

From pypy.commits at gmail.com  Sat Apr 29 16:19:33 2017
From: pypy.commits at gmail.com (mattip)
Date: Sat, 29 Apr 2017 13:19:33 -0700 (PDT)
Subject: [pypy-commit] pypy cpyext-obj-stealing: fix test
Message-ID: <5904f555.6896df0a.6faec.005e@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-obj-stealing
Changeset: r91150:a69664247db2
Date: 2017-04-29 22:53 +0300
http://bitbucket.org/pypy/pypy/changeset/a69664247db2/

Log:	fix test

diff --git a/pypy/module/cpyext/test/test_listobject.py b/pypy/module/cpyext/test/test_listobject.py
--- a/pypy/module/cpyext/test/test_listobject.py
+++ b/pypy/module/cpyext/test/test_listobject.py
@@ -241,8 +241,7 @@
                 CHECKCOUNT(0, 0, "PyList_SET_ITEM");
 
                 tmp = PyList_GET_ITEM(o, 0);
-                // XXX should tmp be the original i2?
-                //     use CPyListStrategy?
+                // XXX should tmp == i2?
                 if ((Py_REFCNT(tmp) != Py_REFCNT(i2))) 
                 {
                     sprintf(errbuffer, "GETITEM return (%ld) and i2 (%ld)refcounts"
@@ -258,17 +257,15 @@
                 PyList_GetItem(o, 0);
                 CHECKCOUNT(0, 0, "PyList_Get_Item");
 
-                Py_DECREF(o); // decref's stolen reference to i2
-                #ifdef PYPY_VERSION
-                    // XXX TODO
-                #else
-                    if (Py_REFCNT(i1) != 1)
-                        return PyLong_FromSsize_t(1);
-                    if (Py_REFCNT(i2) != 1)
-                        return PyLong_FromSsize_t(2);
+                Py_DECREF(o); 
+                #ifndef PYPY_VERSION
+                {
+                    // PyPy deletes only at teardown
+                    CHECKCOUNT(-1, 0, "Py_DECREF(o)");
+                }
                 #endif
                 Py_DECREF(i1); // append incref'd.
-                Py_DECREF(i1); 
+                Py_DECREF(i2); 
                 return PyLong_FromSsize_t(0);
              """)])
         assert module.test_refcount_diff() == 0

From pypy.commits at gmail.com  Sat Apr 29 16:19:35 2017
From: pypy.commits at gmail.com (mattip)
Date: Sat, 29 Apr 2017 13:19:35 -0700 (PDT)
Subject: [pypy-commit] pypy cpyext-obj-stealing: check return values
Message-ID: <5904f557.748fdf0a.b039e.1e4a@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-obj-stealing
Changeset: r91151:e26ee9fcd87e
Date: 2017-04-29 22:54 +0300
http://bitbucket.org/pypy/pypy/changeset/e26ee9fcd87e/

Log:	check return values

diff --git a/pypy/module/cpyext/test/test_listobject.py b/pypy/module/cpyext/test/test_listobject.py
--- a/pypy/module/cpyext/test/test_listobject.py
+++ b/pypy/module/cpyext/test/test_listobject.py
@@ -163,11 +163,17 @@
              Py_INCREF(o);
              PyList_SET_ITEM(l, 1, o);
 
-             PyList_GET_ITEM(o, 0);
-             PyList_GET_ITEM(l, 1);
+             if(PyList_GET_ITEM(o, 0) != PyList_GET_ITEM(l, 1))
+             {
+                PyErr_SetString(PyExc_AssertionError, "PyList_GET_ITEM error");
+                return NULL;
+             }
 
-             PyList_GET_SIZE(o);
-             PyList_GET_SIZE(l);
+             if(PyList_GET_SIZE(o) != PyList_GET_SIZE(l))
+             {
+                PyErr_SetString(PyExc_AssertionError, "PyList_GET_SIZE error");
+                return NULL;
+             }
 
              return o;
              """
@@ -228,13 +234,16 @@
                 Py_ssize_t old_count1, new_count1;
                 Py_ssize_t old_count2, new_count2;
                 Py_ssize_t diff;
+                int ret;
 
                 Py_INCREF(i2); // since it is used in macros
 
                 old_count1 = Py_REFCNT(i1); // 1
                 old_count2 = Py_REFCNT(i2); // 1
 
-                PyList_Append(o, i1);
+                ret = PyList_Append(o, i1);
+                if (ret != 0) 
+                    return NULL;
                 CHECKCOUNT(1, 0, "PyList_Append");
 
                 PyList_SET_ITEM(o, 0, i2);

From pypy.commits at gmail.com  Sat Apr 29 16:19:37 2017
From: pypy.commits at gmail.com (mattip)
Date: Sat, 29 Apr 2017 13:19:37 -0700 (PDT)
Subject: [pypy-commit] pypy cpyext-obj-stealing: fix test to not use cached
 object
Message-ID: <5904f559.89aadf0a.1969a.f6ba@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-obj-stealing
Changeset: r91152:d0e8878705c8
Date: 2017-04-29 23:00 +0300
http://bitbucket.org/pypy/pypy/changeset/d0e8878705c8/

Log:	fix test to not use cached object

diff --git a/pypy/module/cpyext/test/test_listobject.py b/pypy/module/cpyext/test/test_listobject.py
--- a/pypy/module/cpyext/test/test_listobject.py
+++ b/pypy/module/cpyext/test/test_listobject.py
@@ -189,16 +189,17 @@
                 PyObject* o, *o2, *o3;
                 o = PyList_New(1);
 
-                o2 = PyInt_FromLong(0);
+                o2 = PyBytes_FromString("test_get_item0");
+                Py_INCREF(o2);
                 PyList_SET_ITEM(o, 0, o2);
-                o2 = NULL;
 
                 o3 = PyList_GET_ITEM(o, 0);
                 Py_INCREF(o3);
-                Py_CLEAR(o);
+                Py_DECREF(o);
+                Py_DECREF(o2);
                 return o3;
              """)])
-        assert module.test_get_item() == 0
+        assert module.test_get_item() == b'test_get_item0'
 
     def test_item_refcounts(self):
         """PyList_SET_ITEM leaks a reference to the target."""

From pypy.commits at gmail.com  Sat Apr 29 16:19:39 2017
From: pypy.commits at gmail.com (mattip)
Date: Sat, 29 Apr 2017 13:19:39 -0700 (PDT)
Subject: [pypy-commit] pypy cpyext-obj-stealing: rework refcounting to pass
 tests, use fresh object in test_list_macros
Message-ID: <5904f55b.138e1c0a.b9ed5.acbc@mx.google.com>

Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-obj-stealing
Changeset: r91153:d8750637a6f7
Date: 2017-04-29 23:18 +0300
http://bitbucket.org/pypy/pypy/changeset/d8750637a6f7/

Log:	rework refcounting to pass tests, use fresh object in
	test_list_macros

diff --git a/pypy/module/cpyext/listobject.py b/pypy/module/cpyext/listobject.py
--- a/pypy/module/cpyext/listobject.py
+++ b/pypy/module/cpyext/listobject.py
@@ -3,7 +3,8 @@
 from pypy.module.cpyext.api import (cpython_api, CANNOT_FAIL, Py_ssize_t,
                                     build_type_checkers)
 from pypy.module.cpyext.pyerrors import PyErr_BadInternalCall
-from pypy.module.cpyext.pyobject import decref, PyObject, make_ref, w_obj_has_pyobj
+from pypy.module.cpyext.pyobject import (decref, incref, PyObject, make_ref, 
+            w_obj_has_pyobj)
 from pypy.objspace.std.listobject import W_ListObject
 from pypy.interpreter.error import oefmt
 
@@ -19,10 +20,11 @@
     PySequence_SetItem()  or expose the object to Python code before
     setting all items to a real object with PyList_SetItem().
     """
-    return space.newlist([None] * len)
+    w_list = space.newlist([None] * len)
+    w_list.convert_to_cpy_strategy(space)
+    return w_list
 
- at cpython_api([rffi.VOIDP, Py_ssize_t, PyObject], PyObject, error=CANNOT_FAIL,
-             result_borrowed=True)
+ at cpython_api([rffi.VOIDP, Py_ssize_t, PyObject], lltype.Void, error=CANNOT_FAIL)
 def PyList_SET_ITEM(space, w_list, index, w_item):
     """Form of PyList_SetItem() without error checking. This is normally
     only used to fill in new lists where there is no previous content.
@@ -31,10 +33,15 @@
     discard a reference to any item that it being replaced; any reference in
     list at position i will be leaked.
     """
+    from pypy.module.cpyext.sequence import CPyListStrategy
+    cpy_strategy = space.fromcache(CPyListStrategy)
     assert isinstance(w_list, W_ListObject)
+    assert w_list.strategy is cpy_strategy, "list strategy not CPyListStrategy"
     assert 0 <= index < w_list.length()
+    w_old = w_list.getitem(index)
+    incref(space, w_old) # since setitem calls decref, maintain cpython semantics here
     w_list.setitem(index, w_item)
-    return w_item
+    decref(space, w_item)
 
 
 @cpython_api([PyObject, Py_ssize_t, PyObject], rffi.INT_real, error=-1)
@@ -45,20 +52,15 @@
     This function "steals" a reference to item and discards a reference to
     an item already in the list at the affected position.
     """
-    from pypy.module.cpyext.sequence import CPyListStrategy
-    cpy_strategy = space.fromcache(CPyListStrategy)
     if not isinstance(w_list, W_ListObject):
         decref(space, w_item)
         PyErr_BadInternalCall(space)
     if index < 0 or index >= w_list.length():
         decref(space, w_item)
         raise oefmt(space.w_IndexError, "list assignment index out of range")
-    if w_list.strategy is not cpy_strategy:
-        w_list.ensure_object_strategy() # make sure we can use borrowed obj
-    w_old = w_list.getitem(index)
-    if w_obj_has_pyobj(w_old):
-        decref(space, w_old)
+    w_list.convert_to_cpy_strategy(space)
     w_list.setitem(index, w_item)
+    decref(space, w_item)
     return 0
 
 @cpython_api([PyObject, Py_ssize_t], PyObject, result_borrowed=True)
@@ -67,14 +69,11 @@
     position must be positive, indexing from the end of the list is not
     supported.  If pos is out of bounds, return NULL and set an
     IndexError exception."""
-    from pypy.module.cpyext.sequence import CPyListStrategy
-    cpy_strategy = space.fromcache(CPyListStrategy)
     if not isinstance(w_list, W_ListObject):
         PyErr_BadInternalCall(space)
     if index < 0 or index >= w_list.length():
         raise oefmt(space.w_IndexError, "list index out of range")
-    if w_list.strategy is not cpy_strategy:
-        w_list.ensure_object_strategy() # make sure we can return a borrowed obj
+    w_list.convert_to_cpy_strategy(space)
     w_res = w_list.getitem(index)
     return w_res     # borrowed ref
 
@@ -83,8 +82,9 @@
 def PyList_Append(space, w_list, w_item):
     if not isinstance(w_list, W_ListObject):
         PyErr_BadInternalCall(space)
-    make_ref(space, w_item)
+    #pyobj = make_ref(space, w_item)
     w_list.append(w_item)
+    w_list.convert_to_cpy_strategy(space)  # calls incref when switching strategy
     return 0
 
 @cpython_api([PyObject, Py_ssize_t, PyObject], rffi.INT_real, error=-1)
diff --git a/pypy/module/cpyext/test/test_listobject.py b/pypy/module/cpyext/test/test_listobject.py
--- a/pypy/module/cpyext/test/test_listobject.py
+++ b/pypy/module/cpyext/test/test_listobject.py
@@ -152,16 +152,13 @@
     def test_list_macros(self):
         """The PyList_* macros cast, and calls expecting that build."""
         module = self.import_extension('foo', [
-            ("test_macro_invocations", "METH_NOARGS",
+            ("test_macro_invocations", "METH_O",
              """
              PyObject* o = PyList_New(2);
              PyListObject* l = (PyListObject*)o;
 
-
-             Py_INCREF(o);
-             PyList_SET_ITEM(o, 0, o);
-             Py_INCREF(o);
-             PyList_SET_ITEM(l, 1, o);
+             PyList_SET_ITEM(o, 0, args);
+             PyList_SET_ITEM(l, 1, args);
 
              if(PyList_GET_ITEM(o, 0) != PyList_GET_ITEM(l, 1))
              {
@@ -179,8 +176,9 @@
              """
             )
         ])
-        x = module.test_macro_invocations()
-        assert x[0] is x[1] is x
+        s = 'abcdef'
+        x = module.test_macro_invocations(s)
+        assert x[0] is x[1] is s
 
     def test_get_item_macro(self):
         module = self.import_extension('foo', [

From pypy.commits at gmail.com  Sun Apr 30 14:18:47 2017
From: pypy.commits at gmail.com (rlamy)
Date: Sun, 30 Apr 2017 11:18:47 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Add missing property
 _SSLSocket.server_side (fixes #2547)
Message-ID: <59062a87.3294500a.55c84.7df7@mx.google.com>

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r91154:9252012ce1b9
Date: 2017-04-30 19:18 +0100
http://bitbucket.org/pypy/pypy/changeset/9252012ce1b9/

Log:	Add missing property _SSLSocket.server_side (fixes #2547)

diff --git a/lib_pypy/_cffi_ssl/_stdssl/__init__.py b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
--- a/lib_pypy/_cffi_ssl/_stdssl/__init__.py
+++ b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
@@ -46,7 +46,7 @@
 SERVER = 1
 
 VERIFY_DEFAULT = 0
-VERIFY_CRL_CHECK_LEAF = lib.X509_V_FLAG_CRL_CHECK 
+VERIFY_CRL_CHECK_LEAF = lib.X509_V_FLAG_CRL_CHECK
 VERIFY_CRL_CHECK_CHAIN = lib.X509_V_FLAG_CRL_CHECK | lib.X509_V_FLAG_CRL_CHECK_ALL
 VERIFY_X509_STRICT = lib.X509_V_FLAG_X509_STRICT
 if lib.Cryptography_HAS_X509_V_FLAG_TRUSTED_FIRST:
@@ -297,6 +297,10 @@
         else:
             raise TypeError("The value must be a SSLContext")
 
+    @property
+    def server_side(self):
+        return self.socket_type == SSL_SERVER
+
     def do_handshake(self):
         sock = self.get_socket_or_connection_gone()
         ssl = self.ssl
@@ -658,7 +662,7 @@
     def tls_unique_cb(self):
         buf = ffi.new("char[]", SSL_CB_MAXLEN)
 
-        if lib.SSL_session_reused(self.ssl) ^ (not self.socket_type):
+        if lib.SSL_session_reused(self.ssl) ^ (not self.server_side):
             # if session is resumed XOR we are the client
             length = lib.SSL_get_finished(self.ssl, buf, SSL_CB_MAXLEN)
         else:
@@ -1297,7 +1301,7 @@
     result = _asn1obj2py(obj);
     lib.ASN1_OBJECT_free(obj);
     return result;
-                                                               
+
 
 class MemoryBIO(object):
     def __init__(self):

From pypy.commits at gmail.com  Sun Apr 30 18:15:02 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sun, 30 Apr 2017 15:15:02 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Issue 2548: os.utime() would return
 incorrect errno.
Message-ID: <590661e6.84e11c0a.b0cc2.73dd@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91156:7f6e04d6d012
Date: 2017-05-01 00:13 +0200
http://bitbucket.org/pypy/pypy/changeset/7f6e04d6d012/

Log:	Issue 2548: os.utime() would return incorrect errno.

diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/test_posix2.py
--- a/pypy/module/posix/test/test_posix2.py
+++ b/pypy/module/posix/test/test_posix2.py
@@ -582,8 +582,11 @@
 
     def test_utime_raises(self):
         os = self.posix
+        import errno
         raises(TypeError, "os.utime('xxx', 3)")
-        raises(OSError, "os.utime('somefilewhichihopewouldneverappearhere', None)")
+        exc = raises(OSError,
+                     "os.utime('somefilewhichihopewouldneverappearhere', None)")
+        assert exc.value.errno == errno.ENOENT
 
     for name in rposix.WAIT_MACROS:
         if hasattr(os, name):
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -2057,8 +2057,10 @@
         raise OSError(get_saved_errno(), "execve failed")
 
 if HAVE_LINKAT:
-    c_linkat = external('linkat',
-        [rffi.INT, rffi.CCHARP, rffi.INT, rffi.CCHARP, rffi.INT], rffi.INT)
+    c_linkat = external(
+        'linkat',
+        [rffi.INT, rffi.CCHARP, rffi.INT, rffi.CCHARP, rffi.INT], rffi.INT,
+        save_err=rffi.RFFI_SAVE_ERRNO)
 
     def linkat(src, dst, src_dir_fd=AT_FDCWD, dst_dir_fd=AT_FDCWD,
             follow_symlinks=True):
@@ -2073,7 +2075,8 @@
         handle_posix_error('linkat', error)
 
 if HAVE_FUTIMENS:
-    c_futimens = external('futimens', [rffi.INT, TIMESPEC2P], rffi.INT)
+    c_futimens = external('futimens', [rffi.INT, TIMESPEC2P], rffi.INT,
+                          save_err=rffi.RFFI_SAVE_ERRNO)
 
     def futimens(fd, atime, atime_ns, mtime, mtime_ns):
         l_times = lltype.malloc(TIMESPEC2P.TO, 2, flavor='raw')
@@ -2086,8 +2089,10 @@
         handle_posix_error('futimens', error)
 
 if HAVE_UTIMENSAT:
-    c_utimensat = external('utimensat',
-        [rffi.INT, rffi.CCHARP, TIMESPEC2P, rffi.INT], rffi.INT)
+    c_utimensat = external(
+        'utimensat',
+        [rffi.INT, rffi.CCHARP, TIMESPEC2P, rffi.INT], rffi.INT,
+        save_err=rffi.RFFI_SAVE_ERRNO)
 
     def utimensat(pathname, atime, atime_ns, mtime, mtime_ns,
             dir_fd=AT_FDCWD, follow_symlinks=True):

From pypy.commits at gmail.com  Sun Apr 30 18:15:00 2017
From: pypy.commits at gmail.com (amauryfa)
Date: Sun, 30 Apr 2017 15:15:00 -0700 (PDT)
Subject: [pypy-commit] pypy py3.5: Disable lone surrogates in utf-16 and
 utf-32 encoders
Message-ID: <590661e4.cf9adf0a.f594d.f84c@mx.google.com>

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.5
Changeset: r91155:1ca1708d0606
Date: 2017-04-19 15:28 +0200
http://bitbucket.org/pypy/pypy/changeset/1ca1708d0606/

Log:	Disable lone surrogates in utf-16 and utf-32 encoders

diff --git a/pypy/module/_codecs/interp_codecs.py b/pypy/module/_codecs/interp_codecs.py
--- a/pypy/module/_codecs/interp_codecs.py
+++ b/pypy/module/_codecs/interp_codecs.py
@@ -629,6 +629,21 @@
     wrap_encoder.func_name = rname
     globals()[name] = wrap_encoder
 
+def make_utf_encoder_wrapper(name):
+    rname = "unicode_encode_%s" % (name.replace("_encode", ""), )
+    assert hasattr(runicode, rname)
+    @unwrap_spec(uni=unicode, errors='text_or_none')
+    def wrap_encoder(space, uni, errors="strict"):
+        if errors is None:
+            errors = 'strict'
+        state = space.fromcache(CodecState)
+        func = getattr(runicode, rname)
+        result = func(uni, len(uni), errors, state.encode_error_handler,
+                      allow_surrogates=False)
+        return space.newtuple([space.newbytes(result), space.newint(len(uni))])
+    wrap_encoder.func_name = rname
+    globals()[name] = wrap_encoder
+
 def make_decoder_wrapper(name):
     rname = "str_decode_%s" % (name.replace("_decode", ""), )
     assert hasattr(runicode, rname)
@@ -650,16 +665,20 @@
          "ascii_encode",
          "latin_1_encode",
          "utf_7_encode",
+         "unicode_escape_encode",
+         "raw_unicode_escape_encode",
+        ]:
+    make_encoder_wrapper(encoder)
+
+for encoder in [
          "utf_16_encode",
          "utf_16_be_encode",
          "utf_16_le_encode",
          "utf_32_encode",
          "utf_32_be_encode",
          "utf_32_le_encode",
-         "unicode_escape_encode",
-         "raw_unicode_escape_encode",
         ]:
-    make_encoder_wrapper(encoder)
+    make_utf_encoder_wrapper(encoder)
 
 for decoder in [
          "ascii_decode",
diff --git a/pypy/module/_codecs/test/test_codecs.py b/pypy/module/_codecs/test/test_codecs.py
--- a/pypy/module/_codecs/test/test_codecs.py
+++ b/pypy/module/_codecs/test/test_codecs.py
@@ -758,6 +758,11 @@
         s = "\u5678".encode("latin-1", "test.bad_handler")
         assert s == b'\xe9'
 
+    def test_lone_surrogates(self):
+        for encoding in ('utf-8', 'utf-16', 'utf-16-le', 'utf-16-be',
+                         'utf-32', 'utf-32-le', 'utf-32-be'):
+            raises(UnicodeEncodeError, u'\ud800'.encode, encoding)
+
     def test_charmap_encode(self):
         assert 'xxx'.encode('charmap') == b'xxx'