undo changes from merge

Author: MilesCranmer

src/Convert/ctypes.jl

@@ -1,12 +1,14 @@
 struct pyconvert_rule_ctypessimplevalue{R,S} <: Function end
 
 function (::pyconvert_rule_ctypessimplevalue{R,SAFE})(::Type{T}, x::Py) where {R,SAFE,T}
-    ptr = C.PySimpleObject_GetValue(Ptr{R}, x)
-    ans = unsafe_load(ptr)
-    if SAFE
-        pyconvert_return(convert(T, ans))
-    else
-        pyconvert_tryconvert(T, ans)
+    Base.GC.@preserve x begin
+        ptr = C.PySimpleObject_GetValue(Ptr{R}, x)
+        ans = unsafe_load(ptr)
+        if SAFE
+            pyconvert_return(convert(T, ans))
+        else
+            pyconvert_tryconvert(T, ans)
+        end
     end
 end
 

src/Core/Py.jl

@@ -51,8 +51,8 @@ pyconvert(::Type{Py}, x::Py) = x
 
 setptr!(x::Py, ptr::C.PyPtr) = (setfield!(x, :ptr, ptr); x)
 
-incref(x::Py) = (incref(getptr(x)); x)
-decref(x::Py) = (decref(getptr(x)); x)
+incref(x::Py) = Base.GC.@preserve x (incref(getptr(x)); x)
+decref(x::Py) = Base.GC.@preserve x (decref(getptr(x)); x)
 
 Base.unsafe_convert(::Type{C.PyPtr}, x::Py) = getptr(x)
 

src/Core/builtins.jl

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

src/JlWrap/io.jl

@@ -102,7 +102,7 @@ function pyjlbinaryio_readinto(io::IO, b::Py)
         return PyNULL
     end
     pydel!(c)
-    buf = unsafe_load(C.PyMemoryView_GET_BUFFER(m_))
+    buf = unsafe_load(C.PyMemoryView_GET_BUFFER(m))
     if buf.readonly != 0
         pydel!(m)
         errset(pybuiltins.ValueError, "output buffer is read-only")