Skip to content

Commit ea1bb25

Browse files
committed
Fix conflict in bytecodes.c
1 parent 7e0b4d8 commit ea1bb25

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Python/bytecodes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5299,7 +5299,7 @@ dummy_func(
52995299
(void)null; // Silence compiler warnings about unused variables
53005300
DEAD(null);
53015301
PyStackRef_CLOSE(callable);
5302-
value = PyStackRef_FromPyObjectImmortal(ptr);
5302+
value = PyStackRef_FromPyObjectBorrow(ptr);
53035303
}
53045304

53055305
tier2 op(_CHECK_FUNCTION, (func_version/2 -- )) {

Python/executor_cases.c.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)