[pypy-commit] [Git][pypy/pypy][branch/win64-cpyext] 91 commits: ./update_vendored to hpy.devel 0.1.dev756+g848192d, git rev 848192d

Matti Picus foss at heptapod.net
Sun Dec 20 17:49:12 EST 2020



Matti Picus pushed to branch branch/win64-cpyext at PyPy / pypy


Commits:
a9ba26c0 by Antonio Cuni at 2020-11-06T16:28:49+01:00
./update_vendored to hpy.devel 0.1.dev756+g848192d, git rev 848192d

--HG--
branch : hpy

- - - - -
1612e04e by Antonio Cuni at 2020-11-06T16:45:05+01:00
update the definition of HPyContext, rename the HPyTracker functions and kill HPyDict_{Get,Set}Item

--HG--
branch : hpy

- - - - -
13bbeb40 by Antonio Cuni at 2020-11-06T17:22:22+01:00
implement HPyErr_Clear, and improve the documentaion about how this stuff is implemented

--HG--
branch : hpy

- - - - -
3f12d5dd by Antonio Cuni at 2020-11-06T17:35:48+01:00
temporarily comment out this line until we decide how to deal with it upstream

--HG--
branch : hpy

- - - - -
ba718de8 by Antonio Cuni at 2020-11-06T17:44:26+01:00
fix ztranslation

--HG--
branch : hpy

- - - - -
38ac6471 by Antonio Cuni at 2020-11-06T17:18:51+00:00
fix the extra_tests/hpy_tests/conftest.py, which was broken after a refactoring in hpy.devel

--HG--
branch : hpy

- - - - -
56f0bbd2 by Antonio Cuni at 2020-11-06T17:40:52+00:00
use pytest_configure instead of pytest_sessionstart, to make sure that the hook is called even when we do py.test extra_tests. Before it was NOT called and the result was that hpy tests were never executed by buildbot :(

--HG--
branch : hpy

- - - - -
ba7496c0 by Matti Picus at 2020-11-07T21:13:30+02:00
fix extra_tests - apparently pytest_addoption can only be in toplevel conftest.py

https://github.com/pytest-dev/pytest/issues/3097#issuecomment-356406411

--HG--
branch : hpy

- - - - -
c47532d7 by Antonio Cuni at 2020-11-18T13:52:50+01:00
a branch where to introduce @error_value to be able to specify arbitrary return values to use in case of exceptions (which is needed by hpy)

--HG--
branch : rpython-error_value

- - - - -
8daa3e4c by Antonio Cuni at 2020-11-19T09:30:09+01:00
a branch where to tentatatively transplant the rpython-error_value branch on top of hpy

--HG--
branch : hpy-error-value

- - - - -
cf9a9054 by Antonio Cuni at 2020-11-18T14:09:50+01:00
add a test which checks that in case of exception the function returns a specific error value, and the llinterp machinerty to make it possible. The default case passes out of the box of course, while test_custom_error_value is WIP

--HG--
branch : hpy-error-value

- - - - -
c711d9f8 by Antonio Cuni at 2020-11-18T14:09:50+01:00
add a test which checks that in case of exception the function returns a specific error value, and the llinterp machinerty to make it possible. The default case passes out of the box of course, while test_custom_error_value is WIP

--HG--
branch : rpython-error_value

- - - - -
01296934 by Antonio Cuni at 2020-11-18T15:07:19+01:00
implement @ll_error_value and add a couple of test to ensure that it works correctly also in corner cases

--HG--
branch : hpy-error-value

- - - - -
3fcbb084 by Antonio Cuni at 2020-11-18T15:07:19+01:00
implement @ll_error_value and add a couple of test to ensure that it works correctly also in corner cases

--HG--
branch : rpython-error_value

- - - - -
7491e15f by Antonio Cuni at 2020-11-18T21:22:27+01:00
fix the case for exceptions raised by builtin ops

--HG--
branch : hpy-error-value

- - - - -
b52af824 by Antonio Cuni at 2020-11-18T21:22:27+01:00
fix the case for exceptions raised by builtin ops

--HG--
branch : rpython-error_value

- - - - -
c31021fe by Antonio Cuni at 2020-11-18T21:25:32+01:00
document the branch

--HG--
branch : hpy-error-value

- - - - -
454729a7 by Antonio Cuni at 2020-11-18T21:25:32+01:00
document the branch

--HG--
branch : rpython-error_value

- - - - -
a63e6b15 by Antonio Cuni at 2020-11-20T18:13:38+01:00
rename this test, else it's ungreppable

--HG--
branch : hpy-error-value

- - - - -
ef0de482 by Antonio Cuni at 2020-11-20T18:13:38+01:00
rename this test, else it's ungreppable

--HG--
branch : rpython-error_value

- - - - -
384de503 by Antonio Cuni at 2020-11-21T11:58:27+01:00
WIP: require the user to explicitly define which error_value to use when using @llhelper_can_raise, because this is what we need for HPy. However, this uncovers a problem, see test_llhelper_can_raise_custome_error_value

--HG--
branch : hpy-error-value

- - - - -
1cbed6f5 by Antonio Cuni at 2020-11-21T11:58:27+01:00
WIP: require the user to explicitly define which error_value to use when using @llhelper_can_raise, because this is what we need for HPy. However, this uncovers a problem, see test_llhelper_can_raise_custome_error_value

--HG--
branch : rpython-error_value

- - - - -
94318652 by Antonio Cuni at 2020-11-30T18:08:58+00:00
temporary checkin to see whether disabling this breaks any test

--HG--
branch : hpy-error-value

- - - - -
93789710 by Antonio Cuni at 2020-11-30T21:39:44+01:00
Refactor&simplify the approach:

1. declare that the return value of general RPython function is undefined and
   that you should not rely on it

2. merge @llhelper_can_raise and @ll_error_value into a combined
   @llhelper_error_value: this is the only case which we ultimately care about,
   and it's simpler to test/implement them together than separately

3. introduce a failing test (test_enforce_llhelper_error_value_in_case_of_nested_exception)
   which will be fixed in the next commit.

--HG--
branch : hpy-error-value

- - - - -
c2989d4d by Antonio Cuni at 2020-11-30T21:44:34+01:00
fix test_enforce_llhelper_error_value_in_case_of_nested_exception by disabling an optimization if the graph has @llhelper_error_value

--HG--
branch : hpy-error-value

- - - - -
e942434b by Antonio Cuni at 2020-12-01T16:18:52+01:00
Make sure we return the correct error_value in case of exceptions:

  - add the test_errorval_returned_by_api_functions, which will be commited to
    the HPy repo as part of the antocuni/more-tests-4 branch (git commit
    2e28e08)

  - use the new @llhelper_error_value which was introduced by the
    rpython-error_value branch and transplanted here to fix the test

  - add a new param @API.func(...., error_value=...). It is now required to
    explicitly specify an error_value for functions returning int, double,
    etc.

--HG--
branch : hpy-error-value

- - - - -
dc43712e by Antonio Cuni at 2020-12-01T17:09:21+01:00
add one more test, commited to the hpy repo in commit f698b7d

--HG--
branch : hpy-error-value

- - - - -
42ea6a40 by Antonio Cuni at 2020-12-01T17:57:38+01:00
fix corresponding to hpy git rev 8de7983

--HG--
branch : hpy-error-value

- - - - -
01b799f6 by Simon Cross at 2020-12-01T23:31:00+02:00
Update vendored hpy to 7c832a2f.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
68323427 by Simon Cross at 2020-12-02T00:15:39+02:00
Update ctx.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
9a14b0c8 by Simon Cross at 2020-12-02T00:16:23+02:00
Update the exceptions available as constant handles.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
418f8db8 by Simon Cross at 2020-12-02T00:16:58+02:00
Add new hpylong API methods.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
02768173 by Simon Cross at 2020-12-02T00:17:10+02:00
Add new hpybytes API methods.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
28c8ca0c by Simon Cross at 2020-12-02T00:17:55+02:00
Add HPyErr_SetObject.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
148e5f27 by Antonio Cuni at 2020-12-02T11:54:15+01:00
fix whatsnew

--HG--
branch : hpy-error-value

- - - - -
f3de4cbc by Antonio Cuni at 2020-12-02T11:55:32+01:00
document this branch

--HG--
branch : hpy-error-value

- - - - -
384c85e4 by Antonio Cuni at 2020-12-02T10:56:52+00:00
hg merge py3.6

--HG--
branch : hpy-error-value

- - - - -
aea9ffb1 by Simon Cross at 2020-12-02T16:18:24+02:00
Raise ValueError from HPyBytes_FromStringAndSize if a NULL string is passed.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
920414ef by Simon Cross at 2020-12-02T16:41:02+02:00
Remove note about fixing cpyext PyLong_AsSize_t (will open an MR instead).

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
eb828ff6 by Ronan Lamy at 2020-12-02T15:10:54+00:00
fix cparser import after move

--HG--
branch : py3.6

- - - - -
df7bf72c by Ronan Lamy at 2020-12-02T15:45:47+00:00
Remove obsolete workaround

--HG--
branch : py3.6

- - - - -
62236fa7 by Antonio Cuni at 2020-12-02T17:27:35+01:00
hg merge py3.6

--HG--
branch : hpy

- - - - -
5741ab2f by Antonio Cuni at 2020-12-02T17:28:08+01:00
close merged branch

--HG--
branch : hpy-error-value

- - - - -
8f003db3 by Antonio Cuni at 2020-12-02T17:30:06+01:00
Merge the hpy-error-value branch.

This branch does two things:

1. transplant the content of the branch rpython-error_value which was just
   merged to default

2. use the new functionality in HPy to implement the new parameter
   @API.func(..., error_value=...)

This fixes HPy exceptions, which were broken after translation

--HG--
branch : hpy

- - - - -
1dd7fb65 by Simon Cross at 2020-12-02T22:15:06+02:00
Merge in hpy branch.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
0cd378b8 by Simon Cross at 2020-12-02T22:36:43+02:00
Add error values to new HPyLong functions.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
c5bd13b7 by Simon Cross at 2020-12-03T00:30:35+02:00
Add all builtin exceptions to the fake objspace.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
d16b562c by Simon Cross at 2020-12-03T00:32:21+02:00
Add constcharpsize2str.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
bfd59033 by Simon Cross at 2020-12-03T00:33:05+02:00
Fix const char * types.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
87cc8282 by Simon Cross at 2020-12-03T22:40:03+02:00
Reformat if statement.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
511fd9e6 by Simon Cross at 2020-12-03T23:11:34+02:00
Convert API.cast to C-style type specifiers.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
7329efa0 by Matti Picus at 2020-12-03T23:13:08+02:00
merge default into branch

--HG--
branch : py3.7

- - - - -
5377bf6e by Simon Cross at 2020-12-03T23:29:18+02:00
Implement constcharpsize2str in rffi.

--HG--
branch : py3.6

- - - - -
ac7049ab by Simon Cross at 2020-12-04T16:44:11+02:00
Merge in py3.6.

--HG--
branch : hpy

- - - - -
3c4ed9e1 by Simon Cross at 2020-12-04T16:46:54+02:00
Merge in hpy.

--HG--
branch : hpy-update-to-7c832a2f

- - - - -
42b81617 by Simon Cross at 2020-12-04T15:16:57+00:00
Merge branch 'branch/hpy-update-to-7c832a2f' into 'branch/hpy'

Updated vendored hpy to git revision 7c832a2f

See merge request pypy/pypy!778

--HG--
branch : hpy

- - - - -
7397c20b by Ronan Lamy at 2020-12-04T16:29:57+00:00
hg merge default (with some win64 tweaks backported from py3.7)

--HG--
branch : py3.6

- - - - -
c8ce918c by Ronan Lamy at 2020-12-04T16:53:56+00:00
hg merge py3.6

--HG--
branch : py3.7

- - - - -
e3c49d7c by Ronan Lamy at 2020-12-04T17:15:49+00:00
win64 tweaks, backported from py3.7

--HG--
branch : py3.6

- - - - -
800ed818 by Ronan Lamy at 2020-12-04T17:16:31+00:00
hg merge py3.6

--HG--
branch : hpy

- - - - -
2a8f66dc by Ronan Lamy at 2020-12-04T17:41:08+00:00
hg merge hpy

--HG--
branch : py3.6

- - - - -
17ce9b67 by Ronan Lamy at 2020-12-04T18:08:11+00:00
hg merge py3.6

--HG--
branch : py3.7

- - - - -
5007769e by Ronan Lamy at 2020-12-04T18:25:54+00:00
fix import

--HG--
branch : py3.6

- - - - -
e3e4ab26 by Ronan Lamy at 2020-12-04T18:26:59+00:00
hg merge py3.6

--HG--
branch : py3.7

- - - - -
87ded39c by Matti Picus at 2020-12-05T23:25:35+02:00
hacks to fix ztranslations

--HG--
branch : py3.7

- - - - -
bc470c4a by Matti Picus at 2020-11-24T10:22:21+02:00
add symlinks for python, python3 to the package (not on windows)

--HG--
branch : py3.7

- - - - -
27405133 by Matti Picus at 2020-11-29T21:21:03+02:00
merge win64 into default

- - - - -
1284e761 by Matti Picus at 2020-11-30T09:52:13+02:00
when building cffi extension, copy dll for sqlite3.dll so tests will find it

- - - - -
2a344f51 by Carl Friedrich Bolz-Tereick at 2020-11-30T13:33:38+01:00
make set.update with non-set arguments more jit-friendly by

- unrolling it if the number of args is small (usually 1)
- jitting the adding of new elements

fixes test_unpack_ex on PyPy3.7 as a side-effect

- - - - -
21e613af by Carl Friedrich Bolz-Tereick at 2020-11-30T14:32:54+01:00
fix position of elif clauses in the ast

- - - - -
349cc6b1 by Antonio Cuni at 2020-11-30T18:08:58+00:00
temporary checkin to see whether disabling this breaks any test

--HG--
branch : rpython-error_value

- - - - -
cf646112 by Antonio Cuni at 2020-11-30T21:39:44+01:00
Refactor&simplify the approach:

1. declare that the return value of general RPython function is undefined and
   that you should not rely on it

2. merge @llhelper_can_raise and @ll_error_value into a combined
   @llhelper_error_value: this is the only case which we ultimately care about,
   and it's simpler to test/implement them together than separately

3. introduce a failing test (test_enforce_llhelper_error_value_in_case_of_nested_exception)
   which will be fixed in the next commit.

--HG--
branch : rpython-error_value

- - - - -
f6e51b8f by Antonio Cuni at 2020-11-30T21:40:01+01:00
merge heads

--HG--
branch : rpython-error_value

- - - - -
4a88a927 by Antonio Cuni at 2020-11-30T21:44:34+01:00
fix test_enforce_llhelper_error_value_in_case_of_nested_exception by disabling an optimization if the graph has @llhelper_error_value

--HG--
branch : rpython-error_value

- - - - -
8bbff486 by Matti Picus at 2020-11-30T23:34:55+02:00
backport changes from py3.7 to rpython

- - - - -
90587a52 by Antonio Cuni at 2020-12-02T11:54:15+01:00
fix whatsnew

--HG--
branch : rpython-error_value

- - - - -
02c2f725 by Antonio Cuni at 2020-12-02T17:22:15+01:00
close merged branch

--HG--
branch : rpython-error_value

- - - - -
6add670f by Antonio Cuni at 2020-12-02T17:25:57+01:00
Merge the rpython-error_value branch.

This branch introduces a new decorator @llhelper_error_value, which
officializes the fact that you can raise RPython exceptions from llhelpers,
and makes it possible to specify what is the C value to return in case of
errors.

It is needed to implement correctly HPy exceptions (see also its sister
branch, hpy-error-value)

- - - - -
cb5a37e6 by Matti Picus at 2020-12-03T23:12:09+02:00
make stack bigger when creating pypy.exe directly from C

- - - - -
ae5fddfb by Simon Cross at 2020-12-03T23:29:18+02:00
Implement constcharpsize2str in rffi.

--HG--
branch : add-rffi-constcharpsize2str

- - - - -
b557b58d by Matti Picus at 2020-12-04T00:12:08+02:00
add versions.json and script to check it, issue 3354

- - - - -
6ce0fc57 by Simon Cross at 2020-12-04T14:19:38+00:00
Merge branch 'branch/add-rffi-constcharpsize2str' into 'branch/default'

Implement constcharpsize2str in rffi.

See merge request pypy/pypy!780

- - - - -
273d6c26 by Matti Picus at 2020-12-06T08:50:55+02:00
fixes for circular imports (bpo 30024) and stack usage (bpo 31286)

--HG--
branch : py3.7

- - - - -
7ea2c007 by Matti Picus at 2020-12-06T13:42:27+02:00
move "thread from "requires" to "suggested" for sandbox, compatibility with python3.7

- - - - -
d1d08f88 by Matti Picus at 2020-12-06T13:44:35+02:00
merge default into py3.7

--HG--
branch : py3.7

- - - - -
d8ffdbd7 by Armin Rigo at 2020-12-06T20:22:33+01:00
update to cffi/023e2f33ee07

- - - - -
f26a8f7f by Armin Rigo at 2020-12-06T20:25:37+01:00
oops, this goes with 25e1dbf5591a

- - - - -
70c51e2f by Matti Picus at 2020-12-06T21:31:05+02:00
merge default into py3.7

--HG--
branch : py3.7

- - - - -
a5b96272 by Matti Picus at 2020-12-07T10:26:52+02:00
fix test

--HG--
branch : py3.7

- - - - -
bb066607 by Matti Picus at 2020-12-20T23:09:42+02:00
merge py3.7 into branch

--HG--
branch : win64-cpyext

- - - - -
d2538809 by Matti Picus at 2020-12-21T00:48:08+02:00
differentiate between 64- and 32-bit _pypy_winbase_cffi

--HG--
branch : win64-cpyext

- - - - -


30 changed files:

- extra_tests/cffi_tests/cffi0/test_version.py
- extra_tests/cffi_tests/cffi1/test_re_python.py
- extra_tests/cffi_tests/test_c.py
- extra_tests/conftest.py
- extra_tests/hpy_tests/conftest.py
- lib_pypy/_overlapped.py
- lib_pypy/_pypy_winbase_build.py
- + lib_pypy/_pypy_winbase_cffi64.py
- lib_pypy/_winapi.py
- lib_pypy/cffi.egg-info/PKG-INFO
- lib_pypy/cffi/__init__.py
- lib_pypy/cffi/_embedding.h
- lib_pypy/cffi/recompiler.py
- lib_pypy/msvcrt.py
- pypy/doc/how-to-release.rst
- pypy/doc/sandbox.rst
- pypy/doc/whatsnew-head.rst
- pypy/doc/whatsnew-pypy2-7.3.3.rst
- pypy/interpreter/astcompiler/astbuilder.py
- pypy/interpreter/astcompiler/codegen.py
- pypy/interpreter/astcompiler/test/test_astbuilder.py
- pypy/module/_cffi_backend/__init__.py
- pypy/module/_cffi_backend/test/_backend_test_c.py
- pypy/module/_hpy_universal/_vendored/hpy/devel/include/common/autogen_impl.h
- pypy/module/_hpy_universal/_vendored/hpy/devel/include/common/hpytype.h
- pypy/module/_hpy_universal/_vendored/hpy/devel/include/common/runtime/argparse.h
- pypy/module/_hpy_universal/_vendored/hpy/devel/include/common/runtime/ctx_tracker.h
- pypy/module/_hpy_universal/_vendored/hpy/devel/include/common/version.h
- pypy/module/_hpy_universal/_vendored/hpy/devel/include/cpython/hpy.h
- pypy/module/_hpy_universal/_vendored/hpy/devel/include/universal/autogen_ctx.h


View it on GitLab: https://foss.heptapod.net/pypy/pypy/-/compare/a4f0815f467e0e4a22d6c3acb76e36f9cb83afad...d2538809d57d71362a46ec47c6157a936a44f3a4

-- 
View it on Heptapod: https://foss.heptapod.net/pypy/pypy/-/compare/a4f0815f467e0e4a22d6c3acb76e36f9cb83afad...d2538809d57d71362a46ec47c6157a936a44f3a4
You're receiving this email because of your account on foss.heptapod.net.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.python.org/pipermail/pypy-commit/attachments/20201220/2d5464e0/attachment-0001.html>


More information about the pypy-commit mailing list