summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Carlier <dcarlier@afilias.info>2019-05-17 23:46:22 (GMT)
committerCheryl Sabella <cheryl.sabella@gmail.com>2019-05-17 23:46:22 (GMT)
commit27ee0f8551a6d576a65e20da90acf9f3cb412c35 (patch)
tree1c00bfad59680bc22ebf0bf0b49a88fd91375b6f
parente7b1136ec3b40d174d71f2195cceaadf4fe9539c (diff)
downloadcpython-27ee0f8551a6d576a65e20da90acf9f3cb412c35.zip
cpython-27ee0f8551a6d576a65e20da90acf9f3cb412c35.tar.gz
cpython-27ee0f8551a6d576a65e20da90acf9f3cb412c35.tar.bz2
Fix couple of dead code paths (GH-7418)
-rw-r--r--Objects/bytesobject.c2
-rw-r--r--Objects/stringlib/fastsearch.h1
-rw-r--r--Python/ast.c3
-rw-r--r--Python/compile.c1
4 files changed, 0 insertions, 7 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index ebbdb7c..41453b2 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 a8a51d5..46fcf35 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 03da4e7..abc8d89 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 2a086a5..b20548c 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 */