8000 gh-82616: Add Py_IS_TYPE_SIGNED() macro by vstinner · Pull Request #93178 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-82616: Add Py_IS_TYPE_SIGNED() macro #93178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 27, 2022
Merged

gh-82616: Add Py_IS_TYPE_SIGNED() macro #93178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
991f307
gh-82616: Add _Py_IS_TYPE_SIGNED() macro
vstinner May 24, 2022
786c514
Fix the compiler warning
vstinner May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
gh-82616: Add _Py_IS_TYPE_SIGNED() macro 
_posixsubprocess: add a static assertion to ensure that the pid_t
type is signed.

Replace _Py_IntegralTypeSigned() with _Py_IS_TYPE_SIGNED().
  • Loading branch information
@vstinner
vstinner committed May 26, 2022
commit 991f3073f9da7e5a5319fe0822991aa432d79ca2
8 changes: 2 additions & 6 deletions Include/internal/pycore_pymath.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,13 @@ static inline void _Py_ADJUST_ERANGE2(double x, double y)
}
}

// Return whether integral type *type* is signed or not.
#define _Py_IntegralTypeSigned(type) \
((type)(-1) < 0)

// Return the maximum value of integral type *type*.
#define _Py_IntegralTypeMax(type) \
((_Py_IntegralTypeSigned(type)) ? (((((type)1 << (sizeof(type)*CHAR_BIT - 2)) - 1) << 1) + 1) : ~(type)0)
(_Py_IS_TYPE_SIGNED(type) ? (((((type)1 << (sizeof(type)*CHAR_BIT - 2)) - 1) << 1) + 1) : ~(type)0)

// Return the minimum value of integral type *type*.
#define _Py_IntegralTypeMin(type) \
((_Py_IntegralTypeSigned(type)) ? -_Py_IntegralTypeMax(type) - 1 : 0)
(_Py_IS_TYPE_SIGNED(type) ? -_Py_IntegralTypeMax(type) - 1 : 0)

// Check whether *v* is in the range of integral type *type*. This is most
// useful if *v* is floating-point, since demoting a floating-point *v* to an
Expand Down
3 changes: 3 additions & 0 deletions Include/pymacro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,7 @@
// For example, "int x; _Py_RVALUE(x) = 1;" fails with a compiler error.
#define _Py_RVALUE(EXPR) ((void)0, (EXPR))

// Return non-zero if the type is signed, return zero if it's unsigned.
#define _Py_IS_TYPE_SIGNED(type) ((type)(-1) < 0)

#endif /* Py_PYMACRO_H */
4 changes: 3 additions & 1 deletion Modules/_posixsubprocess.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,10 @@ child_exec(char *const exec_array[],
#endif

#ifdef HAVE_SETPGID
if (pgid_to_set >= 0)
static_assert(_Py_IS_TYPE_SIGNED(pid_t), "pid_t is unsigned");
if (pgid_to_set >= 0) {
POSIX_CALL(setpgid(0, pgid_to_set));
}
#endif

#ifdef HAVE_SETGROUPS
Expand Down
15 changes: 15 additions & 0 deletions Modules/_testcapimodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5832,6 +5832,20 @@ settrace_to_record(PyObject *self, PyObject *list)
Py_RETURN_NONE;
}

static PyObject *
test_macros(PyObject *self, PyObject *Py_UNUSED(args))
{
// Py_MIN(), Py_MAX()
assert(Py_MIN(5, 11) == 5);
assert(Py_MAX(5, 11) == 11);

// _Py_IS_TYPE_SIGNED()
assert(_Py_IS_TYPE_SIGNED(int));
assert(!_Py_IS_TYPE_SIGNED(unsigned int));

Py_RETURN_NONE;
}

static PyObject *negative_dictoffset(PyObject *, PyObject *);
static PyObject *test_buildvalue_issue38913(PyObject *, PyObject *);
static PyObject *getargs_s_hash_int(PyObject *, PyObject *, PyObject*);
Expand Down Expand Up @@ -6122,6 +6136,7 @@ static PyMethodDef TestMethods[] = {
{"get_feature_macros", get_feature_macros, METH_NOARGS, NULL},
{"test_code_api", test_code_api, METH_NOARGS, NULL},
{"settrace_to_record", settrace_to_record, METH_O, NULL},
{"test_macros", test_macros, METH_NOARGS, NULL},
{NULL, NULL} /* sentinel */
};

Expand Down
0