FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.11] GH-104405: Add missing PEP 523 checks by brandtbucher · Pull Request #104441 · python/cpython · GitHub

/ cpython Public
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .c  (2) .py  (1) .rst  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
47 changes: 29 additions & 18 deletions Lib/test/test_capi/test_misc.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -1378,28 +1378,39 @@ def dummy():

class Test_Pep523API(unittest.TestCase):

def do_test(self, func):
calls = []
def do_test(self, func, names):
actual_calls = []
start = SUFFICIENT_TO_DEOPT_AND_SPECIALIZE
count = start + SUFFICIENT_TO_DEOPT_AND_SPECIALIZE
for i in range(count):
if i == start:
_testinternalcapi.set_eval_frame_record(calls)
func()
_testinternalcapi.set_eval_frame_default()
self.assertEqual(len(calls), SUFFICIENT_TO_DEOPT_AND_SPECIALIZE)
for name in calls:
self.assertEqual(name, func.__name__)

def test_pep523_with_specialization_simple(self):
def func1():
pass
self.do_test(func1)
try:
for i in range(count):
if i == start:
_testinternalcapi.set_eval_frame_record(actual_calls)
func()
finally:
_testinternalcapi.set_eval_frame_default()
expected_calls = names * SUFFICIENT_TO_DEOPT_AND_SPECIALIZE
self.assertEqual(len(expected_calls), len(actual_calls))
for expected, actual in zip(expected_calls, actual_calls, strict=True):
self.assertEqual(expected, actual)

def test_inlined_binary_subscr(self):
class C:
def __getitem__(self, other):
return None
def func():
C()[42]
names = ["func", "__getitem__"]
self.do_test(func, names)

def test_pep523_with_specialization_with_default(self):
def func2(x=None):
def test_inlined_call(self):
def inner(x=42):
pass
self.do_test(func2)
def func():
inner()
inner(42)
names = ["func", "inner", "inner"]
self.do_test(func, names)


if __name__ == "__main__":
Expand Down
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix an issue where some :term:`bytecode` instructions could ignore
:pep:`523` when "inlining" calls.
1 change: 1 addition & 0 deletions Python/ceval.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -2233,6 +2233,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
}

TARGET(BINARY_SUBSCR_GETITEM) {
DEOPT_IF(tstate->interp->eval_frame, BINARY_SUBSCR);
PyObject *sub = TOP();
PyObject *container = SECOND();
_PyBinarySubscrCache *cache = (_PyBinarySubscrCache *)next_instr;
Expand Down
4 changes: 4 additions & 0 deletions Python/specialize.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -1238,6 +1238,10 @@ _Py_Specialize_BinarySubscr(
SPECIALIZATION_FAIL(BINARY_SUBSCR, SPEC_FAIL_OUT_OF_VERSIONS);
goto fail;
}
if (_PyInterpreterState_GET()->eval_frame) {
SPECIALIZATION_FAIL(BINARY_SUBSCR, SPEC_FAIL_OTHER);
goto fail;
}
cache->func_version = version;
((PyHeapTypeObject *)container_type)->_spec_cache.getitem = descriptor;
_Py_SET_OPCODE(*instr, BINARY_SUBSCR_GETITEM);
Expand Down

Back | FazBrowse Home | New Git URL