[Python-checkins] Fix couple of dead code paths (GH-7418)

Cheryl Sabella webhook-mailer at python.org
Fri May 17 19:46:28 EDT 2019


https://github.com/python/cpython/commit/27ee0f8551a6d576a65e20da90acf9f3cb412c35
commit: 27ee0f8551a6d576a65e20da90acf9f3cb412c35
branch: master
author: David Carlier <dcarlier at afilias.info>
committer: Cheryl Sabella <cheryl.sabella at gmail.com>
date: 2019-05-17T19:46:22-04:00
summary:

Fix couple of dead code paths (GH-7418)

files:
M Objects/bytesobject.c
M Objects/stringlib/fastsearch.h
M Python/ast.c
M Python/compile.c

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index ebbdb7c3c164..41453b2d14e9 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -1617,12 +1617,10 @@ bytes_richcompare(PyBytesObject *a, PyBytesObject *b, int op)
         case Py_GE:
             /* a string is equal to itself */
             Py_RETURN_TRUE;
-            break;
         case Py_NE:
         case Py_LT:
         case Py_GT:
             Py_RETURN_FALSE;
-            break;
         default:
             PyErr_BadArgument();
             return NULL;
diff --git a/Objects/stringlib/fastsearch.h b/Objects/stringlib/fastsearch.h
index a8a51d577f3f..46fcf356d0d0 100644
--- a/Objects/stringlib/fastsearch.h
+++ b/Objects/stringlib/fastsearch.h
@@ -192,7 +192,6 @@ FASTSEARCH(const STRINGLIB_CHAR* s, Py_ssize_t n,
                 }
             return count;
         }
-        return -1;
     }
 
     mlast = m - 1;
diff --git a/Python/ast.c b/Python/ast.c
index 03da4e7f7f9a..abc8d89c8a38 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -2971,7 +2971,6 @@ ast_for_expr(struct compiling *c, const node *n)
                 return Compare(expression, ops, cmps, LINENO(n), n->n_col_offset,
                                n->n_end_lineno, n->n_end_col_offset, c->c_arena);
             }
-            break;
 
         case star_expr:
             return ast_for_starred(c, n);
@@ -3618,7 +3617,6 @@ alias_for_import_name(struct compiling *c, const node *n, int store)
                     return NULL;
                 return a;
             }
-            break;
         case dotted_name:
             if (NCH(n) == 1) {
                 node *name_node = CHILD(n, 0);
@@ -3669,7 +3667,6 @@ alias_for_import_name(struct compiling *c, const node *n, int store)
                 }
                 return alias(str, NULL, c->c_arena);
             }
-            break;
         case STAR:
             str = PyUnicode_InternFromString("*");
             if (!str)
diff --git a/Python/compile.c b/Python/compile.c
index 2a086a509f45..b20548c77724 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -4868,7 +4868,6 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
             return compiler_error(c,
                 "can't use starred expression here");
         }
-        break;
     case Name_kind:
         return compiler_nameop(c, e->v.Name.id, e->v.Name.ctx);
     /* child nodes of List and Tuple will have expr_context set */



More information about the Python-checkins mailing list