Commit fb0fe548 authored by Robert Bradshaw's avatar Robert Bradshaw

more branch avoidance

parent 2c9675ff
...@@ -5411,7 +5411,7 @@ static INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, Py_ssize_t i, int ...@@ -5411,7 +5411,7 @@ static INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, Py_ssize_t i, int
} }
static INLINE PyObject *__Pyx_GetItemInt_List(PyObject *o, Py_ssize_t i, int is_unsigned) { static INLINE PyObject *__Pyx_GetItemInt_List(PyObject *o, Py_ssize_t i, int is_unsigned) {
if (likely(o != Py_None && 0 <= i && i < PyList_GET_SIZE(o))) { if (likely(o != Py_None && ((0 <= i) & (i < PyList_GET_SIZE(o))))) {
PyObject *r = PyList_GET_ITEM(o, i); PyObject *r = PyList_GET_ITEM(o, i);
Py_INCREF(r); Py_INCREF(r);
return r; return r;
...@@ -5420,7 +5420,7 @@ static INLINE PyObject *__Pyx_GetItemInt_List(PyObject *o, Py_ssize_t i, int is_ ...@@ -5420,7 +5420,7 @@ static INLINE PyObject *__Pyx_GetItemInt_List(PyObject *o, Py_ssize_t i, int is_
} }
static INLINE PyObject *__Pyx_GetItemInt_Tuple(PyObject *o, Py_ssize_t i, int is_unsigned) { static INLINE PyObject *__Pyx_GetItemInt_Tuple(PyObject *o, Py_ssize_t i, int is_unsigned) {
if (likely(o != Py_None && 0 <= i && i < PyTuple_GET_SIZE(o))) { if (likely(o != Py_None && ((0 <= i) & (i < PyTuple_GET_SIZE(o))))) {
PyObject *r = PyTuple_GET_ITEM(o, i); PyObject *r = PyTuple_GET_ITEM(o, i);
Py_INCREF(r); Py_INCREF(r);
return r; return r;
...@@ -5430,11 +5430,11 @@ static INLINE PyObject *__Pyx_GetItemInt_Tuple(PyObject *o, Py_ssize_t i, int is ...@@ -5430,11 +5430,11 @@ static INLINE PyObject *__Pyx_GetItemInt_Tuple(PyObject *o, Py_ssize_t i, int is
static INLINE PyObject *__Pyx_GetItemInt(PyObject *o, Py_ssize_t i, int is_unsigned) { static INLINE PyObject *__Pyx_GetItemInt(PyObject *o, Py_ssize_t i, int is_unsigned) {
PyObject *r; PyObject *r;
if (PyList_CheckExact(o) && 0 <= i && i < PyList_GET_SIZE(o)) { if (PyList_CheckExact(o) && ((0 <= i) & (i < PyList_GET_SIZE(o)))) {
r = PyList_GET_ITEM(o, i); r = PyList_GET_ITEM(o, i);
Py_INCREF(r); Py_INCREF(r);
} }
else if (PyTuple_CheckExact(o) && 0 <= i && i < PyTuple_GET_SIZE(o)) { else if (PyTuple_CheckExact(o) && ((0 <= i) & (i < PyTuple_GET_SIZE(o)))) {
r = PyTuple_GET_ITEM(o, i); r = PyTuple_GET_ITEM(o, i);
Py_INCREF(r); Py_INCREF(r);
} }
...@@ -5457,7 +5457,7 @@ setitem_int_utility_code = UtilityCode( ...@@ -5457,7 +5457,7 @@ setitem_int_utility_code = UtilityCode(
proto = """ proto = """
static INLINE int __Pyx_SetItemInt(PyObject *o, Py_ssize_t i, PyObject *v, int is_unsigned) { static INLINE int __Pyx_SetItemInt(PyObject *o, Py_ssize_t i, PyObject *v, int is_unsigned) {
int r; int r;
if (PyList_CheckExact(o) && 0 <= i && i < PyList_GET_SIZE(o)) { if (PyList_CheckExact(o) && (0 <= i & i < PyList_GET_SIZE(o))) {
Py_DECREF(PyList_GET_ITEM(o, i)); Py_DECREF(PyList_GET_ITEM(o, i));
Py_INCREF(v); Py_INCREF(v);
PyList_SET_ITEM(o, i, v); PyList_SET_ITEM(o, i, v);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment