Skip to content

bpo-40334: Don't downcast from Py_ssize_t to int #19671

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

Merged
pablogsal merged 1 commit into from
Apr 23, 2020
Merged

bpo-40334: Don't downcast from Py_ssize_t to int #19671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 21 additions & 21 deletions Parser/pegen/pegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ tokenizer_error_with_col_offset(Parser *p, PyObject *errtype, const char *errmsg
{
PyObject *errstr = NULL;
PyObject *value = NULL;
int col_number = -1;
size_t col_number = -1;

errstr = PyUnicode_FromString(errmsg);
if (!errstr) {
Expand Down Expand Up @@ -552,8 +552,8 @@ _PyPegen_fill_token(Parser *p)

int lineno = type == STRING ? p->tok->first_lineno : p->tok->lineno;
const char *line_start = type == STRING ? p->tok->multi_line_start : p->tok->line_start;
int end_lineno = p->tok->lineno;
int col_offset = -1, end_col_offset = -1;
size_t end_lineno = p->tok->lineno;
size_t col_offset = -1, end_col_offset = -1;
if (start != NULL && start >= line_start) {
col_offset = start - line_start;
}
Expand Down Expand Up @@ -1066,16 +1066,16 @@ _PyPegen_seq_insert_in_front(Parser *p, void *a, asdl_seq *seq)
}

asdl_seq_SET(new_seq, 0, a);
for (int i = 1, l = asdl_seq_LEN(new_seq); i < l; i++) {
for (Py_ssize_t i = 1, l = asdl_seq_LEN(new_seq); i < l; i++) {
asdl_seq_SET(new_seq, i, asdl_seq_GET(seq, i - 1));
}
return new_seq;
}

static int
static Py_ssize_t
_get_flattened_seq_size(asdl_seq *seqs)
{
int size = 0;
Py_ssize_t size = 0;
for (Py_ssize_t i = 0, l = asdl_seq_LEN(seqs); i < l; i++) {
asdl_seq *inner_seq = asdl_seq_GET(seqs, i);
size += asdl_seq_LEN(inner_seq);
Expand All @@ -1087,7 +1087,7 @@ _get_flattened_seq_size(asdl_seq *seqs)
asdl_seq *
_PyPegen_seq_flatten(Parser *p, asdl_seq *seqs)
{
int flattened_seq_size = _get_flattened_seq_size(seqs);
Py_ssize_t flattened_seq_size = _get_flattened_seq_size(seqs);
assert(flattened_seq_size > 0);

asdl_seq *flattened_seq = _Py_asdl_seq_new(flattened_seq_size, p->arena);
Expand All @@ -1098,7 +1098,7 @@ _PyPegen_seq_flatten(Parser *p, asdl_seq *seqs)
int flattened_seq_idx = 0;
for (Py_ssize_t i = 0, l = asdl_seq_LEN(seqs); i < l; i++) {
asdl_seq *inner_seq = asdl_seq_GET(seqs, i);
for (int j = 0, li = asdl_seq_LEN(inner_seq); j < li; j++) {
for (Py_ssize_t j = 0, li = asdl_seq_LEN(inner_seq); j < li; j++) {
asdl_seq_SET(flattened_seq, flattened_seq_idx++, asdl_seq_GET(inner_seq, j));
}
}
Expand Down Expand Up @@ -1203,7 +1203,7 @@ _PyPegen_alias_for_star(Parser *p)
asdl_seq *
_PyPegen_map_names_to_ids(Parser *p, asdl_seq *seq)
{
int len = asdl_seq_LEN(seq);
Py_ssize_t len = asdl_seq_LEN(seq);
assert(len > 0);

asdl_seq *new_seq = _Py_asdl_seq_new(len, p->arena);
Expand Down Expand Up @@ -1234,7 +1234,7 @@ _PyPegen_cmpop_expr_pair(Parser *p, cmpop_ty cmpop, expr_ty expr)
asdl_int_seq *
_PyPegen_get_cmpops(Parser *p, asdl_seq *seq)
{
int len = asdl_seq_LEN(seq);
Py_ssize_t len = asdl_seq_LEN(seq);
assert(len > 0);

asdl_int_seq *new_seq = _Py_asdl_int_seq_new(len, p->arena);
Expand All @@ -1251,7 +1251,7 @@ _PyPegen_get_cmpops(Parser *p, asdl_seq *seq)
asdl_seq *
_PyPegen_get_exprs(Parser *p, asdl_seq *seq)
{
int len = asdl_seq_LEN(seq);
Py_ssize_t len = asdl_seq_LEN(seq);
assert(len > 0);

asdl_seq *new_seq = _Py_asdl_seq_new(len, p->arena);
Expand All @@ -1269,7 +1269,7 @@ _PyPegen_get_exprs(Parser *p, asdl_seq *seq)
static asdl_seq *
_set_seq_context(Parser *p, asdl_seq *seq, expr_context_ty ctx)
{
int len = asdl_seq_LEN(seq);
Py_ssize_t len = asdl_seq_LEN(seq);
if (len == 0) {
return NULL;
}
Expand Down Expand Up @@ -1370,7 +1370,7 @@ _PyPegen_key_value_pair(Parser *p, expr_ty key, expr_ty value)
asdl_seq *
_PyPegen_get_keys(Parser *p, asdl_seq *seq)
{
int len = asdl_seq_LEN(seq);
Py_ssize_t len = asdl_seq_LEN(seq);
asdl_seq *new_seq = _Py_asdl_seq_new(len, p->arena);
if (!new_seq) {
return NULL;
Expand All @@ -1386,7 +1386,7 @@ _PyPegen_get_keys(Parser *p, asdl_seq *seq)
asdl_seq *
_PyPegen_get_values(Parser *p, asdl_seq *seq)
{
int len = asdl_seq_LEN(seq);
Py_ssize_t len = asdl_seq_LEN(seq);
asdl_seq *new_seq = _Py_asdl_seq_new(len, p->arena);
if (!new_seq) {
return NULL;
Expand Down Expand Up @@ -1441,8 +1441,8 @@ _PyPegen_star_etc(Parser *p, arg_ty vararg, asdl_seq *kwonlyargs, arg_ty kwarg)
asdl_seq *
_PyPegen_join_sequences(Parser *p, asdl_seq *a, asdl_seq *b)
{
int first_len = asdl_seq_LEN(a);
int second_len = asdl_seq_LEN(b);
Py_ssize_t first_len = asdl_seq_LEN(a);
Py_ssize_t second_len = asdl_seq_LEN(b);
asdl_seq *new_seq = _Py_asdl_seq_new(first_len + second_len, p->arena);
if (!new_seq) {
return NULL;
Expand All @@ -1462,7 +1462,7 @@ _PyPegen_join_sequences(Parser *p, asdl_seq *a, asdl_seq *b)
static asdl_seq *
_get_names(Parser *p, asdl_seq *names_with_defaults)
{
int len = asdl_seq_LEN(names_with_defaults);
Py_ssize_t len = asdl_seq_LEN(names_with_defaults);
asdl_seq *seq = _Py_asdl_seq_new(len, p->arena);
if (!seq) {
return NULL;
Expand All @@ -1477,7 +1477,7 @@ _get_names(Parser *p, asdl_seq *names_with_defaults)
static asdl_seq *
_get_defaults(Parser *p, asdl_seq *names_with_defaults)
{
int len = asdl_seq_LEN(names_with_defaults);
Py_ssize_t len = asdl_seq_LEN(names_with_defaults);
asdl_seq *seq = _Py_asdl_seq_new(len, p->arena);
if (!seq) {
return NULL;
Expand Down Expand Up @@ -1750,8 +1750,8 @@ _PyPegen_seq_extract_starred_exprs(Parser *p, asdl_seq *kwargs)
asdl_seq *
_PyPegen_seq_delete_starred_exprs(Parser *p, asdl_seq *kwargs)
{
int len = asdl_seq_LEN(kwargs);
int new_len = len - _seq_number_of_starred_exprs(kwargs);
Py_ssize_t len = asdl_seq_LEN(kwargs);
Py_ssize_t new_len = len - _seq_number_of_starred_exprs(kwargs);
if (new_len == 0) {
return NULL;
}
Expand All @@ -1773,7 +1773,7 @@ _PyPegen_seq_delete_starred_exprs(Parser *p, asdl_seq *kwargs)
expr_ty
_PyPegen_concatenate_strings(Parser *p, asdl_seq *strings)
{
int len = asdl_seq_LEN(strings);
Py_ssize_t len = asdl_seq_LEN(strings);
assert(len > 0);

Token *first = asdl_seq_GET(strings, 0);
Expand Down
2 changes: 1 addition & 1 deletion Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2177,7 +2177,7 @@ static int
compiler_check_debug_args_seq(struct compiler *c, asdl_seq *args)
{
if (args != NULL) {
for (int i = 0, n = asdl_seq_LEN(args); i < n; i++) {
for (Py_ssize_t i = 0, n = asdl_seq_LEN(args); i < n; i++) {
if (!compiler_check_debug_one_arg(c, asdl_seq_GET(args, i)))
return 0;
}
Expand Down