summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2022-06-24 11:17:21 (GMT)
committerGitHub <noreply@github.com>2022-06-24 11:17:21 (GMT)
commit4d2c972ff7d84ec75b23dcdda478714655538d34 (patch)
tree990b168b89315824f42b5679510b33be4c68bb2c
parente4d72d1863fa846f984c4e8f1ace937a30e11bf4 (diff)
downloadcpython-4d2c972ff7d84ec75b23dcdda478714655538d34.zip
cpython-4d2c972ff7d84ec75b23dcdda478714655538d34.tar.gz
cpython-4d2c972ff7d84ec75b23dcdda478714655538d34.tar.bz2
gh-84461: Fix ctypes and test_ctypes on Emscripten (GH-94142)
- c_longlong and c_longdouble need experimental WASM bigint. - Skip tests that need threading - Define ``CTYPES_MAX_ARGCOUNT`` for Emscripten. libffi-emscripten 2022-06-23 supports up to 1000 args. (cherry picked from commit 8625802d854ec0152177a6ff0ac092e0e3ff98a5) Co-authored-by: Christian Heimes <christian@python.org>
-rw-r--r--Lib/ctypes/test/test_as_parameter.py1
-rw-r--r--Lib/ctypes/test/test_callbacks.py3
-rw-r--r--Lib/ctypes/test/test_cfuncs.py6
-rw-r--r--Lib/ctypes/test/test_functions.py1
-rw-r--r--Lib/test/test_code.py2
-rw-r--r--Modules/_ctypes/ctypes.h6
-rw-r--r--Tools/wasm/README.md2
-rwxr-xr-xconfigure8
-rw-r--r--configure.ac6
9 files changed, 26 insertions, 9 deletions
diff --git a/Lib/ctypes/test/test_as_parameter.py b/Lib/ctypes/test/test_as_parameter.py
index f9d27cb..9c39179 100644
--- a/Lib/ctypes/test/test_as_parameter.py
+++ b/Lib/ctypes/test/test_as_parameter.py
@@ -122,6 +122,7 @@ class BasicWrapTestCase(unittest.TestCase):
result = f(self.wrap(-10), self.wrap(cb))
self.assertEqual(result, -18)
+ @need_symbol('c_longlong')
def test_longlong_callbacks(self):
f = dll._testfunc_callback_q_qf
diff --git a/Lib/ctypes/test/test_callbacks.py b/Lib/ctypes/test/test_callbacks.py
index 1099cf9..8f95a24 100644
--- a/Lib/ctypes/test/test_callbacks.py
+++ b/Lib/ctypes/test/test_callbacks.py
@@ -65,10 +65,12 @@ class Callbacks(unittest.TestCase):
def test_ulong(self):
self.check_type(c_ulong, 42)
+ @need_symbol('c_longlong')
def test_longlong(self):
self.check_type(c_longlong, 42)
self.check_type(c_longlong, -42)
+ @need_symbol('c_ulonglong')
def test_ulonglong(self):
self.check_type(c_ulonglong, 42)
@@ -82,6 +84,7 @@ class Callbacks(unittest.TestCase):
self.check_type(c_double, 3.14)
self.check_type(c_double, -3.14)
+ @need_symbol('c_longdouble')
def test_longdouble(self):
self.check_type(c_longdouble, 3.14)
self.check_type(c_longdouble, -3.14)
diff --git a/Lib/ctypes/test/test_cfuncs.py b/Lib/ctypes/test/test_cfuncs.py
index ac2240f..09b0684 100644
--- a/Lib/ctypes/test/test_cfuncs.py
+++ b/Lib/ctypes/test/test_cfuncs.py
@@ -111,24 +111,28 @@ class CFunctions(unittest.TestCase):
self.assertEqual(self._dll.tf_bL(b' ', 4294967295), 1431655765)
self.assertEqual(self.U(), 4294967295)
+ @need_symbol('c_longlong')
def test_longlong(self):
self._dll.tf_q.restype = c_longlong
self._dll.tf_q.argtypes = (c_longlong, )
self.assertEqual(self._dll.tf_q(-9223372036854775806), -3074457345618258602)
self.assertEqual(self.S(), -9223372036854775806)
+ @need_symbol('c_longlong')
def test_longlong_plus(self):
self._dll.tf_bq.restype = c_longlong
self._dll.tf_bq.argtypes = (c_byte, c_longlong)
self.assertEqual(self._dll.tf_bq(0, -9223372036854775806), -3074457345618258602)
self.assertEqual(self.S(), -9223372036854775806)
+ @need_symbol('c_ulonglong')
def test_ulonglong(self):
self._dll.tf_Q.restype = c_ulonglong
self._dll.tf_Q.argtypes = (c_ulonglong, )
self.assertEqual(self._dll.tf_Q(18446744073709551615), 6148914691236517205)
self.assertEqual(self.U(), 18446744073709551615)
+ @need_symbol('c_ulonglong')
def test_ulonglong_plus(self):
self._dll.tf_bQ.restype = c_ulonglong
self._dll.tf_bQ.argtypes = (c_byte, c_ulonglong)
@@ -159,12 +163,14 @@ class CFunctions(unittest.TestCase):
self.assertEqual(self._dll.tf_bd(0, 42.), 14.)
self.assertEqual(self.S(), 42)
+ @need_symbol('c_longdouble')
def test_longdouble(self):
self._dll.tf_D.restype = c_longdouble
self._dll.tf_D.argtypes = (c_longdouble,)
self.assertEqual(self._dll.tf_D(42.), 14.)
self.assertEqual(self.S(), 42)
+ @need_symbol('c_longdouble')
def test_longdouble_plus(self):
self._dll.tf_bD.restype = c_longdouble
self._dll.tf_bD.argtypes = (c_byte, c_longdouble)
diff --git a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions.py
index f9e92e1..fc57170 100644
--- a/Lib/ctypes/test/test_functions.py
+++ b/Lib/ctypes/test/test_functions.py
@@ -128,6 +128,7 @@ class FunctionTestCase(unittest.TestCase):
self.assertEqual(result, -21)
self.assertEqual(type(result), float)
+ @need_symbol('c_longdouble')
def test_longdoubleresult(self):
f = dll._testfunc_D_bhilfD
f.argtypes = [c_byte, c_short, c_int, c_long, c_float, c_longdouble]
diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index a6857dc..308141a 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -141,6 +141,7 @@ from test.support import (cpython_only,
check_impl_detail, requires_debug_ranges,
gc_collect)
from test.support.script_helper import assert_python_ok
+from test.support import threading_helper
from opcode import opmap
COPY_FREE_VARS = opmap['COPY_FREE_VARS']
@@ -723,6 +724,7 @@ if check_impl_detail(cpython=True) and ctypes is not None:
self.assertEqual(extra.value, 300)
del f
+ @threading_helper.requires_working_threading()
def test_free_different_thread(self):
# Freeing a code object on a different thread then
# where the co_extra was set should be safe.
diff --git a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h
index da1941c..88eb9f5 100644
--- a/Modules/_ctypes/ctypes.h
+++ b/Modules/_ctypes/ctypes.h
@@ -19,7 +19,11 @@
* to avoid allocating a massive buffer on the stack.
*/
#ifndef CTYPES_MAX_ARGCOUNT
- #define CTYPES_MAX_ARGCOUNT 1024
+ #ifdef __EMSCRIPTEN__
+ #define CTYPES_MAX_ARGCOUNT 1000
+ #else
+ #define CTYPES_MAX_ARGCOUNT 1024
+ #endif
#endif
typedef struct tagPyCArgObject PyCArgObject;
diff --git a/Tools/wasm/README.md b/Tools/wasm/README.md
index 4a711a6..94b3729 100644
--- a/Tools/wasm/README.md
+++ b/Tools/wasm/README.md
@@ -173,6 +173,8 @@ functions.
[bpo-46390](https://bugs.python.org/issue46390).
- Python's object allocator ``obmalloc`` is disabled by default.
- ``ensurepip`` is not available.
+- Some ``ctypes`` features like ``c_longlong`` and ``c_longdouble`` may need
+ NodeJS option ``--experimental-wasm-bigint``.
## wasm32-emscripten in browsers
diff --git a/configure b/configure
index 3b477c4..be5de57 100755
--- a/configure
+++ b/configure
@@ -6775,13 +6775,11 @@ then
case $ac_sys_system/$ac_sys_emscripten_target in #(
Emscripten/node*) :
+ # bigint for ctypes c_longlong, c_longdouble
+ HOSTRUNNER="node --experimental-wasm-bigint"
if test "x$enable_wasm_pthreads" = xyes; then :
- HOSTRUNNER='node --experimental-wasm-threads --experimental-wasm-bulk-memory'
-
-else
-
- HOSTRUNNER='node'
+ HOSTRUNNER="$HOSTRUNNER --experimental-wasm-threads --experimental-wasm-bulk-memory"
fi
;; #(
diff --git a/configure.ac b/configure.ac
index 97ee28f..a8b2326 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1486,10 +1486,10 @@ if test -z "$HOSTRUNNER"
then
AS_CASE([$ac_sys_system/$ac_sys_emscripten_target],
[Emscripten/node*], [
+ # bigint for ctypes c_longlong, c_longdouble
+ HOSTRUNNER="node --experimental-wasm-bigint"
AS_VAR_IF([enable_wasm_pthreads], [yes], [
- HOSTRUNNER='node --experimental-wasm-threads --experimental-wasm-bulk-memory'
- ], [
- HOSTRUNNER='node'
+ HOSTRUNNER="$HOSTRUNNER --experimental-wasm-threads --experimental-wasm-bulk-memory"
])
],
dnl TODO: support other WASI runtimes