use_immortal!()

Author: ijl

src/deserialize/deserializer.rs

@@ -16,8 +16,7 @@ pub fn deserialize(
         } else if buffer == b"{}" {
             return Ok(nonnull!(ffi!(PyDict_New())));
         } else if buffer == b"\"\"" {
-            ffi!(Py_INCREF(EMPTY_UNICODE));
-            unsafe { return Ok(nonnull!(EMPTY_UNICODE)) }
+            unsafe { return Ok(nonnull!(use_immortal!(EMPTY_UNICODE))) }
         }
     }
 

src/deserialize/pyobject.rs

@@ -42,14 +42,12 @@ pub fn parse_bool(val: bool) -> NonNull<pyo3_ffi::PyObject> {
 
 #[inline(always)]
 pub fn parse_true() -> NonNull<pyo3_ffi::PyObject> {
-    ffi!(Py_INCREF(TRUE));
-    nonnull!(TRUE)
+    nonnull!(use_immortal!(TRUE))
 }
 
 #[inline(always)]
 pub fn parse_false() -> NonNull<pyo3_ffi::PyObject> {
-    ffi!(Py_INCREF(FALSE));
-    nonnull!(FALSE)
+    nonnull!(use_immortal!(FALSE))
 }
 #[inline(always)]
 pub fn parse_i64(val: i64) -> NonNull<pyo3_ffi::PyObject> {
@@ -68,6 +66,5 @@ pub fn parse_f64(val: f64) -> NonNull<pyo3_ffi::PyObject> {
 
 #[inline(always)]
 pub fn parse_none() -> NonNull<pyo3_ffi::PyObject> {
-    ffi!(Py_INCREF(NONE));
-    nonnull!(NONE)
+    nonnull!(use_immortal!(NONE))
 }

src/lib.rs

@@ -206,8 +206,7 @@ fn raise_loads_exception(err: deserialize::DeserializeError) -> *mut PyObject {
             PyUnicode_FromStringAndSize(as_str.as_ptr() as *const c_char, as_str.len() as isize)
         },
         None => {
-            ffi!(Py_INCREF(crate::typeref::EMPTY_UNICODE));
-            unsafe { crate::typeref::EMPTY_UNICODE }
+            use_immortal!(crate::typeref::EMPTY_UNICODE)
         }
     };
     unsafe {

src/str/create.rs

@@ -26,8 +26,7 @@ fn find_str_kind(buf: &str, num_chars: usize) -> PyUnicodeKind {
 
 pub fn unicode_from_str(buf: &str) -> *mut pyo3_ffi::PyObject {
     if buf.is_empty() {
-        ffi!(Py_INCREF(EMPTY_UNICODE));
-        unsafe { EMPTY_UNICODE }
+        use_immortal!(EMPTY_UNICODE)
     } else {
         let num_chars = bytecount::num_chars(buf.as_bytes());
         match find_str_kind(buf, num_chars) {

src/util.rs

@@ -144,3 +144,20 @@ macro_rules! pydict_contains {
         unsafe { pyo3_ffi::PyDict_Contains((*$obj1).tp_dict, $obj2) == 1 }
     };
 }
+
+#[cfg(Py_3_12)]
+macro_rules! use_immortal {
+    ($op:expr) => {
+        unsafe { $op }
+    };
+}
+
+#[cfg(not(Py_3_12))]
+macro_rules! use_immortal {
+    ($op:expr) => {
+        unsafe {
+            ffi!(Py_INCREF($op));
+            $op
+        }
+    };
+}