Skip to content

python: Changes required in order to build on newer gcc compiler 9.4 #1

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

Open
wants to merge 5 commits into
base: bits
Choose a base branch
from
Open

python: Changes required in order to build on newer gcc compiler 9.4 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1654556
do not error out on incompatible function pointer casts
ani-sinha May 31, 2022
7eb8727
ast: fix wrong indentation under if conditional
ani-sinha May 31, 2022
3c77f38
fix gcc warning: make argument to ternary operation boolean
ani-sinha May 31, 2022
b323733
silence implicit fallthrough gcc warnings
ani-sinha May 31, 2022
f792e05
python: fix some bad indentation
ani-sinha Jul 3, 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
4 changes: 2 additions & 2 deletions Include/pymem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ PyAPI_FUNC(void) PyMem_Free(void *);
/* Returns NULL to indicate error if a negative size or size larger than
Py_ssize_t can represent is supplied. Helps prevents security holes. */
#define PyMem_MALLOC(n) ((size_t)(n) > (size_t)PY_SSIZE_T_MAX ? NULL \
: malloc((n) ? (n) : 1))
: malloc((n) != 0? (n) : 1))
#define PyMem_REALLOC(p, n) ((size_t)(n) > (size_t)PY_SSIZE_T_MAX ? NULL \
: realloc((p), (n) ? (n) : 1))
: realloc((p), (n) != 0? (n) : 1))
#define PyMem_FREE free

#endif /* PYMALLOC_DEBUG */
Expand Down
3 changes: 3 additions & 0 deletions Modules/_ctypes/_ctypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3704,6 +3704,9 @@ _build_callargs(PyCFuncPtrObject *self, PyObject *argtypes,
*pinoutmask |= (1 << i); /* mark as inout arg */
(*pnumretvals)++;
/* fall through to PARAMFLAG_FIN... */
#if defined(__GNUC__) && __GNUC__ >= 7
__attribute__ ((fallthrough));
#endif
case 0:
case PARAMFLAG_FIN:
/* 'in' parameter. Copy it from inargs. */
Expand Down
4 changes: 4 additions & 0 deletions Modules/zlib/inflate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@
#include "inflate.h"
#include "inffast.h"

#if defined(__GNUC__) && __GNUC__ >= 7
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#endif

#ifdef MAKEFIXED
# ifndef BUILDFIXED
# define BUILDFIXED
Expand Down
1 change: 1 addition & 0 deletions Objects/stringobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,7 @@ string_dealloc(PyObject *op)

case SSTATE_INTERNED_IMMORTAL:
Py_FatalError("Immortal interned string died.");
// fall through

default:
Py_FatalError("Inconsistent interned string state.");
Expand Down
3 changes: 3 additions & 0 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,6 +796,9 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
#endif
/* fall through... */
}
#if defined(__GNUC__) && __GNUC__ >= 7
__attribute__ ((fallthrough));
#endif
case '%':
n++;
break;
Expand Down
9 changes: 6 additions & 3 deletions Python/ast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,7 @@ ast_for_comp_op(struct compiling *c, const node *n)
return In;
if (strcmp(STR(n), "is") == 0)
return Is;
break;
default:
PyErr_Format(PyExc_SystemError, "invalid comp_op: %s",
STR(n));
Expand All @@ -563,6 +564,7 @@ ast_for_comp_op(struct compiling *c, const node *n)
return NotIn;
if (strcmp(STR(CHILD(n, 0)), "is") == 0)
return IsNot;
break;
default:
PyErr_Format(PyExc_SystemError, "invalid comp_op: %s %s",
STR(CHILD(n, 0)), STR(CHILD(n, 1)));
Expand Down Expand Up @@ -2284,7 +2286,7 @@ ast_for_print_stmt(struct compiling *c, const node *n)
dest = ast_for_expr(c, CHILD(n, 2));
if (!dest)
return NULL;
start = 4;
start = 4;
}
values_count = (NCH(n) + 1 - start) / 2;
if (values_count) {
Expand Down Expand Up @@ -2417,6 +2419,7 @@ ast_for_flow_stmt(struct compiling *c, const node *n)
return Raise(expr1, expr2, expr3, LINENO(n), n->n_col_offset,
c->c_arena);
}
break;
default:
PyErr_Format(PyExc_SystemError,
"unexpected flow_stmt: %d", TYPE(ch));
Expand Down Expand Up @@ -2620,14 +2623,14 @@ ast_for_import_stmt(struct compiling *c, const node *n)
alias_ty import_alias = alias_for_import_name(c, n, 1);
if (!import_alias)
return NULL;
asdl_seq_SET(aliases, 0, import_alias);
asdl_seq_SET(aliases, 0, import_alias);
}
else {
for (i = 0; i < NCH(n); i += 2) {
alias_ty import_alias = alias_for_import_name(c, CHILD(n, i), 1);
if (!import_alias)
return NULL;
asdl_seq_SET(aliases, i / 2, import_alias);
asdl_seq_SET(aliases, i / 2, import_alias);
}
}
if (mod != NULL)
Expand Down
19 changes: 14 additions & 5 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@

#include <ctype.h>

#if defined(__GNUC__) && __GNUC__ >= 7
#define fallthrough __attribute__((fallthrough));
#else
#define fallthrough ;
#endif

#ifndef WITH_TSC

#define READ_TIMESTAMP(var)
Expand Down Expand Up @@ -724,12 +730,14 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
#define TARGET_NOARG(op) \
TARGET_##op: \
opcode = op; \
fallthrough; \
case op:\

#define TARGET(op) \
TARGET_##op: \
opcode = op; \
oparg = NEXTARG(); \
fallthrough; \
case op:\


Expand Down Expand Up @@ -2057,6 +2065,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
/* Fallthrough */
case 1:
w = POP(); /* exc */
// fall through
case 0: /* Fallthrough */
why = do_raise(w, v, u);
break;
Expand Down Expand Up @@ -2685,7 +2694,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
JUMPTO(oparg);
else
break;
DISPATCH();
DISPATCH();
}

PREDICTED_WITH_ARG(POP_JUMP_IF_TRUE);
Expand All @@ -2711,7 +2720,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
;
else
break;
DISPATCH();
DISPATCH();
}

TARGET(JUMP_IF_FALSE_OR_POP)
Expand All @@ -2736,7 +2745,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
JUMPTO(oparg);
else
break;
DISPATCH();
DISPATCH();
}

TARGET(JUMP_IF_TRUE_OR_POP)
Expand All @@ -2762,7 +2771,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
}
else
break;
DISPATCH();
DISPATCH();
}

PREDICTED_WITH_ARG(JUMP_ABSOLUTE);
Expand Down Expand Up @@ -2820,7 +2829,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
x = v = POP();
Py_DECREF(v);
JUMPBY(oparg);
DISPATCH();
DISPATCH();
}

TARGET_NOARG(BREAK_LOOP)
Expand Down
6 changes: 6 additions & 0 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3079,12 +3079,18 @@ compiler_visit_expr(struct compiler *c, expr_ty e)
switch (e->v.Attribute.ctx) {
case AugLoad:
ADDOP(c, DUP_TOP);
#if defined(__GNUC__) && __GNUC__ >= 7
__attribute__ ((fallthrough));
#endif
/* Fall through to load */
case Load:
ADDOP_NAME(c, LOAD_ATTR, e->v.Attribute.attr, names);
break;
case AugStore:
ADDOP(c, ROT_TWO);
#if defined(__GNUC__) && __GNUC__ >= 7
__attribute__ ((fallthrough));
#endif
/* Fall through to save */
case Store:
ADDOP_NAME(c, STORE_ATTR, e->v.Attribute.attr, names);
Expand Down
12 changes: 12 additions & 0 deletions Python/dtoa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1527,6 +1527,9 @@ _Py_dg_strtod(const char *s00, char **se)
switch (c) {
case '-':
sign = 1;
#if defined(__GNUC__) && __GNUC__ >= 7
__attribute__ ((fallthrough));
#endif
/* no break */
case '+':
c = *++s;
Expand Down Expand Up @@ -1596,6 +1599,9 @@ _Py_dg_strtod(const char *s00, char **se)
switch (c) {
case '-':
esign = 1;
#if defined(__GNUC__) && __GNUC__ >= 7
__attribute__ ((fallthrough));
#endif
/* no break */
case '+':
c = *++s;
Expand Down Expand Up @@ -2514,6 +2520,9 @@ _Py_dg_dtoa(double dd, int mode, int ndigits,
break;
case 2:
leftright = 0;
#if defined(__GNUC__) && __GNUC__ >= 7
__attribute__ ((fallthrough));
#endif
/* no break */
case 4:
if (ndigits <= 0)
Expand All @@ -2522,6 +2531,9 @@ _Py_dg_dtoa(double dd, int mode, int ndigits,
break;
case 3:
leftright = 0;
#if defined(__GNUC__) && __GNUC__ >= 7
__attribute__ ((fallthrough));
#endif
/* no break */
case 5:
i = ndigits + k + 1;
Expand Down
3 changes: 3 additions & 0 deletions Python/getargs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,6 +1736,9 @@ skipitem(const char **p_format, va_list *p_va, int flags)
/* after 'e', only 's' and 't' is allowed */
goto err;
format++;
#if defined(__GNUC__) && __GNUC__ >= 7
__attribute__ ((fallthrough));
#endif
/* explicit fallthrough to string cases */
}

Expand Down
3 changes: 3 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,6 +1121,9 @@ yes)
BASECFLAGS="$BASECFLAGS -fno-strict-aliasing"
fi

# disable cast function type warning for newer compilers
BASECFLAGS="$BASECFLAGS -Wno-cast-function-type"

# if using gcc on alpha, use -mieee to get (near) full IEEE 754
# support. Without this, treatment of subnormals doesn't follow
# the standard.
Expand Down