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

GH-131798: Skip `self`/`NULL` checks for some known non-methods by brandtbucher · Pull Request #132278 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

GH-131798: Skip self/NULL checks for some known non-methods #132278

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

Closed
brandtbucher wants to merge 3 commits into from
Conversation 5 Commits 3 Checks 0 Files changed
Closed

GH-131798: Skip self/NULL checks for some known non-methods #132278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe5b174
Don't check whethed non-methods are methods
brandtbucher Apr 8, 2025
873829d
blurb add
brandtbucher Apr 8, 2025
ec5c674
Add tests for weird method patterns
brandtbucher Apr 8, 2025
File filter

Filter by extension

Filter by extension .c  (1) .h  (2) .py  (1) .rst  (1) All 4 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
52 changes: 52 additions & 0 deletions Lib/test/test_opcache.py
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,58 @@ def instantiate():
with self.assertRaises(TypeError):
instantiate()

def test_call_specialized_non_method_on_class(self):
class C:
pass
o = C()
for callable in (isinstance, len, str, tuple, type):
setattr(C, callable.__name__, callable)
for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD):
self.assertIs(o.isinstance("Spam", str), True)
self.assertEqual(o.len("Spam"), 4)
self.assertEqual(o.str("Spam"), "Spam")
self.assertEqual(o.tuple("Spam"), ("S", "p", "a", "m"))
self.assertIs(o.type("Spam"), str)

def test_call_specialized_non_method_on_instance(self):
class C:
pass
o = C()
for callable in (isinstance, len, str, tuple, type):
setattr(o, callable.__name__, callable)
for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD):
self.assertIs(o.isinstance("Spam", str), True)
self.assertEqual(o.len("Spam"), 4)
self.assertEqual(o.str("Spam"), "Spam")
self.assertEqual(o.tuple("Spam"), ("S", "p", "a", "m"))
self.assertIs(o.type("Spam"), str)

def test_call_specialized_method_on_class(self):
class C:
pass
o = C()
for callable in (isinstance, len, str, tuple, type):
setattr(C, callable.__name__, types.MethodType(callable, "Spam"))
for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD):
self.assertIs(o.isinstance(str), True)
self.assertEqual(o.len(), 4)
self.assertEqual(o.str(), "Spam")
self.assertEqual(o.tuple(), ("S", "p", "a", "m"))
self.assertIs(o.type(), str)

def test_call_specialized_method_on_instance(self):
class C:
pass
o = C()
for callable in (isinstance, len, str, tuple, type):
setattr(o, callable.__name__, types.MethodType(callable, "Spam"))
for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD):
self.assertIs(o.isinstance(str), True)
self.assertEqual(o.len(), 4)
self.assertEqual(o.str(), "Spam")
self.assertEqual(o.tuple(), ("S", "p", "a", "m"))
self.assertIs(o.type(), str)


def make_deferred_ref_count_obj():
"""Create an object that uses deferred reference counting.
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2025-04-08-08-59-25.gh-issue-131798.WrcdVS.rst
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Remove some unnecessary checks for some non-method :opcode:`CALL`
specializations.
41 changes: 13 additions & 28 deletions Python/bytecodes.c
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -3912,10 +3912,10 @@ dummy_func(
PyObject *arg_o = PyStackRef_AsPyObjectBorrow(arg);

assert(oparg == 1);
DEOPT_IF(!PyStackRef_IsNull(null));
DEAD(null);
DEOPT_IF(callable_o != (PyObject *)&PyType_Type);
DEAD(callable);
assert(PyStackRef_IsNull(null));
DEAD(null);
STAT_INC(CALL, hit);
res = PyStackRef_FromPyObjectNew(Py_TYPE(arg_o));
PyStackRef_CLOSE(arg);
Expand All @@ -3926,8 +3926,8 @@ dummy_func(
PyObject *arg_o = PyStackRef_AsPyObjectBorrow(arg);

assert(oparg == 1);
DEOPT_IF(!PyStackRef_IsNull(null));
DEOPT_IF(callable_o != (PyObject *)&PyUnicode_Type);
assert(PyStackRef_IsNull(null));
STAT_INC(CALL, hit);
PyObject *res_o = PyObject_Str(arg_o);
DEAD(null);
Expand All @@ -3948,8 +3948,8 @@ dummy_func(
PyObject *arg_o = PyStackRef_AsPyObjectBorrow(arg);

assert(oparg == 1);
DEOPT_IF(!PyStackRef_IsNull(null));
DEOPT_IF(callable_o != (PyObject *)&PyTuple_Type);
assert(PyStackRef_IsNull(null));
STAT_INC(CALL, hit);
PyObject *res_o = PySequence_Tuple(arg_o);
DEAD(null);
Expand Down Expand Up @@ -4036,20 +4036,15 @@ dummy_func(
PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable[0]);
DEOPT_IF(!PyType_Check(callable_o));
PyTypeObject *tp = (PyTypeObject *)callable_o;
int total_args = oparg;
_PyStackRef *arguments = args;
if (!PyStackRef_IsNull(self_or_null[0])) {
arguments--;
total_args++;
}
DEOPT_IF(!PyStackRef_IsNull(self_or_null[0]));
DEOPT_IF(tp->tp_vectorcall == NULL);
STAT_INC(CALL, hit);
STACKREFS_TO_PYOBJECTS(arguments, total_args, args_o);
STACKREFS_TO_PYOBJECTS(args, oparg, args_o);
if (CONVERSION_FAILED(args_o)) {
DECREF_INPUTS();
ERROR_IF(true, error);
}
PyObject *res_o = tp->tp_vectorcall((PyObject *)tp, args_o, total_args, NULL);
PyObject *res_o = tp->tp_vectorcall((PyObject *)tp, args_o, oparg, NULL);
STACKREFS_TO_PYOBJECTS_CLEANUP(args_o);
DECREF_INPUTS();
ERROR_IF(res_o == NULL, error);
Expand Down Expand Up @@ -4175,14 +4170,10 @@ dummy_func(
/* len(o) */
PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable[0]);

int total_args = oparg;
if (!PyStackRef_IsNull(self_or_null[0])) {
args--;
total_args++;
}
DEOPT_IF(total_args != 1);
assert(oparg == 1);
PyInterpreterState *interp = tstate->interp;
DEOPT_IF(callable_o != interp->callable_cache.len);
assert(PyStackRef_IsNull(self_or_null[0]));
STAT_INC(CALL, hit);
_PyStackRef arg_stackref = args[0];
PyObject *arg = PyStackRef_AsPyObjectBorrow(arg_stackref);
Expand All @@ -4206,24 +4197,18 @@ dummy_func(
/* isinstance(o, o2) */
PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);

int total_args = oparg;
_PyStackRef *arguments = args;
if (!PyStackRef_IsNull(self_or_null[0])) {
arguments--;
total_args++;
}
DEOPT_IF(total_args != 2);
assert(oparg == 2);
PyInterpreterState *interp = tstate->interp;
DEOPT_IF(callable_o != interp->callable_cache.isinstance);
assert(PyStackRef_IsNull(self_or_null[0]));
STAT_INC(CALL, hit);
_PyStackRef cls_stackref = arguments[1];
_PyStackRef inst_stackref = arguments[0];
_PyStackRef cls_stackref = args[1];
_PyStackRef inst_stackref = args[0];
int retval = PyObject_IsInstance(PyStackRef_AsPyObjectBorrow(inst_stackref), PyStackRef_AsPyObjectBorrow(cls_stackref));
if (retval < 0) {
ERROR_NO_POP();
}
res = retval ? PyStackRef_True : PyStackRef_False;
assert((!PyStackRef_IsNull(res)) ^ (_PyErr_Occurred(tstate) != NULL));
DECREF_INPUTS();
}

Expand Down
53 changes: 13 additions & 40 deletions Python/executor_cases.c.h
Show comments
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Back | FazBrowse Home | New Git URL