From 2323b867bd91d1d78fdc3cc87a5ecaba4e747d44 Mon Sep 17 00:00:00 2001
From: neonene <53406459+neonene@users.noreply.github.com>
Date: Sat, 20 Apr 2024 07:44:26 +0900
Subject: [PATCH 1/8] wrap 5 functions

This introduces the following wrapper functions for the public C-API, so that the wrapped functions (`_capi` un-suffixed) can have more arguments, such as a module state:

 * `new_datetime_ex_capi()`
 * `new_time_ex_capi()`, renamed from `new_time_ex`, as it is internally unused.
 * `new_timezone_capi()`
 * `new_datetime_ex2_capi()`
 * `new_time_ex2_capi()`

The wrappers need to get a module state from the C-API class or a given object's type.
---
 Modules/_datetimemodule.c | 43 +++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 06004e258b2eff..c19cb80cbbcf7a 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -1047,6 +1047,24 @@ new_datetime_ex(int year, int month, int day, int hour, int minute,
                             tzinfo, 0, type);
 }
 
+static PyObject *
+new_datetime_ex_capi(int year, int month, int day, int hour, int minute,
+                     int second, int usecond, PyObject *tzinfo,
+                     PyTypeObject *type)
+{
+    return new_datetime_ex(year, month, day, hour, minute, second,
+                           usecond, tzinfo, type);
+}
+
+static PyObject *
+new_datetime_ex2_capi(int year, int month, int day, int hour, int minute,
+                      int second, int usecond, PyObject *tzinfo, int fold,
+                      PyTypeObject *type)
+{
+    return new_datetime_ex2(year, month, day, hour, minute, second,
+                            usecond, tzinfo, fold, type);
+}
+
 #define new_datetime(y, m, d, hh, mm, ss, us, tzinfo, fold) \
     new_datetime_ex2(y, m, d, hh, mm, ss, us, tzinfo, fold, \
                     &PyDateTime_DateTimeType)
@@ -1145,12 +1163,19 @@ new_time_ex2(int hour, int minute, int second, int usecond,
 }
 
 static PyObject *
-new_time_ex(int hour, int minute, int second, int usecond,
+new_time_ex_capi(int hour, int minute, int second, int usecond,
             PyObject *tzinfo, PyTypeObject *type)
 {
     return new_time_ex2(hour, minute, second, usecond, tzinfo, 0, type);
 }
 
+static PyObject *
+new_time_ex2_capi(int hour, int minute, int second, int usecond,
+                  PyObject *tzinfo, int fold, PyTypeObject *type)
+{
+    return new_time_ex2(hour, minute, second, usecond, tzinfo, fold, type);
+}
+
 #define new_time(hh, mm, ss, us, tzinfo, fold)                       \
     new_time_ex2(hh, mm, ss, us, tzinfo, fold, &PyDateTime_TimeType)
 
@@ -1263,6 +1288,12 @@ new_timezone(PyObject *offset, PyObject *name)
     return create_timezone(offset, name);
 }
 
+static PyObject *
+new_timezone_capi(PyObject *offset, PyObject *name)
+{
+    return new_timezone(offset, name);
+}
+
 /* ---------------------------------------------------------------------------
  * tzinfo helpers.
  */
@@ -6723,14 +6754,14 @@ get_datetime_capi(void)
     capi->DeltaType = &PyDateTime_DeltaType;
     capi->TZInfoType = &PyDateTime_TZInfoType;
     capi->Date_FromDate = new_date_ex;
-    capi->DateTime_FromDateAndTime = new_datetime_ex;
-    capi->Time_FromTime = new_time_ex;
+    capi->DateTime_FromDateAndTime = new_datetime_ex_capi;
+    capi->Time_FromTime = new_time_ex_capi;
     capi->Delta_FromDelta = new_delta_ex;
-    capi->TimeZone_FromTimeZone = new_timezone;
+    capi->TimeZone_FromTimeZone = new_timezone_capi;
     capi->DateTime_FromTimestamp = datetime_fromtimestamp;
     capi->Date_FromTimestamp = datetime_date_fromtimestamp_capi;
-    capi->DateTime_FromDateAndTimeAndFold = new_datetime_ex2;
-    capi->Time_FromTimeAndFold = new_time_ex2;
+    capi->DateTime_FromDateAndTimeAndFold = new_datetime_ex2_capi;
+    capi->Time_FromTimeAndFold = new_time_ex2_capi;
     // Make sure this function is called after utc has
     // been initialized.
     datetime_state *st = STATIC_STATE();

From aa573b5d46188da0bc6f55b52819e1adc3cd5c08 Mon Sep 17 00:00:00 2001
From: neonene <53406459+neonene@users.noreply.github.com>
Date: Sat, 20 Apr 2024 21:38:53 +0900
Subject: [PATCH 2/8] remove _ex _ex2 suffixes from capi funcs

---
 Modules/_datetimemodule.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index c19cb80cbbcf7a..428e531b2c17dd 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -1048,7 +1048,7 @@ new_datetime_ex(int year, int month, int day, int hour, int minute,
 }
 
 static PyObject *
-new_datetime_ex_capi(int year, int month, int day, int hour, int minute,
+new_datetime_capi(int year, int month, int day, int hour, int minute,
                      int second, int usecond, PyObject *tzinfo,
                      PyTypeObject *type)
 {
@@ -1057,7 +1057,7 @@ new_datetime_ex_capi(int year, int month, int day, int hour, int minute,
 }
 
 static PyObject *
-new_datetime_ex2_capi(int year, int month, int day, int hour, int minute,
+new_datetime_fold_capi(int year, int month, int day, int hour, int minute,
                       int second, int usecond, PyObject *tzinfo, int fold,
                       PyTypeObject *type)
 {
@@ -1163,15 +1163,15 @@ new_time_ex2(int hour, int minute, int second, int usecond,
 }
 
 static PyObject *
-new_time_ex_capi(int hour, int minute, int second, int usecond,
-            PyObject *tzinfo, PyTypeObject *type)
+new_time_capi(int hour, int minute, int second, int usecond,
+              PyObject *tzinfo, PyTypeObject *type)
 {
     return new_time_ex2(hour, minute, second, usecond, tzinfo, 0, type);
 }
 
 static PyObject *
-new_time_ex2_capi(int hour, int minute, int second, int usecond,
-                  PyObject *tzinfo, int fold, PyTypeObject *type)
+new_time_fold_capi(int hour, int minute, int second, int usecond,
+                   PyObject *tzinfo, int fold, PyTypeObject *type)
 {
     return new_time_ex2(hour, minute, second, usecond, tzinfo, fold, type);
 }
@@ -6754,14 +6754,14 @@ get_datetime_capi(void)
     capi->DeltaType = &PyDateTime_DeltaType;
     capi->TZInfoType = &PyDateTime_TZInfoType;
     capi->Date_FromDate = new_date_ex;
-    capi->DateTime_FromDateAndTime = new_datetime_ex_capi;
-    capi->Time_FromTime = new_time_ex_capi;
+    capi->DateTime_FromDateAndTime = new_datetime_capi;
+    capi->Time_FromTime = new_time_capi;
     capi->Delta_FromDelta = new_delta_ex;
     capi->TimeZone_FromTimeZone = new_timezone_capi;
     capi->DateTime_FromTimestamp = datetime_fromtimestamp;
     capi->Date_FromTimestamp = datetime_date_fromtimestamp_capi;
-    capi->DateTime_FromDateAndTimeAndFold = new_datetime_ex2_capi;
-    capi->Time_FromTimeAndFold = new_time_ex2_capi;
+    capi->DateTime_FromDateAndTimeAndFold = new_datetime_fold_capi;
+    capi->Time_FromTimeAndFold = new_time_fold_capi;
     // Make sure this function is called after utc has
     // been initialized.
     datetime_state *st = STATIC_STATE();

From 6df6610a28f1a0affef5db74b5bfb57c6c010008 Mon Sep 17 00:00:00 2001
From: neonene <53406459+neonene@users.noreply.github.com>
Date: Sat, 20 Apr 2024 21:46:07 +0900
Subject: [PATCH 3/8] nit

---
 Modules/_datetimemodule.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 428e531b2c17dd..83baaff24e53c0 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -1049,8 +1049,8 @@ new_datetime_ex(int year, int month, int day, int hour, int minute,
 
 static PyObject *
 new_datetime_capi(int year, int month, int day, int hour, int minute,
-                     int second, int usecond, PyObject *tzinfo,
-                     PyTypeObject *type)
+                  int second, int usecond, PyObject *tzinfo,
+                  PyTypeObject *type)
 {
     return new_datetime_ex(year, month, day, hour, minute, second,
                            usecond, tzinfo, type);
@@ -1058,8 +1058,8 @@ new_datetime_capi(int year, int month, int day, int hour, int minute,
 
 static PyObject *
 new_datetime_fold_capi(int year, int month, int day, int hour, int minute,
-                      int second, int usecond, PyObject *tzinfo, int fold,
-                      PyTypeObject *type)
+                       int second, int usecond, PyObject *tzinfo, int fold,
+                       PyTypeObject *type)
 {
     return new_datetime_ex2(year, month, day, hour, minute, second,
                             usecond, tzinfo, fold, type);

From ba6084451719d6ae0e4387a688e1fd012593b1fa Mon Sep 17 00:00:00 2001
From: neonene <53406459+neonene@users.noreply.github.com>
Date: Sun, 21 Apr 2024 00:59:22 +0900
Subject: [PATCH 4/8] wrap more functions

---
 Modules/_datetimemodule.c | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 83baaff24e53c0..5a10c1a6a8655f 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -981,6 +981,12 @@ new_date_ex(int year, int month, int day, PyTypeObject *type)
 #define new_date(year, month, day) \
     new_date_ex(year, month, day, &PyDateTime_DateType)
 
+static PyObject *
+new_date_capi(int year, int month, int day, PyTypeObject *type)
+{
+    return new_date_ex(year, month, day, type);
+}
+
 // Forward declaration
 static PyObject *
 new_datetime_ex(int, int, int, int, int, int, int, PyObject *, PyTypeObject *);
@@ -1176,7 +1182,7 @@ new_time_fold_capi(int hour, int minute, int second, int usecond,
     return new_time_ex2(hour, minute, second, usecond, tzinfo, fold, type);
 }
 
-#define new_time(hh, mm, ss, us, tzinfo, fold)                       \
+#define new_time(hh, mm, ss, us, tzinfo, fold)  \
     new_time_ex2(hh, mm, ss, us, tzinfo, fold, &PyDateTime_TimeType)
 
 static PyObject *
@@ -1230,6 +1236,13 @@ new_delta_ex(int days, int seconds, int microseconds, int normalize,
 #define new_delta(d, s, us, normalize)  \
     new_delta_ex(d, s, us, normalize, &PyDateTime_DeltaType)
 
+static PyObject *
+new_delta_capi(int days, int seconds, int microseconds, int normalize,
+               PyTypeObject *type)
+{
+    return new_delta_ex(days, seconds, microseconds, normalize, type);
+}
+
 
 typedef struct
 {
@@ -5266,6 +5279,12 @@ datetime_fromtimestamp(PyObject *cls, PyObject *args, PyObject *kw)
     return self;
 }
 
+static PyObject *
+datetime_fromtimestamp_capi(PyObject *cls, PyObject *args, PyObject *kw)
+{
+    return datetime_fromtimestamp(cls, args, kw);
+}
+
 /* Return new UTC datetime from timestamp (Python timestamp -- a double). */
 static PyObject *
 datetime_utcfromtimestamp(PyObject *cls, PyObject *args)
@@ -6753,12 +6772,12 @@ get_datetime_capi(void)
     capi->TimeType = &PyDateTime_TimeType;
     capi->DeltaType = &PyDateTime_DeltaType;
     capi->TZInfoType = &PyDateTime_TZInfoType;
-    capi->Date_FromDate = new_date_ex;
+    capi->Date_FromDate = new_date_capi;
     capi->DateTime_FromDateAndTime = new_datetime_capi;
     capi->Time_FromTime = new_time_capi;
-    capi->Delta_FromDelta = new_delta_ex;
+    capi->Delta_FromDelta = new_delta_capi;
     capi->TimeZone_FromTimeZone = new_timezone_capi;
-    capi->DateTime_FromTimestamp = datetime_fromtimestamp;
+    capi->DateTime_FromTimestamp = datetime_fromtimestamp_capi;
     capi->Date_FromTimestamp = datetime_date_fromtimestamp_capi;
     capi->DateTime_FromDateAndTimeAndFold = new_datetime_fold_capi;
     capi->Time_FromTimeAndFold = new_time_fold_capi;

From a426e8f7234b8176084cb0f65a326b2b1d685251 Mon Sep 17 00:00:00 2001
From: neonene <53406459+neonene@users.noreply.github.com>
Date: Sun, 21 Apr 2024 18:43:58 +0900
Subject: [PATCH 5/8] reconsider capi name

---
 Modules/_datetimemodule.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 5a10c1a6a8655f..1e80ac2704b0fc 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -1054,16 +1054,16 @@ new_datetime_ex(int year, int month, int day, int hour, int minute,
 }
 
 static PyObject *
-new_datetime_capi(int year, int month, int day, int hour, int minute,
-                  int second, int usecond, PyObject *tzinfo,
-                  PyTypeObject *type)
+new_datetime_nofold_capi(int year, int month, int day, int hour, int minute,
+                         int second, int usecond, PyObject *tzinfo,
+                         PyTypeObject *type)
 {
     return new_datetime_ex(year, month, day, hour, minute, second,
                            usecond, tzinfo, type);
 }
 
 static PyObject *
-new_datetime_fold_capi(int year, int month, int day, int hour, int minute,
+new_datetime_capi(int year, int month, int day, int hour, int minute,
                        int second, int usecond, PyObject *tzinfo, int fold,
                        PyTypeObject *type)
 {
@@ -1169,15 +1169,15 @@ new_time_ex2(int hour, int minute, int second, int usecond,
 }
 
 static PyObject *
-new_time_capi(int hour, int minute, int second, int usecond,
-              PyObject *tzinfo, PyTypeObject *type)
+new_time_nofold_capi(int hour, int minute, int second, int usecond,
+                     PyObject *tzinfo, PyTypeObject *type)
 {
     return new_time_ex2(hour, minute, second, usecond, tzinfo, 0, type);
 }
 
 static PyObject *
-new_time_fold_capi(int hour, int minute, int second, int usecond,
-                   PyObject *tzinfo, int fold, PyTypeObject *type)
+new_time_capi(int hour, int minute, int second, int usecond,
+              PyObject *tzinfo, int fold, PyTypeObject *type)
 {
     return new_time_ex2(hour, minute, second, usecond, tzinfo, fold, type);
 }
@@ -6773,14 +6773,14 @@ get_datetime_capi(void)
     capi->DeltaType = &PyDateTime_DeltaType;
     capi->TZInfoType = &PyDateTime_TZInfoType;
     capi->Date_FromDate = new_date_capi;
-    capi->DateTime_FromDateAndTime = new_datetime_capi;
-    capi->Time_FromTime = new_time_capi;
+    capi->DateTime_FromDateAndTime = new_datetime_nofold_capi;
+    capi->Time_FromTime = new_time_nofold_capi;
     capi->Delta_FromDelta = new_delta_capi;
     capi->TimeZone_FromTimeZone = new_timezone_capi;
     capi->DateTime_FromTimestamp = datetime_fromtimestamp_capi;
     capi->Date_FromTimestamp = datetime_date_fromtimestamp_capi;
-    capi->DateTime_FromDateAndTimeAndFold = new_datetime_fold_capi;
-    capi->Time_FromTimeAndFold = new_time_fold_capi;
+    capi->DateTime_FromDateAndTimeAndFold = new_datetime_capi;
+    capi->Time_FromTimeAndFold = new_time_capi;
     // Make sure this function is called after utc has
     // been initialized.
     datetime_state *st = STATIC_STATE();

From 87408a98ce834a7cf364a24d3ab41778250343d9 Mon Sep 17 00:00:00 2001
From: neonene <53406459+neonene@users.noreply.github.com>
Date: Sun, 21 Apr 2024 19:33:29 +0900
Subject: [PATCH 6/8] rename internal _ex _ex2 functions except reduce()

---
 Modules/_datetimemodule.c | 283 +++++++++++++++++++++-----------------
 1 file changed, 153 insertions(+), 130 deletions(-)

diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 1e80ac2704b0fc..79b55e88d37138 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -963,8 +963,8 @@ parse_isoformat_time(const char *dtstr, size_t dtlen, int *hour, int *minute,
  */
 
 /* Create a date instance with no range checking. */
-static PyObject *
-new_date_ex(int year, int month, int day, PyTypeObject *type)
+static inline PyObject *
+_new_date(int year, int month, int day, PyTypeObject *type)
 {
     PyDateTime_Date *self;
 
@@ -978,31 +978,34 @@ new_date_ex(int year, int month, int day, PyTypeObject *type)
     return (PyObject *)self;
 }
 
-#define new_date(year, month, day) \
-    new_date_ex(year, month, day, &PyDateTime_DateType)
+static inline PyObject *
+new_date(int year, int month, int day)
+{
+    return _new_date(year, month, day, &PyDateTime_DateType);
+}
 
 static PyObject *
 new_date_capi(int year, int month, int day, PyTypeObject *type)
 {
-    return new_date_ex(year, month, day, type);
+    return _new_date(year, month, day, type);
 }
 
 // Forward declaration
-static PyObject *
-new_datetime_ex(int, int, int, int, int, int, int, PyObject *, PyTypeObject *);
+static inline PyObject *
+new_datetime_nofold(int, int, int, int, int, int, int, PyObject *, PyTypeObject *);
 
 /* Create date instance with no range checking, or call subclass constructor */
-static PyObject *
-new_date_subclass_ex(int year, int month, int day, PyObject *cls)
+static inline PyObject *
+new_date_subclass(int year, int month, int day, PyObject *cls)
 {
     PyObject *result;
     // We have "fast path" constructors for two subclasses: date and datetime
     if ((PyTypeObject *)cls == &PyDateTime_DateType) {
-        result = new_date_ex(year, month, day, (PyTypeObject *)cls);
+        result = _new_date(year, month, day, (PyTypeObject *)cls);
     }
     else if ((PyTypeObject *)cls == &PyDateTime_DateTimeType) {
-        result = new_datetime_ex(year, month, day, 0, 0, 0, 0, Py_None,
-                                 (PyTypeObject *)cls);
+        result = new_datetime_nofold(year, month, day, 0, 0, 0, 0, Py_None,
+                                     (PyTypeObject *)cls);
     }
     else {
         result = PyObject_CallFunction(cls, "iii", year, month, day);
@@ -1012,8 +1015,8 @@ new_date_subclass_ex(int year, int month, int day, PyObject *cls)
 }
 
 /* Create a datetime instance with no range checking. */
-static PyObject *
-new_datetime_ex2(int year, int month, int day, int hour, int minute,
+static inline PyObject *
+_new_datetime(int year, int month, int day, int hour, int minute,
                  int second, int usecond, PyObject *tzinfo, int fold, PyTypeObject *type)
 {
     PyDateTime_DateTime *self;
@@ -1045,12 +1048,13 @@ new_datetime_ex2(int year, int month, int day, int hour, int minute,
     return (PyObject *)self;
 }
 
-static PyObject *
-new_datetime_ex(int year, int month, int day, int hour, int minute,
-                int second, int usecond, PyObject *tzinfo, PyTypeObject *type)
+static inline PyObject *
+new_datetime_nofold(int year, int month, int day, int hour, int minute,
+                    int second, int usecond, PyObject *tzinfo,
+                    PyTypeObject *type)
 {
-    return new_datetime_ex2(year, month, day, hour, minute, second, usecond,
-                            tzinfo, 0, type);
+    return _new_datetime(year, month, day, hour, minute, second,
+                         usecond, tzinfo, 0, type);
 }
 
 static PyObject *
@@ -1058,8 +1062,8 @@ new_datetime_nofold_capi(int year, int month, int day, int hour, int minute,
                          int second, int usecond, PyObject *tzinfo,
                          PyTypeObject *type)
 {
-    return new_datetime_ex(year, month, day, hour, minute, second,
-                           usecond, tzinfo, type);
+    return new_datetime_nofold(year, month, day, hour, minute, second,
+                               usecond, tzinfo, type);
 }
 
 static PyObject *
@@ -1067,13 +1071,17 @@ new_datetime_capi(int year, int month, int day, int hour, int minute,
                        int second, int usecond, PyObject *tzinfo, int fold,
                        PyTypeObject *type)
 {
-    return new_datetime_ex2(year, month, day, hour, minute, second,
-                            usecond, tzinfo, fold, type);
+    return _new_datetime(year, month, day, hour, minute, second,
+                         usecond, tzinfo, fold, type);
 }
 
-#define new_datetime(y, m, d, hh, mm, ss, us, tzinfo, fold) \
-    new_datetime_ex2(y, m, d, hh, mm, ss, us, tzinfo, fold, \
-                    &PyDateTime_DateTimeType)
+static inline PyObject *
+new_datetime(int year, int month, int day, int hour, int minute,
+             int second, int usecond, PyObject *tzinfo, int fold)
+{
+    return _new_datetime(year, month, day, hour, minute, second,
+                         usecond, tzinfo, fold, &PyDateTime_DateTimeType);
+}
 
 static PyObject *
 call_subclass_fold(PyObject *cls, int fold, const char *format, ...)
@@ -1109,10 +1117,11 @@ call_subclass_fold(PyObject *cls, int fold, const char *format, ...)
     return res;
 }
 
-static PyObject *
-new_datetime_subclass_fold_ex(int year, int month, int day, int hour, int minute,
-                              int second, int usecond, PyObject *tzinfo,
-                              int fold, PyObject *cls) {
+static inline PyObject *
+new_datetime_subclass(int year, int month, int day, int hour, int minute,
+                      int second, int usecond, PyObject *tzinfo,
+                      int fold, PyObject *cls)
+{
     PyObject* dt;
     if ((PyTypeObject*)cls == &PyDateTime_DateTimeType) {
         // Use the fast path constructor
@@ -1128,19 +1137,20 @@ new_datetime_subclass_fold_ex(int year, int month, int day, int hour, int minute
     return dt;
 }
 
-static PyObject *
-new_datetime_subclass_ex(int year, int month, int day, int hour, int minute,
-                              int second, int usecond, PyObject *tzinfo,
-                              PyObject *cls) {
-    return new_datetime_subclass_fold_ex(year, month, day, hour, minute,
-                                         second, usecond, tzinfo, 0,
-                                         cls);
+static inline PyObject *
+new_datetime_subclass_nofold(int year, int month, int day,
+                             int hour, int minute, int second, int usecond,
+                             PyObject *tzinfo, PyObject *cls)
+{
+    return new_datetime_subclass(year, month, day, hour, minute,
+                                 second, usecond, tzinfo, 0,
+                                 cls);
 }
 
 /* Create a time instance with no range checking. */
-static PyObject *
-new_time_ex2(int hour, int minute, int second, int usecond,
-             PyObject *tzinfo, int fold, PyTypeObject *type)
+static inline PyObject *
+_new_time(int hour, int minute, int second, int usecond,
+          PyObject *tzinfo, int fold, PyTypeObject *type)
 {
     PyDateTime_Time *self;
     char aware = tzinfo != Py_None;
@@ -1172,22 +1182,27 @@ static PyObject *
 new_time_nofold_capi(int hour, int minute, int second, int usecond,
                      PyObject *tzinfo, PyTypeObject *type)
 {
-    return new_time_ex2(hour, minute, second, usecond, tzinfo, 0, type);
+    return _new_time(hour, minute, second, usecond, tzinfo, 0, type);
 }
 
 static PyObject *
 new_time_capi(int hour, int minute, int second, int usecond,
               PyObject *tzinfo, int fold, PyTypeObject *type)
 {
-    return new_time_ex2(hour, minute, second, usecond, tzinfo, fold, type);
+    return _new_time(hour, minute, second, usecond, tzinfo, fold, type);
 }
 
-#define new_time(hh, mm, ss, us, tzinfo, fold)  \
-    new_time_ex2(hh, mm, ss, us, tzinfo, fold, &PyDateTime_TimeType)
+static inline PyObject *
+new_time(int hour, int minute, int second, int usecond,
+         PyObject *tzinfo, int fold)
+{
+    return _new_time(hour, minute, second, usecond, tzinfo, fold,
+                     &PyDateTime_TimeType);
+}
 
-static PyObject *
-new_time_subclass_fold_ex(int hour, int minute, int second, int usecond,
-                          PyObject *tzinfo, int fold, PyObject *cls)
+static inline PyObject *
+new_time_subclass(int hour, int minute, int second, int usecond,
+                  PyObject *tzinfo, int fold, PyObject *cls)
 {
     PyObject *t;
     if ((PyTypeObject*)cls == &PyDateTime_TimeType) {
@@ -1209,9 +1224,9 @@ new_time_subclass_fold_ex(int hour, int minute, int second, int usecond,
  * case, raises OverflowError and returns NULL if the normalized days is out
  * of range.
  */
-static PyObject *
-new_delta_ex(int days, int seconds, int microseconds, int normalize,
-             PyTypeObject *type)
+static inline PyObject *
+_new_delta(int days, int seconds, int microseconds, int normalize,
+           PyTypeObject *type)
 {
     PyDateTime_Delta *self;
 
@@ -1233,14 +1248,18 @@ new_delta_ex(int days, int seconds, int microseconds, int normalize,
     return (PyObject *) self;
 }
 
-#define new_delta(d, s, us, normalize)  \
-    new_delta_ex(d, s, us, normalize, &PyDateTime_DeltaType)
+static inline PyObject *
+new_delta(int days, int seconds, int microseconds, int normalize)
+{
+    return _new_delta(days, seconds, microseconds, normalize,
+                      &PyDateTime_DeltaType);
+}
 
 static PyObject *
 new_delta_capi(int days, int seconds, int microseconds, int normalize,
                PyTypeObject *type)
 {
-    return new_delta_ex(days, seconds, microseconds, normalize, type);
+    return _new_delta(days, seconds, microseconds, normalize, type);
 }
 
 
@@ -1999,8 +2018,8 @@ checked_divmod(PyObject *a, PyObject *b)
 
 /* Convert a number of us (as a Python int) to a timedelta.
  */
-static PyObject *
-microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type)
+static inline PyObject *
+_microseconds_to_delta(PyObject *pyus, PyTypeObject *type)
 {
     int us;
     int s;
@@ -2049,7 +2068,7 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type)
     if (d == -1 && PyErr_Occurred()) {
         goto Done;
     }
-    result = new_delta_ex(d, s, us, 0, type);
+    result = _new_delta(d, s, us, 0, type);
 
 Done:
     Py_XDECREF(tuple);
@@ -2062,8 +2081,11 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type)
     goto Done;
 }
 
-#define microseconds_to_delta(pymicros) \
-    microseconds_to_delta_ex(pymicros, &PyDateTime_DeltaType)
+static inline PyObject *
+microseconds_to_delta(PyObject *pymicros)
+{
+    return _microseconds_to_delta(pymicros, &PyDateTime_DeltaType);
+}
 
 static PyObject *
 multiply_int_timedelta(PyObject *intobj, PyDateTime_Delta *delta)
@@ -2691,7 +2713,7 @@ delta_new(PyTypeObject *type, PyObject *args, PyObject *kw)
         CLEANUP;
     }
 
-    self = microseconds_to_delta_ex(x, type);
+    self = _microseconds_to_delta(x, type);
     Py_DECREF(x);
 Done:
     return self;
@@ -3020,7 +3042,7 @@ date_new(PyTypeObject *type, PyObject *args, PyObject *kw)
 
     if (PyArg_ParseTupleAndKeywords(args, kw, "iii", date_kws,
                                     &year, &month, &day)) {
-        self = new_date_ex(year, month, day, type);
+        self = _new_date(year, month, day, type);
     }
     return self;
 }
@@ -3037,10 +3059,10 @@ date_fromtimestamp(PyObject *cls, PyObject *obj)
     if (_PyTime_localtime(t, &tm) != 0)
         return NULL;
 
-    return new_date_subclass_ex(tm.tm_year + 1900,
-                                tm.tm_mon + 1,
-                                tm.tm_mday,
-                                cls);
+    return new_date_subclass(tm.tm_year + 1900,
+                             tm.tm_mon + 1,
+                             tm.tm_mday,
+                             cls);
 }
 
 /* Return new date from current time.
@@ -3124,7 +3146,7 @@ date_fromordinal(PyObject *cls, PyObject *args)
                                               ">= 1");
         else {
             ord_to_ymd(ordinal, &year, &month, &day);
-            result = new_date_subclass_ex(year, month, day, cls);
+            result = new_date_subclass(year, month, day, cls);
         }
     }
     return result;
@@ -3163,7 +3185,7 @@ date_fromisoformat(PyObject *cls, PyObject *dtstr)
         goto invalid_string_error;
     }
 
-    return new_date_subclass_ex(year, month, day, cls);
+    return new_date_subclass(year, month, day, cls);
 
 invalid_string_error:
     PyErr_Format(PyExc_ValueError, "Invalid isoformat string: %R", dtstr);
@@ -3209,7 +3231,7 @@ date_fromisocalendar(PyObject *cls, PyObject *args, PyObject *kw)
         return NULL;
     }
 
-    return new_date_subclass_ex(year, month, day, cls);
+    return new_date_subclass(year, month, day, cls);
 }
 
 
@@ -3231,8 +3253,8 @@ add_date_timedelta(PyDateTime_Date *date, PyDateTime_Delta *delta, int negate)
     int day = GET_DAY(date) + (negate ? -deltadays : deltadays);
 
     if (normalize_date(&year, &month, &day) >= 0)
-        result = new_date_subclass_ex(year, month, day,
-                                      (PyObject* )Py_TYPE(date));
+        result = new_date_subclass(year, month, day,
+                                   (PyObject* )Py_TYPE(date));
     return result;
 }
 
@@ -3574,7 +3596,7 @@ datetime_date_replace_impl(PyDateTime_Date *self, int year, int month,
                            int day)
 /*[clinic end generated code: output=2a9430d1e6318aeb input=0d1f02685b3e90f6]*/
 {
-    return new_date_subclass_ex(year, month, day, (PyObject *)Py_TYPE(self));
+    return new_date_subclass(year, month, day, (PyObject *)Py_TYPE(self));
 }
 
 static Py_hash_t
@@ -4363,8 +4385,7 @@ time_new(PyTypeObject *type, PyObject *args, PyObject *kw)
     if (PyArg_ParseTupleAndKeywords(args, kw, "|iiiiO$i", time_kws,
                                     &hour, &minute, &second, &usecond,
                                     &tzinfo, &fold)) {
-        self = new_time_ex2(hour, minute, second, usecond, tzinfo, fold,
-                            type);
+        self = _new_time(hour, minute, second, usecond, tzinfo, fold, type);
     }
     return self;
 }
@@ -4615,12 +4636,12 @@ time_hash(PyDateTime_Time *self)
     if (self->hashcode == -1) {
         PyObject *offset, *self0;
         if (TIME_GET_FOLD(self)) {
-            self0 = new_time_ex2(TIME_GET_HOUR(self),
-                                 TIME_GET_MINUTE(self),
-                                 TIME_GET_SECOND(self),
-                                 TIME_GET_MICROSECOND(self),
-                                 HASTZINFO(self) ? self->tzinfo : Py_None,
-                                 0, Py_TYPE(self));
+            self0 = _new_time(TIME_GET_HOUR(self),
+                              TIME_GET_MINUTE(self),
+                              TIME_GET_SECOND(self),
+                              TIME_GET_MICROSECOND(self),
+                              HASTZINFO(self) ? self->tzinfo : Py_None,
+                              0, Py_TYPE(self));
             if (self0 == NULL)
                 return -1;
         }
@@ -4684,8 +4705,8 @@ datetime_time_replace_impl(PyDateTime_Time *self, int hour, int minute,
                            int fold)
 /*[clinic end generated code: output=0b89a44c299e4f80 input=9b6a35b1e704b0ca]*/
 {
-    return new_time_subclass_fold_ex(hour, minute, second, microsecond, tzinfo,
-                                     fold, (PyObject *)Py_TYPE(self));
+    return new_time_subclass(hour, minute, second, microsecond, tzinfo,
+                             fold, (PyObject *)Py_TYPE(self));
 }
 
 static PyObject *
@@ -5029,9 +5050,9 @@ datetime_new(PyTypeObject *type, PyObject *args, PyObject *kw)
     if (PyArg_ParseTupleAndKeywords(args, kw, "iii|iiiiO$i", datetime_kws,
                                     &year, &month, &day, &hour, &minute,
                                     &second, &usecond, &tzinfo, &fold)) {
-        self = new_datetime_ex2(year, month, day,
-                                hour, minute, second, usecond,
-                                tzinfo, fold, type);
+        self = _new_datetime(year, month, day,
+                             hour, minute, second, usecond,
+                             tzinfo, fold, type);
     }
     return self;
 }
@@ -5149,8 +5170,8 @@ datetime_from_timet_and_us(PyObject *cls, TM_FUNC f, time_t timet, int us,
                 fold = 1;
         }
     }
-    return new_datetime_subclass_fold_ex(year, month, day, hour, minute,
-                                         second, us, tzinfo, fold, cls);
+    return new_datetime_subclass(year, month, day, hour, minute,
+                                 second, us, tzinfo, fold, cls);
 }
 
 /* Internal helper.
@@ -5343,16 +5364,16 @@ datetime_combine(PyObject *cls, PyObject *args, PyObject *kw)
             else
                 tzinfo = Py_None;
         }
-        result = new_datetime_subclass_fold_ex(GET_YEAR(date),
-                                               GET_MONTH(date),
-                                               GET_DAY(date),
-                                               TIME_GET_HOUR(time),
-                                               TIME_GET_MINUTE(time),
-                                               TIME_GET_SECOND(time),
-                                               TIME_GET_MICROSECOND(time),
-                                               tzinfo,
-                                               TIME_GET_FOLD(time),
-                                               cls);
+        result = new_datetime_subclass(GET_YEAR(date),
+                                       GET_MONTH(date),
+                                       GET_DAY(date),
+                                       TIME_GET_HOUR(time),
+                                       TIME_GET_MINUTE(time),
+                                       TIME_GET_SECOND(time),
+                                       TIME_GET_MICROSECOND(time),
+                                       tzinfo,
+                                       TIME_GET_FOLD(time),
+                                       cls);
     }
     return result;
 }
@@ -5592,7 +5613,8 @@ datetime_fromisoformat(PyObject *cls, PyObject *dtstr)
         goto error;
     }
 
-    PyObject *dt = new_datetime_subclass_ex(year, month, day, hour, minute,
+    PyObject *dt = new_datetime_subclass_nofold(
+    	                                    year, month, day, hour, minute,
                                             second, microsecond, tzinfo, cls);
 
     Py_DECREF(tzinfo);
@@ -5670,7 +5692,8 @@ add_datetime_timedelta(PyDateTime_DateTime *date, PyDateTime_Delta *delta,
         return NULL;
     }
 
-    return new_datetime_subclass_ex(year, month, day,
+    return new_datetime_subclass_nofold(
+                                    year, month, day,
                                     hour, minute, second, microsecond,
                                     HASTZINFO(date) ? date->tzinfo : Py_None,
                                     (PyObject *)Py_TYPE(date));
@@ -5916,17 +5939,17 @@ datetime_ctime(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored))
 static PyObject *
 flip_fold(PyObject *dt)
 {
-    return new_datetime_ex2(GET_YEAR(dt),
-                            GET_MONTH(dt),
-                            GET_DAY(dt),
-                            DATE_GET_HOUR(dt),
-                            DATE_GET_MINUTE(dt),
-                            DATE_GET_SECOND(dt),
-                            DATE_GET_MICROSECOND(dt),
-                            HASTZINFO(dt) ?
-                             ((PyDateTime_DateTime *)dt)->tzinfo : Py_None,
-                            !DATE_GET_FOLD(dt),
-                            Py_TYPE(dt));
+    return _new_datetime(GET_YEAR(dt),
+                         GET_MONTH(dt),
+                         GET_DAY(dt),
+                         DATE_GET_HOUR(dt),
+                         DATE_GET_MINUTE(dt),
+                         DATE_GET_SECOND(dt),
+                         DATE_GET_MICROSECOND(dt),
+                         HASTZINFO(dt) ?
+                          ((PyDateTime_DateTime *)dt)->tzinfo : Py_None,
+                         !DATE_GET_FOLD(dt),
+                         Py_TYPE(dt));
 }
 
 static PyObject *
@@ -6064,15 +6087,15 @@ datetime_hash(PyDateTime_DateTime *self)
     if (self->hashcode == -1) {
         PyObject *offset, *self0;
         if (DATE_GET_FOLD(self)) {
-            self0 = new_datetime_ex2(GET_YEAR(self),
-                                     GET_MONTH(self),
-                                     GET_DAY(self),
-                                     DATE_GET_HOUR(self),
-                                     DATE_GET_MINUTE(self),
-                                     DATE_GET_SECOND(self),
-                                     DATE_GET_MICROSECOND(self),
-                                     HASTZINFO(self) ? self->tzinfo : Py_None,
-                                     0, Py_TYPE(self));
+            self0 = _new_datetime(GET_YEAR(self),
+                                  GET_MONTH(self),
+                                  GET_DAY(self),
+                                  DATE_GET_HOUR(self),
+                                  DATE_GET_MINUTE(self),
+                                  DATE_GET_SECOND(self),
+                                  DATE_GET_MICROSECOND(self),
+                                  HASTZINFO(self) ? self->tzinfo : Py_None,
+                                  0, Py_TYPE(self));
             if (self0 == NULL)
                 return -1;
         }
@@ -6145,9 +6168,9 @@ datetime_datetime_replace_impl(PyDateTime_DateTime *self, int year,
                                int fold)
 /*[clinic end generated code: output=00bc96536833fddb input=9b38253d56d9bcad]*/
 {
-    return new_datetime_subclass_fold_ex(year, month, day, hour, minute,
-                                         second, microsecond, tzinfo, fold,
-                                         (PyObject *)Py_TYPE(self));
+    return new_datetime_subclass(year, month, day, hour, minute,
+                                 second, microsecond, tzinfo, fold,
+                                 (PyObject *)Py_TYPE(self));
 }
 
 static PyObject *
@@ -6338,16 +6361,16 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw)
     if (!HASTZINFO(result)) {
         temp = (PyObject *)result;
         result = (PyDateTime_DateTime *)
-                   new_datetime_ex2(GET_YEAR(result),
-                                    GET_MONTH(result),
-                                    GET_DAY(result),
-                                    DATE_GET_HOUR(result),
-                                    DATE_GET_MINUTE(result),
-                                    DATE_GET_SECOND(result),
-                                    DATE_GET_MICROSECOND(result),
-                                    st->utc,
-                                    DATE_GET_FOLD(result),
-                                    Py_TYPE(result));
+                   _new_datetime(GET_YEAR(result),
+                                 GET_MONTH(result),
+                                 GET_DAY(result),
+                                 DATE_GET_HOUR(result),
+                                 DATE_GET_MINUTE(result),
+                                 DATE_GET_SECOND(result),
+                                 DATE_GET_MICROSECOND(result),
+                                 st->utc,
+                                 DATE_GET_FOLD(result),
+                                 Py_TYPE(result));
         Py_DECREF(temp);
         if (result == NULL)
             return NULL;

From 987ba373e99adb7419ac646e1ff7db5e4e06c984 Mon Sep 17 00:00:00 2001
From: neonene <53406459+neonene@users.noreply.github.com>
Date: Sun, 21 Apr 2024 20:18:44 +0900
Subject: [PATCH 7/8] remove new_datetime_nofold()

---
 Modules/_datetimemodule.c | 53 +++++++++++++++------------------------
 1 file changed, 20 insertions(+), 33 deletions(-)

diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 79b55e88d37138..f8665f3e72c38f 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -990,34 +990,10 @@ new_date_capi(int year, int month, int day, PyTypeObject *type)
     return _new_date(year, month, day, type);
 }
 
-// Forward declaration
-static inline PyObject *
-new_datetime_nofold(int, int, int, int, int, int, int, PyObject *, PyTypeObject *);
-
-/* Create date instance with no range checking, or call subclass constructor */
-static inline PyObject *
-new_date_subclass(int year, int month, int day, PyObject *cls)
-{
-    PyObject *result;
-    // We have "fast path" constructors for two subclasses: date and datetime
-    if ((PyTypeObject *)cls == &PyDateTime_DateType) {
-        result = _new_date(year, month, day, (PyTypeObject *)cls);
-    }
-    else if ((PyTypeObject *)cls == &PyDateTime_DateTimeType) {
-        result = new_datetime_nofold(year, month, day, 0, 0, 0, 0, Py_None,
-                                     (PyTypeObject *)cls);
-    }
-    else {
-        result = PyObject_CallFunction(cls, "iii", year, month, day);
-    }
-
-    return result;
-}
-
 /* Create a datetime instance with no range checking. */
 static inline PyObject *
-_new_datetime(int year, int month, int day, int hour, int minute,
-                 int second, int usecond, PyObject *tzinfo, int fold, PyTypeObject *type)
+_new_datetime(int year, int month, int day, int hour, int minute, int second,
+              int usecond, PyObject *tzinfo, int fold, PyTypeObject *type)
 {
     PyDateTime_DateTime *self;
     char aware = tzinfo != Py_None;
@@ -1048,13 +1024,24 @@ _new_datetime(int year, int month, int day, int hour, int minute,
     return (PyObject *)self;
 }
 
+/* Create date instance with no range checking, or call subclass constructor */
 static inline PyObject *
-new_datetime_nofold(int year, int month, int day, int hour, int minute,
-                    int second, int usecond, PyObject *tzinfo,
-                    PyTypeObject *type)
+new_date_subclass(int year, int month, int day, PyObject *cls)
 {
-    return _new_datetime(year, month, day, hour, minute, second,
-                         usecond, tzinfo, 0, type);
+    PyObject *result;
+    // We have "fast path" constructors for two subclasses: date and datetime
+    if ((PyTypeObject *)cls == &PyDateTime_DateType) {
+        result = _new_date(year, month, day, (PyTypeObject *)cls);
+    }
+    else if ((PyTypeObject *)cls == &PyDateTime_DateTimeType) {
+        result = _new_datetime(year, month, day, 0, 0, 0, 0, Py_None, 0,
+                               (PyTypeObject *)cls);
+    }
+    else {
+        result = PyObject_CallFunction(cls, "iii", year, month, day);
+    }
+
+    return result;
 }
 
 static PyObject *
@@ -1062,8 +1049,8 @@ new_datetime_nofold_capi(int year, int month, int day, int hour, int minute,
                          int second, int usecond, PyObject *tzinfo,
                          PyTypeObject *type)
 {
-    return new_datetime_nofold(year, month, day, hour, minute, second,
-                               usecond, tzinfo, type);
+    return _new_datetime(year, month, day, hour, minute, second,
+                         usecond, tzinfo, 0, type);
 }
 
 static PyObject *

From 93fb78615e3e5d4df8afe06cd6d9d9a511074187 Mon Sep 17 00:00:00 2001
From: neonene <53406459+neonene@users.noreply.github.com>
Date: Sun, 21 Apr 2024 20:29:09 +0900
Subject: [PATCH 8/8] remove new_datetime_subclass_nofold()

---
 Modules/_datetimemodule.c | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index f8665f3e72c38f..e1aec19c3274d3 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -1124,16 +1124,6 @@ new_datetime_subclass(int year, int month, int day, int hour, int minute,
     return dt;
 }
 
-static inline PyObject *
-new_datetime_subclass_nofold(int year, int month, int day,
-                             int hour, int minute, int second, int usecond,
-                             PyObject *tzinfo, PyObject *cls)
-{
-    return new_datetime_subclass(year, month, day, hour, minute,
-                                 second, usecond, tzinfo, 0,
-                                 cls);
-}
-
 /* Create a time instance with no range checking. */
 static inline PyObject *
 _new_time(int hour, int minute, int second, int usecond,
@@ -5600,9 +5590,8 @@ datetime_fromisoformat(PyObject *cls, PyObject *dtstr)
         goto error;
     }
 
-    PyObject *dt = new_datetime_subclass_nofold(
-    	                                    year, month, day, hour, minute,
-                                            second, microsecond, tzinfo, cls);
+    PyObject *dt = new_datetime_subclass(year, month, day, hour, minute,
+                                         second, microsecond, tzinfo, 0, cls);
 
     Py_DECREF(tzinfo);
     Py_DECREF(dtstr_clean);
@@ -5679,11 +5668,10 @@ add_datetime_timedelta(PyDateTime_DateTime *date, PyDateTime_Delta *delta,
         return NULL;
     }
 
-    return new_datetime_subclass_nofold(
-                                    year, month, day,
-                                    hour, minute, second, microsecond,
-                                    HASTZINFO(date) ? date->tzinfo : Py_None,
-                                    (PyObject *)Py_TYPE(date));
+    return new_datetime_subclass(year, month, day,
+                                 hour, minute, second, microsecond,
+                                 HASTZINFO(date) ? date->tzinfo : Py_None, 0,
+                                 (PyObject *)Py_TYPE(date));
 }
 
 static PyObject *