GC.preserve paranoia

Author: Christopher Doris

src/Py.jl

@@ -86,7 +86,7 @@ the top level then `pycopy!(x, pything())` inside `__init__()`.
 
 Assumes `dst` is NULL, otherwise a memory leak will occur.
 """
-pycopy!(dst, src) = setptr!(dst, incref(getptr(src)))
+pycopy!(dst, src) = GC.@preserve src setptr!(dst, incref(getptr(src)))
 
 """
     pydel!(x::Py)
@@ -132,7 +132,7 @@ macro autopy(args...)
     end)
 end
 
-Py(x::Py) = pynew(incref(getptr(x))) # copy, because Py must always return a new object
+Py(x::Py) = GC.@preserve x pynew(incref(getptr(x))) # copy, because Py must always return a new object
 Py(x::Nothing) = Py(pybuiltins.None)
 Py(x::Bool) = pybool(x)
 Py(x::Union{String, SubString{String}, Char}) = pystr(x)

src/abstract/iter.jl

@@ -19,4 +19,4 @@ export pynext
 
 Return the next item in the iterator `x`. When there are no more items, return NULL.
 """
-unsafe_pynext(x::Py) = pynew(errcheck_ambig(C.PyIter_Next(getptr(x))))
+unsafe_pynext(x::Py) = GC.@preserve x pynew(errcheck_ambig(C.PyIter_Next(getptr(x))))

src/concrete/bytes.jl

@@ -19,7 +19,7 @@ pyisbytes(x) = pytypecheckfast(x, C.Py_TPFLAGS_BYTES_SUBCLASS)
 function pybytes_asdata(x::Py)
     ptr = Ref(Ptr{Cchar}(0))
     len = Ref(C.Py_ssize_t(0))
-    errcheck(C.PyBytes_AsStringAndSize(getptr(x), ptr, len))
+    GC.@preserve x errcheck(C.PyBytes_AsStringAndSize(getptr(x), ptr, len))
     ptr[], len[]
 end
 

src/concrete/str.jl

@@ -13,7 +13,7 @@ pystr(x::Char) = pystr(string(x))
 pystr(::Type{String}, x) = (s=pystr(x); ans=pystr_asstring(s); pydel!(s); ans)
 export pystr
 
-pystr_asUTF8bytes(x::Py) = pynew(errcheck(C.PyUnicode_AsUTF8String(getptr(x))))
+pystr_asUTF8bytes(x::Py) = GC.@preserve x pynew(errcheck(C.PyUnicode_AsUTF8String(getptr(x))))
 pystr_asUTF8vector(x::Py) = (b=pystr_asUTF8bytes(x); ans=pybytes_asvector(b); pydel!(b); ans)
 pystr_asstring(x::Py) = (b=pystr_asUTF8bytes(x); ans=pybytes_asUTF8string(b); pydel!(b); ans)
 

src/concrete/tuple.jl

@@ -9,7 +9,7 @@ function pytuple_setitem(xs::Py, i, x)
 end
 
 function pytuple_getitem(xs::Py, i)
-    pynew(incref(errcheck(C.PyTuple_GetItem(getptr(xs), i))))
+    GC.@preserve xs pynew(incref(errcheck(C.PyTuple_GetItem(getptr(xs), i))))
 end
 
 function pytuple_fromiter(xs)

src/err.jl

@@ -25,9 +25,9 @@ function errget()
     (pynew(t[]), pynew(v[]), pynew(b[]))
 end
 
-errset(t::Py) = C.PyErr_SetNone(getptr(t))
-errset(t::Py, v::Py) = C.PyErr_SetObject(getptr(t), getptr(v))
-errset(t::Py, v::String) = C.PyErr_SetString(getptr(t), v)
+errset(t::Py) = GC.@preserve y C.PyErr_SetNone(getptr(t))
+errset(t::Py, v::Py) = GC.@preserve t v C.PyErr_SetObject(getptr(t), getptr(v))
+errset(t::Py, v::String) = GC.@preserve t C.PyErr_SetString(getptr(t), v)
 
 function errnormalize!(t::Py, v::Py, b::Py)
     tptr = getptr(t)

src/jlwrap/base.jl

@@ -89,7 +89,7 @@ function C._pyjl_callmethod(f, self_::C.PyPtr, args_::C.PyPtr, nargs::C.Py_ssize
         return ptr
     catch exc
         if exc isa PyException
-            C.PyErr_Restore(incref(getptr(exc._t)), incref(getptr(exc._v)), incref(getptr(exc._b)))
+            GC.@preserve exc C.PyErr_Restore(incref(getptr(exc._t)), incref(getptr(exc._v)), incref(getptr(exc._b)))
             return C.PyNULL
         else
             try
@@ -120,7 +120,7 @@ function pyjl_handle_error(f, self, exc)
         return C.PyNULL
     else
         # Otherwise, return the given object (e.g. NotImplemented)
-        return incref(getptr(t))
+        return GC.@preserve t incref(getptr(t))
     end
 end
 

src/pywrap/PyArray.jl

@@ -413,7 +413,7 @@ end
 pyarray_store!(p::Ptr{R}, x::R) where {R} = unsafe_store!(p, x)
 pyarray_store!(p::Ptr{UnsafePyObject}, x::Py) = begin
     decref(unsafe_load(p).ptr)
-    unsafe_store!(p, UnsafePyObject(incref(getptr(x))))
+    unsafe_store!(p, UnsafePyObject(GC.@preserve x incref(getptr(x))))
 end
 
 pyarray_get_T(::Type{R}, ::Type{T0}, ::Type{T1}) where {R,T0,T1} = T0 <: R <: T1 ? R : error("not possible")