Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 9f688e7

Browse filesBrowse files
committed
Fix merge glitch
1 parent 89d5d85 commit 9f688e7
Copy full SHA for 9f688e7

File tree

Expand file treeCollapse file tree

2 files changed

+2
-7
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+2
-7
lines changed

‎Python/bytecodes.c

Copy file name to clipboardExpand all lines: Python/bytecodes.c
+1-4Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3180,7 +3180,6 @@ dummy_func(
31803180
}
31813181

31823182
replaced op(_FOR_ITER, (iter, null_or_index -- iter, null_or_index, next)) {
3183-
/* before: [iter]; after: [iter, iter()] *or* [] (and jump over END_FOR.) */
31843183
if (PyStackRef_IsTaggedInt(null_or_index)) {
31853184
if (PyStackRef_IsTaggedInt(iter)) {
31863185
if (!PyStackRef_TaggedIntLessThan(null_or_index, iter)) {
@@ -3192,7 +3191,6 @@ dummy_func(
31923191
if (PyStackRef_IsNull(next)) {
31933192
ERROR_NO_POP();
31943193
}
3195-
null_or_index = PyStackRef_IncrementTaggedIntNoOverflow(null_or_index);
31963194
}
31973195
else {
31983196
PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter);
@@ -3201,8 +3199,8 @@ dummy_func(
32013199
JUMPBY(oparg + 1);
32023200
DISPATCH();
32033201
}
3204-
null_or_index = PyStackRef_IncrementTaggedIntNoOverflow(null_or_index);
32053202
}
3203+
null_or_index = PyStackRef_IncrementTaggedIntNoOverflow(null_or_index);
32063204
}
32073205
else {
32083206
PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter);
@@ -3263,7 +3261,6 @@ dummy_func(
32633261
if (PyStackRef_IsNull(next)) {
32643262
ERROR_NO_POP();
32653263
}
3266-
null_or_index = PyStackRef_IncrementTaggedIntNoOverflow(null_or_index);
32673264
}
32683265
else {
32693266
PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter);

‎Python/generated_cases.c.h

Copy file name to clipboardExpand all lines: Python/generated_cases.c.h
+1-3Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.