mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-16 07:45:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-30923: Silence fall-through warnings included in -Wextra since gcc-7.0. (#3157)

Browse source
This commit is contained in:
Stefan Krah 2017-08-21 13:09:59 +02:00 • committed by GitHub
parent 0267128aa4
commit f432a3234f
13 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Python/ast.c
View file

@ -1182,6 +1182,7 @@ ast_for_comp_op(struct compiling *c, const node *n)
return In;
if (strcmp(STR(n), "is") == 0)
return Is;
/* fall through */
default:
PyErr_Format(PyExc_SystemError, "invalid comp_op: %s",
STR(n));
@ -1196,6 +1197,7 @@ ast_for_comp_op(struct compiling *c, const node *n)
return NotIn;
if (strcmp(STR(CHILD(n, 0)), "is") == 0)
return IsNot;
/* fall through */
default:
PyErr_Format(PyExc_SystemError, "invalid comp_op: %s %s",
STR(CHILD(n, 0)), STR(CHILD(n, 1)));
@ -3147,6 +3149,7 @@ ast_for_flow_stmt(struct compiling *c, const node *n)
}
return Raise(expression, cause, LINENO(n), n->n_col_offset, c->c_arena);
}
/* fall through */
default:
PyErr_Format(PyExc_SystemError,
"unexpected flow_stmt: %d", TYPE(ch));

4
Python/ceval.c
View file

@ -1807,9 +1807,11 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
switch (oparg) {
case 2:
cause = POP(); /* cause */
/* fall through */
case 1:
exc = POP(); /* exc */
case 0: /* Fallthrough */
/* fall through */
case 0:
if (do_raise(exc, cause)) {
why = WHY_EXCEPTION;
goto fast_block_end;

5
Python/compile.c
View file

@ -4154,6 +4154,7 @@ expr_constant(struct compiler *c, expr_ty e)
else if (o == Py_False)
return 0;
}
/* fall through */
default:
return -1;
}
@ -4446,13 +4447,13 @@ compiler_visit_expr(struct compiler *c, expr_ty e)
switch (e->v.Attribute.ctx) {
case AugLoad:
ADDOP(c, DUP_TOP);
/* Fall through to load */
/* Fall through */
case Load:
ADDOP_NAME(c, LOAD_ATTR, e->v.Attribute.attr, names);
break;
case AugStore:
ADDOP(c, ROT_TWO);
/* Fall through to save */
/* Fall through */
case Store:
ADDOP_NAME(c, STORE_ATTR, e->v.Attribute.attr, names);
break;

8
Python/dtoa.c
View file

@ -1454,7 +1454,7 @@ _Py_dg_strtod(const char *s00, char **se)
switch (c) {
case '-':
sign = 1;
/* no break */
/* fall through */
case '+':
c = *++s;
}
@ -1523,7 +1523,7 @@ _Py_dg_strtod(const char *s00, char **se)
switch (c) {
case '-':
esign = 1;
/* no break */
/* fall through */
case '+':
c = *++s;
}
@ -2441,7 +2441,7 @@ _Py_dg_dtoa(double dd, int mode, int ndigits,
break;
case 2:
leftright = 0;
/* no break */
/* fall through */
case 4:
if (ndigits <= 0)
ndigits = 1;
@ -2449,7 +2449,7 @@ _Py_dg_dtoa(double dd, int mode, int ndigits,
break;
case 3:
leftright = 0;
/* no break */
/* fall through */
case 5:
i = ndigits + k + 1;
ilim = i;

1
Python/formatter_unicode.c
View file

@ -312,6 +312,7 @@ parse_internal_render_format_spec(PyObject *format_spec,
format->thousands_separators = LT_UNDER_FOUR_LOCALE;
break;
}
/* fall through */
default:
invalid_comma_type(format->type);
return 0;

2
Python/getargs.c
View file

@ -2304,8 +2304,8 @@ skipitem(const char **p_format, va_list *p_va, int flags)
/* after 'e', only 's' and 't' is allowed */
goto err;
format++;
/* explicit fallthrough to string cases */
}
/* fall through */
case 's': /* string */
case 'z': /* string or None */

3
Python/marshal.c
View file

@ -1112,6 +1112,7 @@ r_object(RFILE *p)
case TYPE_ASCII_INTERNED:
is_interned = 1;
/* fall through */
case TYPE_ASCII:
n = r_long(p);
if (PyErr_Occurred())
@ -1124,6 +1125,7 @@ r_object(RFILE *p)
case TYPE_SHORT_ASCII_INTERNED:
is_interned = 1;
/* fall through */
case TYPE_SHORT_ASCII:
n = r_byte(p);
if (n == EOF) {
@ -1149,6 +1151,7 @@ r_object(RFILE *p)
case TYPE_INTERNED:
is_interned = 1;
/* fall through */
case TYPE_UNICODE:
{
const char *buffer;

12
Python/pyhash.c
View file

@ -393,13 +393,13 @@ siphash24(const void *src, Py_ssize_t src_sz) {
pt = (uint8_t *)&t;
m = (uint8_t *)in;
switch (src_sz) {
case 7: pt[6] = m[6];
case 6: pt[5] = m[5];
case 5: pt[4] = m[4];
case 7: pt[6] = m[6]; /* fall through */
case 6: pt[5] = m[5]; /* fall through */
case 5: pt[4] = m[4]; /* fall through */
case 4: memcpy(pt, m, sizeof(uint32_t)); break;
case 3: pt[2] = m[2];
case 2: pt[1] = m[1];
case 1: pt[0] = m[0];
case 3: pt[2] = m[2]; /* fall through */
case 2: pt[1] = m[1]; /* fall through */
case 1: pt[0] = m[0]; /* fall through */
}
b |= _le64toh(t);

3
Python/wordcode_helpers.h
View file

@ -28,10 +28,13 @@ write_op_arg(_Py_CODEUNIT *codestr, unsigned char opcode,
switch (ilen) {
case 4:
*codestr++ = PACKOPARG(EXTENDED_ARG, (oparg >> 24) & 0xff);
/* fall through */
case 3:
*codestr++ = PACKOPARG(EXTENDED_ARG, (oparg >> 16) & 0xff);
/* fall through */
case 2:
*codestr++ = PACKOPARG(EXTENDED_ARG, (oparg >> 8) & 0xff);
/* fall through */
case 1:
*codestr++ = PACKOPARG(opcode, oparg & 0xff);
break;