incref none

Signed-off-by: Jade Abraham <[email protected]>
chapel-lang · Jan 17, 2025 · e03262d · e03262d
1 parent 9fbd1a1
commit e03262d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/tools/chapel-py/src/core-types-gen.cpp b/tools/chapel-py/src/core-types-gen.cpp
@@ -97,7 +97,9 @@ struct InvokeHelper<void(Args...)> {
   template <typename F>
   static PyObject* invoke(ContextObject* contextObject, F&& fn) {
     fn();
-    Py_RETURN_NONE;
+    // In python3.12, Py_None is immortal and this is not needed
+    Py_INCREF(Py_None);
+    return Py_None;
   }
 };
 

diff --git a/tools/chapel-py/src/python-types.h b/tools/chapel-py/src/python-types.h
@@ -135,7 +135,9 @@ PyObject* wrapOptional(ContextObject* context, const std::optional<T>& opt) {
   if (opt) {
     return PythonReturnTypeInfo<T>::wrap(context, *opt);
   } else {
-    Py_RETURN_NONE;
+    // In python3.12, Py_None is immortal and this is not needed
+    Py_INCREF(Py_None);
+    return Py_None;
   }
 }
 
@@ -211,7 +213,9 @@ PyObject* wrapNilable(ContextObject* context, const Nilable<T>& opt) {
   if (opt.value) {
     return PythonReturnTypeInfo<T>::wrap(context, opt.value);
   } else {
-    Py_RETURN_NONE;
+    // In python3.12, Py_None is immortal and this is not needed
+    Py_INCREF(Py_None);
+    return Py_None;
   }
 }