Skip to content

bpo-9566: Fix compiler warnings in peephole.c #10652

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
vstinner merged 6 commits into from
Dec 7, 2018
Merged

bpo-9566: Fix compiler warnings in peephole.c #10652

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f0f306
bpo-9566: Fix compiler warnings in peephole.c
vstinner Dec 1, 2018
b097f36
Fix issues with signed vs unsigned
vstinner Dec 6, 2018
0133edb
Move comment
vstinner Dec 7, 2018
0afc918
Add ilen variable
vstinner Dec 7, 2018
341e474
Add "#if SIZEOF_SIZE_T > SIZEOF_INT"
vstinner Dec 7, 2018
7a97ab6
Fix #if
vstinner Dec 7, 2018
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
Prev Previous commit
Next Next commit
Move comment
  • Loading branch information
@vstinner
vstinner committed Dec 7, 2018
commit 0133edbc752ae48ac9f46f97c9169b9a29cdc4e3
9 changes: 4 additions & 5 deletions Python/peephole.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,15 +365,14 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
stack effect */
h = set_arg(codestr, i, get_arg(codestr, tgt));
} else {
Py_ssize_t arg = (tgt + 1);
/* cannot overflow: codelen <= INT_MAX */
assert((size_t)arg <= UINT_MAX / sizeof(_Py_CODEUNIT));
arg *= sizeof(_Py_CODEUNIT);

/* The second jump is not taken if the first is (so

@serhiy-storchaka serhiy-storchaka Dec 7, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would keep the comment at the beginning of the block.

@vstinner vstinner Dec 7, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

jump past it), and all conditional jumps pop their
argument when they're not taken (so change the
first jump to pop its argument when it's taken). */
Py_ssize_t arg = (tgt + 1);
/* cannot overflow: codelen <= INT_MAX */
assert((size_t)arg <= UINT_MAX / sizeof(_Py_CODEUNIT));
arg *= sizeof(_Py_CODEUNIT);
h = set_arg(codestr, i, (unsigned int)arg);
j = opcode == JUMP_IF_TRUE_OR_POP ?
POP_JUMP_IF_TRUE : POP_JUMP_IF_FALSE;
Expand Down