gh-131306: Remove unused code related to `BINARY_SUBSCR` (#131307) · python/cpython@d07e9eb · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 35.3k
• Star 74.9k

• Code
• Issues 5k+
• Pull requests 2.5k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit d07e9eb

Browse filesBrowse the repository at this point in the historyBrowse files

tomasr8

authored

gh-131306: Remove unused code related to BINARY_SUBSCR (#131307)

1 parent bf4c1bf commit d07e9eb
Copy full SHA for d07e9eb

5 files changed

+6-15Lines changed: 6 additions & 15 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Include
  • cpython
    • object.h
  • internal
    • pycore_code.h
• InternalDocs
  • frames.md
• Lib
  • opcode.py
  • test
    • test_opcache.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Include/cpython/object.h‎

Copy file name to clipboardExpand all lines: Include/cpython/object.h

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -256,7 +256,7 @@ struct _specialization_cache {
256	256	// - If getitem is NULL, then getitem_version is meaningless.
257	257	// - If getitem->func_version == getitem_version, then getitem can be called
258	258	// with two positional arguments and no keyword arguments, and has neither
259		- // *args nor **kwargs (as required by BINARY_SUBSCR_GETITEM):
	259	+ // *args nor **kwargs (as required by BINARY_OP_SUBSCR_GETITEM):
260	260	PyObject *getitem;
261	261	uint32_t getitem_version;
262	262	PyObject *init;

Collapse file

‎Include/internal/pycore_code.h‎

Copy file name to clipboardExpand all lines: Include/internal/pycore_code.h

-6Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -118,12 +118,6 @@ typedef struct {
118	118
119	119	#define INLINE_CACHE_ENTRIES_COMPARE_OP CACHE_ENTRIES(_PyCompareOpCache)
120	120
121		- typedef struct {
122		- _Py_BackoffCounter counter;
123		- } _PyBinarySubscrCache;
124		-
125		- #define INLINE_CACHE_ENTRIES_BINARY_SUBSCR CACHE_ENTRIES(_PyBinarySubscrCache)
126		-
127	121	typedef struct {
128	122	_Py_BackoffCounter counter;
129	123	} _PySuperAttrCache;

Collapse file

‎InternalDocs/frames.md‎

Copy file name to clipboardExpand all lines: InternalDocs/frames.md

+1-1Lines changed: 1 addition & 1 deletion

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -126,7 +126,7 @@ to see in an exception traceback.
126	126	The `return_offset` field determines where a `RETURN` should go in the caller,
127	127	relative to `instr_ptr`. It is only meaningful to the callee, so it needs to
128	128	be set in any instruction that implements a call (to a Python function),
129		- including CALL, SEND and BINARY_SUBSCR_GETITEM, among others. If there is no
	129	+ including CALL, SEND and BINARY_OP_SUBSCR_GETITEM, among others. If there is no
130	130	callee, then return_offset is meaningless. It is necessary to have a separate
131	131	field for the return offset because (1) if we apply this offset to `instr_ptr`
132	132	while executing the `RETURN`, this is too early and would lose us information

Collapse file

‎Lib/opcode.py‎

Copy file name to clipboardExpand all lines: Lib/opcode.py

-3Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -63,9 +63,6 @@
63	63	"CONTAINS_OP": {
64	64	"counter": 1,
65	65	},
66		- "BINARY_SUBSCR": {
67		- "counter": 1,
68		- },
69	66	"FOR_ITER": {
70	67	"counter": 1,
71	68	},

Collapse file

‎Lib/test/test_opcache.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_opcache.py

+4-4Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -1706,7 +1706,7 @@ def binary_subscr_list_int():
1706	1706	binary_subscr_list_int()
1707	1707	self.assert_specialized(binary_subscr_list_int,
1708	1708	"BINARY_OP_SUBSCR_LIST_INT")
1709		- self.assert_no_opcode(binary_subscr_list_int, "BINARY_SUBSCR")
	1709	+ self.assert_no_opcode(binary_subscr_list_int, "BINARY_OP")
1710	1710
1711	1711	def binary_subscr_tuple_int():
1712	1712	for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD):
@@ -1717,7 +1717,7 @@ def binary_subscr_tuple_int():
1717	1717	binary_subscr_tuple_int()
1718	1718	self.assert_specialized(binary_subscr_tuple_int,
1719	1719	"BINARY_OP_SUBSCR_TUPLE_INT")
1720		- self.assert_no_opcode(binary_subscr_tuple_int, "BINARY_SUBSCR")
	1720	+ self.assert_no_opcode(binary_subscr_tuple_int, "BINARY_OP")
1721	1721
1722	1722	def binary_subscr_dict():
1723	1723	for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD):
@@ -1737,7 +1737,7 @@ def binary_subscr_str_int():
1737	1737
1738	1738	binary_subscr_str_int()
1739	1739	self.assert_specialized(binary_subscr_str_int, "BINARY_OP_SUBSCR_STR_INT")
1740		- self.assert_no_opcode(binary_subscr_str_int, "BINARY_SUBSCR")
	1740	+ self.assert_no_opcode(binary_subscr_str_int, "BINARY_OP")
1741	1741
1742	1742	def binary_subscr_getitems():
1743	1743	class C:
@@ -1752,7 +1752,7 @@ def __getitem__(self, item):
1752	1752
1753	1753	binary_subscr_getitems()
1754	1754	self.assert_specialized(binary_subscr_getitems, "BINARY_OP_SUBSCR_GETITEM")
1755		- self.assert_no_opcode(binary_subscr_getitems, "BINARY_SUBSCR")
	1755	+ self.assert_no_opcode(binary_subscr_getitems, "BINARY_OP")
1756	1756
1757	1757	@cpython_only
1758	1758	@requires_specialization_ft

0 commit comments

Comments

0 (0)