Author: Matti Picus <[email protected]>
Branch: py3.6
Changeset: r96710:018e437e5061
Date: 2019-05-28 09:16 +0300
http://bitbucket.org/pypy/pypy/changeset/018e437e5061/
Log: merge default into branch
diff --git a/pypy/module/pypyjit/test_pypy_c/test_ffi.py
b/pypy/module/pypyjit/test_pypy_c/test_ffi.py
--- a/pypy/module/pypyjit/test_pypy_c/test_ffi.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_ffi.py
@@ -425,9 +425,11 @@
setarrayitem_raw(i153, 0, i106, descr=...)
p156 = getfield_gc_r(p48, descr=...)
i158 = getfield_raw_i(..., descr=...)
+ i160 = int_sub(i158, 16)
+ setfield_raw(#, i160, descr=...)
setfield_gc(p48, p49, descr=...)
setfield_gc(p134, ConstPtr(null), descr=...)
- i160 = int_lt(i158, 0)
+ i160 = int_lt(i160, 0)
guard_false(i160, descr=...)
jump(..., descr=...)
""")
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,5 @@
+--only-binary vmprof
+
cffi>=1.4.0
# parse log files in rvmprof tests
diff --git a/rpython/tool/jitlogparser/parser.py
b/rpython/tool/jitlogparser/parser.py
--- a/rpython/tool/jitlogparser/parser.py
+++ b/rpython/tool/jitlogparser/parser.py
@@ -504,8 +504,10 @@
for line in lines:
if line:
num, count = line.split(':', 2)
- mapping[num].count = int(count)
-
+ try:
+ mapping[num].count = int(count)
+ except KeyError:
+ pass # too bad
def mangle_descr(descr):
if descr.startswith('TargetToken('):
diff --git a/testrunner/get_info.py b/testrunner/get_info.py
--- a/testrunner/get_info.py
+++ b/testrunner/get_info.py
@@ -10,8 +10,7 @@
BASE_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
if sys.platform.startswith('win'):
TARGET_NAME = r'pypy3-c.exe'
- # see https://github.com/pypa/virtualenv/issues/789
- TARGET_DIR = 'bin'
+ TARGET_DIR = 'Scripts'
else:
TARGET_NAME = 'pypy3-c'
TARGET_DIR = 'bin'
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
