Fix couple of dead code paths (pythonGH-7418)

David Carlier · csabella · commit 27ee0f8551a6 · 2019-05-17T19:46:22.000-04:00
diff --git 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
@@ -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
@@ -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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,6 @@ FASTSEARCH(const STRINGLIB_CHAR* s, Py_ssize_t n,`
`192`	`192`	`}`
`193`	`193`	`return count;`
`194`	`194`	`}`
`195`		`- return -1;`
`196`	`195`	`}`
`197`	`196`
`198`	`197`	`mlast = m - 1;`
Original file line number	Diff line number	Diff line change
`@@ -2971,7 +2971,6 @@ ast_for_expr(struct compiling c, const node n)`
`2971`	`2971`	`return Compare(expression, ops, cmps, LINENO(n), n->n_col_offset,`
`2972`	`2972`	`n->n_end_lineno, n->n_end_col_offset, c->c_arena);`
`2973`	`2973`	`}`
`2974`		`- break;`
`2975`	`2974`
`2976`	`2975`	`case star_expr:`
`2977`	`2976`	`return ast_for_starred(c, n);`
`@@ -3618,7 +3617,6 @@ alias_for_import_name(struct compiling c, const node n, int store)`
`3618`	`3617`	`return NULL;`
`3619`	`3618`	`return a;`
`3620`	`3619`	`}`
`3621`		`- break;`
`3622`	`3620`	`case dotted_name:`
`3623`	`3621`	`if (NCH(n) == 1) {`
`3624`	`3622`	`node *name_node = CHILD(n, 0);`
`@@ -3669,7 +3667,6 @@ alias_for_import_name(struct compiling c, const node n, int store)`
`3669`	`3667`	`}`
`3670`	`3668`	`return alias(str, NULL, c->c_arena);`
`3671`	`3669`	`}`
`3672`		`- break;`
`3673`	`3670`	`case STAR:`
`3674`	`3671`	`str = PyUnicode_InternFromString("*");`
`3675`	`3672`	`if (!str)`
Original file line number	Diff line number	Diff line change
`@@ -4868,7 +4868,6 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)`
`4868`	`4868`	`return compiler_error(c,`
`4869`	`4869`	`"can't use starred expression here");`
`4870`	`4870`	`}`
`4871`		`- break;`
`4872`	`4871`	`case Name_kind:`
`4873`	`4872`	`return compiler_nameop(c, e->v.Name.id, e->v.Name.ctx);`
`4874`	`4873`	`/* child nodes of List and Tuple will have expr_context set */`