Mercurial > cpython-lru_cache-weakref
diff Python/ceval.c @ 19434:c140bd7d3bdc legacy-trunk
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).
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Thu, 23 Aug 2001 02:58:07 +0000 |
| parents | 8c2a29b7548e |
| children | 1cece743a708 |
line wrap: on
line diff
--- a/Python/ceval.c Thu Aug 23 02:56:07 2001 +0000 +++ b/Python/ceval.c Thu Aug 23 02:58:07 2001 +0000 @@ -915,16 +915,14 @@ a = PyInt_AS_LONG(v); b = PyInt_AS_LONG(w); i = a + b; - if ((i^a) < 0 && (i^b) < 0) { - PyErr_SetString(PyExc_OverflowError, - "integer addition"); - x = NULL; - } - else - x = PyInt_FromLong(i); + if ((i^a) < 0 && (i^b) < 0) + goto slow_add; + x = PyInt_FromLong(i); } - else + else { + slow_add: x = PyNumber_Add(v, w); + } Py_DECREF(v); Py_DECREF(w); PUSH(x); @@ -940,16 +938,14 @@ a = PyInt_AS_LONG(v); b = PyInt_AS_LONG(w); i = a - b; - if ((i^a) < 0 && (i^~b) < 0) { - PyErr_SetString(PyExc_OverflowError, - "integer subtraction"); - x = NULL; - } - else - x = PyInt_FromLong(i); + if ((i^a) < 0 && (i^~b) < 0) + goto slow_sub; + x = PyInt_FromLong(i); } - else + else { + slow_sub: x = PyNumber_Subtract(v, w); + } Py_DECREF(v); Py_DECREF(w); PUSH(x); @@ -1102,16 +1098,14 @@ a = PyInt_AS_LONG(v); b = PyInt_AS_LONG(w); i = a + b; - if ((i^a) < 0 && (i^b) < 0) { - PyErr_SetString(PyExc_OverflowError, - "integer addition"); - x = NULL; - } - else - x = PyInt_FromLong(i); + if ((i^a) < 0 && (i^b) < 0) + goto slow_iadd; + x = PyInt_FromLong(i); } - else + else { + slow_iadd: x = PyNumber_InPlaceAdd(v, w); + } Py_DECREF(v); Py_DECREF(w); PUSH(x); @@ -1127,16 +1121,14 @@ a = PyInt_AS_LONG(v); b = PyInt_AS_LONG(w); i = a - b; - if ((i^a) < 0 && (i^~b) < 0) { - PyErr_SetString(PyExc_OverflowError, - "integer subtraction"); - x = NULL; - } - else - x = PyInt_FromLong(i); + if ((i^a) < 0 && (i^~b) < 0) + goto slow_isub; + x = PyInt_FromLong(i); } - else + else { + slow_isub: x = PyNumber_InPlaceSubtract(v, w); + } Py_DECREF(v); Py_DECREF(w); PUSH(x);