From: Dong-hee Na <donghee.na92@gmail.com>
Date: Wed, 21 Oct 2020 02:29:56 +0000 (+0900)
Subject: bpo-41902: Micro optimization for range.index if step is 1 (GH-22479)
X-Git-Tag: v3.10.0a2~126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0f22fb8b3006936757cebb959cee94e285bc503;p=thirdparty%2FPython%2Fcpython.git

bpo-41902: Micro optimization for range.index if step is 1 (GH-22479)
---

diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-10-01-22-44-23.bpo-41902.iLoMVF.rst b/Misc/NEWS.d/next/Core and Builtins/2020-10-01-22-44-23.bpo-41902.iLoMVF.rst
new file mode 100644
index 000000000000..738ef5aec950
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2020-10-01-22-44-23.bpo-41902.iLoMVF.rst	
@@ -0,0 +1 @@
+Micro optimization for range.index if step is 1. Patch by Dong-hee Na.
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
index eaa48d5f44fc..babf55b108b9 100644
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -582,13 +582,19 @@ range_index(rangeobject *r, PyObject *ob)
         return NULL;
 
     if (contains) {
-        PyObject *idx, *tmp = PyNumber_Subtract(ob, r->start);
-        if (tmp == NULL)
+        PyObject *idx = PyNumber_Subtract(ob, r->start);
+        if (idx == NULL) {
             return NULL;
+        }
+
+        if (r->step == _PyLong_One) {
+            return idx;
+        }
+
         /* idx = (ob - r.start) // r.step */
-        idx = PyNumber_FloorDivide(tmp, r->step);
-        Py_DECREF(tmp);
-        return idx;
+        PyObject *sidx = PyNumber_FloorDivide(idx, r->step);
+        Py_DECREF(idx);
+        return sidx;
     }
 
     /* object is not in the range */