python · eendebakpt · Apr 11, 2024 · Apr 11, 2024 · Apr 11, 2024 · Apr 11, 2024
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2024-04-11-21-17-23.gh-issue-117431.ZxdAFN.rst b/Misc/NEWS.d/next/Core_and_Builtins/2024-04-11-21-17-23.gh-issue-117431.ZxdAFN.rst
@@ -0,0 +1 @@
+Improve performance of :meth:`str.startswith`, :meth:`str.endswith`, :meth:`str.removeprefix` and :meth:`str.removesuffix`.
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -9943,24 +9943,21 @@ tailmatch(PyObject *self,
     else
         offset = start;
 
-    if (PyUnicode_READ(kind_self, data_self, offset) ==
-        PyUnicode_READ(kind_sub, data_sub, 0) &&
-        PyUnicode_READ(kind_self, data_self, offset + end_sub) ==
-        PyUnicode_READ(kind_sub, data_sub, end_sub)) {
+    int match_last = PyUnicode_READ(kind_self, data_self, offset + end_sub) ==
+                        PyUnicode_READ(kind_sub, data_sub, end_sub);
+
+    if (match_last) {
         /* If both are of the same kind, memcmp is sufficient */
         if (kind_self == kind_sub) {
-            return ! memcmp((char *)data_self +
-                                (offset * PyUnicode_KIND(substring)),
-                            data_sub,
-                            PyUnicode_GET_LENGTH(substring) *
-                                PyUnicode_KIND(substring));
+            return ! memcmp((char *)data_self + (offset * kind_sub),
+                            data_sub, end_sub * kind_sub);
         }
         /* otherwise we have to compare each character by first accessing it */
         else {
-            /* We do not need to compare 0 and len(substring)-1 because
-               the if statement above ensured already that they are equal
-               when we end up here. */
-            for (i = 1; i < end_sub; ++i) {
+            /* We do not need to compare len(substring)-1 because the check on
+               match_last above ensured already that they are equal when we
+               end up here. */
+            for (i = 0; i < end_sub; ++i) {
                 if (PyUnicode_READ(kind_self, data_self, offset + i) !=
                     PyUnicode_READ(kind_sub, data_sub, i))
                     return 0;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Improve performance of :meth:`str.startswith`, :meth:`str.endswith`, :meth:`str.removeprefix` and :meth:`str.removesuffix`.