Skip to content

GH-106008: Make implicit boolean conversions explicit #106003

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

Merged
brandtbucher merged 18 commits into from
Jun 29, 2023
Merged

GH-106008: Make implicit boolean conversions explicit #106003

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
69781b4
Make boolean conversions in branches explicit
brandtbucher Jun 6, 2023
5289c7f
Specialize UNARY_NOT
brandtbucher Jun 6, 2023
7e5c9df
Remove unused stats
brandtbucher Jun 7, 2023
27bb264
Make UNARY_NOT_BOOL a little bit slicker
brandtbucher Jun 7, 2023
0463633
Replace UNARY_NOT with TO_BOOL
brandtbucher Jun 9, 2023
d2932a1
Catch up with main
brandtbucher Jun 21, 2023
47ec38f
Branchless branching
brandtbucher Jun 21, 2023
a0bd53a
Add a "boolean conversion" bit to COMPARE_OP
brandtbucher Jun 21, 2023
bab539b
More stats for heap types
brandtbucher Jun 21, 2023
757b1cc
Specialize TO_BOOL_ALWAYS_TRUE
brandtbucher Jun 21, 2023
f9fa498
Fix refleak and error handling
brandtbucher Jun 21, 2023
0c14344
Catch up with main
brandtbucher Jun 22, 2023
d314078
Cleanup
brandtbucher Jun 23, 2023
9aa83b5
blurb add
brandtbucher Jun 23, 2023
a76f11d
Docs
brandtbucher Jun 23, 2023
c2d4a33
Clean up some commnts
brandtbucher Jun 23, 2023
7638b76
Add cast
brandtbucher Jun 29, 2023
6b4a598
Catch up with main
brandtbucher Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More stats for heap types
  • Loading branch information
@brandtbucher
brandtbucher committed Jun 21, 2023
commit bab539bf50f769912c96f51ae427d4bac122e5d4
36 changes: 27 additions & 9 deletions Python/specialize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,14 +443,17 @@ _PyCode_Quicken(PyCodeObject *code)
#define SPEC_FAIL_UNPACK_SEQUENCE_SEQUENCE 10

// TO_BOOL
#define SPEC_FAIL_TO_BOOL_BYTEARRAY 9
#define SPEC_FAIL_TO_BOOL_BYTES 10
#define SPEC_FAIL_TO_BOOL_DICT 11
#define SPEC_FAIL_TO_BOOL_FLOAT 12
#define SPEC_FAIL_TO_BOOL_HEAP_TYPE 13
#define SPEC_FAIL_TO_BOOL_MEMORY_VIEW 14
#define SPEC_FAIL_TO_BOOL_SET 15
#define SPEC_FAIL_TO_BOOL_TUPLE 16
#define SPEC_FAIL_TO_BOOL_BYTEARRAY 9
#define SPEC_FAIL_TO_BOOL_BYTES 10
#define SPEC_FAIL_TO_BOOL_DICT 11
#define SPEC_FAIL_TO_BOOL_FLOAT 12
#define SPEC_FAIL_TO_BOOL_HEAP_TYPE_MAPPING 13
#define SPEC_FAIL_TO_BOOL_HEAP_TYPE_NUMBER 14
#define SPEC_FAIL_TO_BOOL_HEAP_TYPE_SEQUENCE 15
#define SPEC_FAIL_TO_BOOL_HEAP_TYPE_TRUE 16
#define SPEC_FAIL_TO_BOOL_MEMORY_VIEW 17
#define SPEC_FAIL_TO_BOOL_SET 18
#define SPEC_FAIL_TO_BOOL_TUPLE 19

static int function_kind(PyCodeObject *code);
static bool function_check_args(PyObject *o, int expected_argcount, int opcode);
Expand Down Expand Up @@ -2286,7 +2289,22 @@ _Py_Specialize_ToBool(PyObject *value, _Py_CODEUNIT *instr)
goto failure;
}
if (PyType_HasFeature(Py_TYPE(value), Py_TPFLAGS_HEAPTYPE)) {
SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_HEAP_TYPE);
PyNumberMethods *nb = Py_TYPE(value)->tp_as_number;
if (nb && nb->nb_bool) {
SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_HEAP_TYPE_NUMBER);
goto failure;
}
PyMappingMethods *mp = Py_TYPE(value)->tp_as_mapping;
if (mp && mp->mp_length) {
SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_HEAP_TYPE_MAPPING);
goto failure;
}
PySequenceMethods *sq = Py_TYPE(value)->tp_as_sequence;
if (sq && sq->sq_length) {
SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_HEAP_TYPE_SEQUENCE);
goto failure;
}
SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_HEAP_TYPE_TRUE);
goto failure;
}
if (PyMemoryView_Check(value)) {
Expand Down