Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gwenaël Samain
cython
Commits
3a9ce10b
Commit
3a9ce10b
authored
May 28, 2008
by
Robert Bradshaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug when indexing with large unsigned int
parent
e95d3eb7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
8 deletions
+49
-8
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+24
-8
tests/run/big_indices.pyx
tests/run/big_indices.pyx
+25
-0
No files found.
Cython/Compiler/ExprNodes.py
View file @
3a9ce10b
...
@@ -1253,6 +1253,7 @@ class IndexNode(ExprNode):
...
@@ -1253,6 +1253,7 @@ class IndexNode(ExprNode):
self
.
index
.
analyse_types
(
env
)
self
.
index
.
analyse_types
(
env
)
if
self
.
base
.
type
.
is_pyobject
:
if
self
.
base
.
type
.
is_pyobject
:
if
self
.
index
.
type
.
is_int
:
if
self
.
index
.
type
.
is_int
:
self
.
original_index_type
=
self
.
index
.
type
self
.
index
=
self
.
index
.
coerce_to
(
PyrexTypes
.
c_py_ssize_t_type
,
env
).
coerce_to_simple
(
env
)
self
.
index
=
self
.
index
.
coerce_to
(
PyrexTypes
.
c_py_ssize_t_type
,
env
).
coerce_to_simple
(
env
)
if
getting
:
if
getting
:
env
.
use_utility_code
(
getitem_int_utility_code
)
env
.
use_utility_code
(
getitem_int_utility_code
)
...
@@ -1289,6 +1290,15 @@ class IndexNode(ExprNode):
...
@@ -1289,6 +1290,15 @@ class IndexNode(ExprNode):
return
"(%s[%s])"
%
(
return
"(%s[%s])"
%
(
self
.
base
.
result_code
,
self
.
index
.
result_code
)
self
.
base
.
result_code
,
self
.
index
.
result_code
)
def
index_unsigned_parameter
(
self
):
if
self
.
index
.
type
.
is_int
:
if
self
.
original_index_type
.
signed
:
return
", 0"
else
:
return
", sizeof(Py_ssize_t) >= sizeof(%s)"
%
self
.
original_index_type
.
declaration_code
(
""
)
else
:
return
""
def
generate_subexpr_evaluation_code
(
self
,
code
):
def
generate_subexpr_evaluation_code
(
self
,
code
):
self
.
base
.
generate_evaluation_code
(
code
)
self
.
base
.
generate_evaluation_code
(
code
)
self
.
index
.
generate_evaluation_code
(
code
)
self
.
index
.
generate_evaluation_code
(
code
)
...
@@ -1305,12 +1315,14 @@ class IndexNode(ExprNode):
...
@@ -1305,12 +1315,14 @@ class IndexNode(ExprNode):
else
:
else
:
function
=
"PyObject_GetItem"
function
=
"PyObject_GetItem"
index_code
=
self
.
index
.
py_result
()
index_code
=
self
.
index
.
py_result
()
sign_code
=
""
code
.
putln
(
code
.
putln
(
"%s = %s(%s, %s); if (!%s) %s"
%
(
"%s = %s(%s, %s
%s
); if (!%s) %s"
%
(
self
.
result_code
,
self
.
result_code
,
function
,
function
,
self
.
base
.
py_result
(),
self
.
base
.
py_result
(),
index_code
,
index_code
,
self
.
index_unsigned_parameter
(),
self
.
result_code
,
self
.
result_code
,
code
.
error_goto
(
self
.
pos
)))
code
.
error_goto
(
self
.
pos
)))
...
@@ -1322,11 +1334,12 @@ class IndexNode(ExprNode):
...
@@ -1322,11 +1334,12 @@ class IndexNode(ExprNode):
function
=
"PyObject_SetItem"
function
=
"PyObject_SetItem"
index_code
=
self
.
index
.
py_result
()
index_code
=
self
.
index
.
py_result
()
code
.
putln
(
code
.
putln
(
"if (%s(%s, %s, %s) < 0) %s"
%
(
"if (%s(%s, %s, %s
%s
) < 0) %s"
%
(
function
,
function
,
self
.
base
.
py_result
(),
self
.
base
.
py_result
(),
index_code
,
index_code
,
value_code
,
value_code
,
self
.
index_unsigned_parameter
(),
code
.
error_goto
(
self
.
pos
)))
code
.
error_goto
(
self
.
pos
)))
def
generate_assignment_code
(
self
,
rhs
,
code
):
def
generate_assignment_code
(
self
,
rhs
,
code
):
...
@@ -4112,9 +4125,12 @@ static void __Pyx_TypeModified(PyTypeObject* type) {
...
@@ -4112,9 +4125,12 @@ static void __Pyx_TypeModified(PyTypeObject* type) {
#------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------
# If the is_unsigned flag is set, we need to do some extra work to make
# sure the index doesn't become negative.
getitem_int_utility_code
=
[
getitem_int_utility_code
=
[
"""
"""
static INLINE PyObject *__Pyx_GetItemInt(PyObject *o, Py_ssize_t i) {
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);
...
@@ -4124,10 +4140,10 @@ static INLINE PyObject *__Pyx_GetItemInt(PyObject *o, Py_ssize_t i) {
...
@@ -4124,10 +4140,10 @@ static INLINE PyObject *__Pyx_GetItemInt(PyObject *o, Py_ssize_t i) {
r = PyTuple_GET_ITEM(o, i);
r = PyTuple_GET_ITEM(o, i);
Py_INCREF(r);
Py_INCREF(r);
}
}
else if (Py_TYPE(o)->tp_as_sequence && Py_TYPE(o)->tp_as_sequence->sq_item)
else if (Py_TYPE(o)->tp_as_sequence && Py_TYPE(o)->tp_as_sequence->sq_item
&& (likely(i >= 0) || !is_unsigned)
)
r = PySequence_GetItem(o, i);
r = PySequence_GetItem(o, i);
else {
else {
PyObject *j =
PyInt_FromLong(
i);
PyObject *j =
(likely(i >= 0) || !is_unsigned) ? PyInt_FromLong(i) : PyLong_FromUnsignedLongLong((sizeof(unsigned long long) > sizeof(Py_ssize_t) ? (1ULL << (sizeof(Py_ssize_t)*8)) : 0) +
i);
if (!j)
if (!j)
return 0;
return 0;
r = PyObject_GetItem(o, j);
r = PyObject_GetItem(o, j);
...
@@ -4143,7 +4159,7 @@ static INLINE PyObject *__Pyx_GetItemInt(PyObject *o, Py_ssize_t i) {
...
@@ -4143,7 +4159,7 @@ static INLINE PyObject *__Pyx_GetItemInt(PyObject *o, Py_ssize_t i) {
setitem_int_utility_code
=
[
setitem_int_utility_code
=
[
"""
"""
static INLINE int __Pyx_SetItemInt(PyObject *o, Py_ssize_t i, PyObject *v) {
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));
...
@@ -4151,10 +4167,10 @@ static INLINE int __Pyx_SetItemInt(PyObject *o, Py_ssize_t i, PyObject *v) {
...
@@ -4151,10 +4167,10 @@ static INLINE int __Pyx_SetItemInt(PyObject *o, Py_ssize_t i, PyObject *v) {
PyList_SET_ITEM(o, i, v);
PyList_SET_ITEM(o, i, v);
return 1;
return 1;
}
}
else if (Py_TYPE(o)->tp_as_sequence && Py_TYPE(o)->tp_as_sequence->sq_ass_item)
else if (Py_TYPE(o)->tp_as_sequence && Py_TYPE(o)->tp_as_sequence->sq_ass_item
&& (likely(i >= 0) || !is_unsigned)
)
r = PySequence_SetItem(o, i, v);
r = PySequence_SetItem(o, i, v);
else {
else {
PyObject *j =
PyInt_FromLong(
i);
PyObject *j =
(likely(i >= 0) || !is_unsigned) ? PyInt_FromLong(i) : PyLong_FromUnsignedLongLong((sizeof(unsigned long long) > sizeof(Py_ssize_t) ? (1ULL << (sizeof(Py_ssize_t)*8)) : 0) +
i);
if (!j)
if (!j)
return -1;
return -1;
r = PyObject_SetItem(o, j, v);
r = PyObject_SetItem(o, j, v);
...
...
tests/run/big_indices.pyx
0 → 100644
View file @
3a9ce10b
__doc__
=
u"""
>>> test()
neg -1
pos 4294967294
neg
pos
neg
pos
"""
def
test
():
cdef
long
neg
=
-
1
cdef
unsigned
long
pos
=
-
2
# will be a large positive number
print
"neg"
,
neg
print
"pos"
,
pos
D
=
{
neg
:
'neg'
,
pos
:
'pos'
}
print
D
[
<
object
>
neg
]
print
D
[
<
object
>
pos
]
print
D
[
neg
]
print
D
[
pos
]
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment