Skip to content

Commit 036ffc5

Browse files
committed
Post merge fixup 2
1 parent 2efa0bd commit 036ffc5

File tree

6 files changed

+8
-2
lines changed

6 files changed

+8
-2
lines changed

Objects/floatobject.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ PyFloat_FromDouble(double fval)
138138

139139
_PyStackRef _PyFloat_FromDouble_ConsumeInputs(_PyStackRef left, _PyStackRef right, double value)
140140
{
141-
PyStackRef_CLOSE(left);
142-
PyStackRef_CLOSE(right);
141+
PyStackRef_CLOSE_SPECIALIZED(left, _PyFloat_ExactDealloc);
142+
PyStackRef_CLOSE_SPECIALIZED(right, _PyFloat_ExactDealloc);
143143
return PyStackRef_FromPyObjectSteal(PyFloat_FromDouble(value));
144144
}
145145

Python/bytecodes.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,6 +869,7 @@ dummy_func(
869869
PyObject *res_o = _PyList_GetItemRef((PyListObject*)list, index);
870870
DEOPT_IF(res_o == NULL);
871871
STAT_INC(BINARY_OP, hit);
872+
res = PyStackRef_FromPyObjectSteal(res_o);
872873
#else
873874
DEOPT_IF(index >= PyList_GET_SIZE(list));
874875
STAT_INC(BINARY_OP, hit);

Python/executor_cases.c.h

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

Python/generated_cases.c.h

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

Tools/cases_generator/analyzer.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,7 @@ def has_error_without_pop(op: parser.CodeDef) -> bool:
591591
"PyStackRef_FromPyObjectImmortal",
592592
"PyStackRef_FromPyObjectNew",
593593
"PyStackRef_FromPyObjectSteal",
594+
"PyStackRef_IsExactly",
594595
"PyStackRef_FromPyObjectStealMortal",
595596
"PyStackRef_HasCount",
596597
"PyStackRef_IsNone",

Tools/cases_generator/generators_common.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,8 @@ def stackref_close_specialized(
330330
self.out.emit(comma)
331331
dealloc = next(tkn_iter)
332332
self.out.emit(dealloc)
333+
if dealloc.kind != "IDENTIFIER":
334+
raise analysis_error("Expected identifier", dealloc)
333335
if name.kind == "IDENTIFIER":
334336
escapes = dealloc.text not in NON_ESCAPING_DEALLOCS
335337
return self.stackref_kill(name, storage, escapes)

0 commit comments

Comments
 (0)