Skip to content

C
cpython
Kaydet (Commit) 87780dfa authored tarafından Guido van Rossum's avatar Guido van Rossum
Dosyalara gözat
Seçenekler

When an inlined operation on two small ints causes overflow, don't 

raise the exception here -- call the generic function (which may
convert the arguments to long and try again).
üst ae347b33
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 32 deletions
Python/ceval.c
Dosyayı görüntüle @ 87780dfa
...@@ -915,16 +915,14 @@ eval_frame(PyFrameObject *f) ...@@ -915,16 +915,14 @@ eval_frame(PyFrameObject *f)
a = PyInt_AS_LONG(v); a = PyInt_AS_LONG(v);
b = PyInt_AS_LONG(w); b = PyInt_AS_LONG(w);
i = a + b; i = a + b;
if ((i^a) < 0 && (i^b) < 0) { if ((i^a) < 0 && (i^b) < 0)
PyErr_SetString(PyExc_OverflowError, goto slow_add;
"integer addition"); x = PyInt_FromLong(i);
x = NULL;
}
else
x = PyInt_FromLong(i);
} }
else else {
slow_add:
x = PyNumber_Add(v, w); x = PyNumber_Add(v, w);
}
Py_DECREF(v); Py_DECREF(v);
Py_DECREF(w); Py_DECREF(w);
PUSH(x); PUSH(x);
...@@ -940,16 +938,14 @@ eval_frame(PyFrameObject *f) ...@@ -940,16 +938,14 @@ eval_frame(PyFrameObject *f)
a = PyInt_AS_LONG(v); a = PyInt_AS_LONG(v);
b = PyInt_AS_LONG(w); b = PyInt_AS_LONG(w);
i = a - b; i = a - b;
if ((i^a) < 0 && (i^~b) < 0) { if ((i^a) < 0 && (i^~b) < 0)
PyErr_SetString(PyExc_OverflowError, goto slow_sub;
"integer subtraction"); x = PyInt_FromLong(i);
x = NULL;
}
else
x = PyInt_FromLong(i);
} }
else else {
slow_sub:
x = PyNumber_Subtract(v, w); x = PyNumber_Subtract(v, w);
}
Py_DECREF(v); Py_DECREF(v);
Py_DECREF(w); Py_DECREF(w);
PUSH(x); PUSH(x);
...@@ -1102,16 +1098,14 @@ eval_frame(PyFrameObject *f) ...@@ -1102,16 +1098,14 @@ eval_frame(PyFrameObject *f)
a = PyInt_AS_LONG(v); a = PyInt_AS_LONG(v);
b = PyInt_AS_LONG(w); b = PyInt_AS_LONG(w);
i = a + b; i = a + b;
if ((i^a) < 0 && (i^b) < 0) { if ((i^a) < 0 && (i^b) < 0)
PyErr_SetString(PyExc_OverflowError, goto slow_iadd;
"integer addition"); x = PyInt_FromLong(i);
x = NULL;
}
else
x = PyInt_FromLong(i);
} }
else else {
slow_iadd:
x = PyNumber_InPlaceAdd(v, w); x = PyNumber_InPlaceAdd(v, w);
}
Py_DECREF(v); Py_DECREF(v);
Py_DECREF(w); Py_DECREF(w);
PUSH(x); PUSH(x);
...@@ -1127,16 +1121,14 @@ eval_frame(PyFrameObject *f) ...@@ -1127,16 +1121,14 @@ eval_frame(PyFrameObject *f)
a = PyInt_AS_LONG(v); a = PyInt_AS_LONG(v);
b = PyInt_AS_LONG(w); b = PyInt_AS_LONG(w);
i = a - b; i = a - b;
if ((i^a) < 0 && (i^~b) < 0) { if ((i^a) < 0 && (i^~b) < 0)
PyErr_SetString(PyExc_OverflowError, goto slow_isub;
"integer subtraction"); x = PyInt_FromLong(i);
x = NULL;
}
else
x = PyInt_FromLong(i);
} }
else else {
slow_isub:
x = PyNumber_InPlaceSubtract(v, w); x = PyNumber_InPlaceSubtract(v, w);
}
Py_DECREF(v); Py_DECREF(v);
Py_DECREF(w); Py_DECREF(w);
PUSH(x); PUSH(x);
......
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