revert JlWrap since that's where the bug seems to be

Author: Christopher Doris

src/JlWrap/C.jl

@@ -337,12 +337,11 @@ function __init__()
     init_c()
 end
 
-PyJuliaValue_IsNull(o) = Base.GC.@preserve o UnsafePtr{PyJuliaValueObject}(C.asptr(o)).value[] == 0
+PyJuliaValue_IsNull(o::C.PyPtr) = UnsafePtr{PyJuliaValueObject}(o).value[] == 0
 
-PyJuliaValue_GetValue(o) = Base.GC.@preserve o PYJLVALUES[UnsafePtr{PyJuliaValueObject}(C.asptr(o)).value[]]
+PyJuliaValue_GetValue(o::C.PyPtr) = PYJLVALUES[UnsafePtr{PyJuliaValueObject}(o).value[]]
 
-PyJuliaValue_SetValue(_o, @nospecialize(v)) = Base.GC.@preserve _o begin
-    o = C.asptr(_o)
+PyJuliaValue_SetValue(o::C.PyPtr, @nospecialize(v)) = begin
     idx = UnsafePtr{PyJuliaValueObject}(o).value[]
     if idx == 0
         if isempty(PYJLFREEVALUES)
@@ -359,8 +358,7 @@ PyJuliaValue_SetValue(_o, @nospecialize(v)) = Base.GC.@preserve _o begin
     nothing
 end
 
-PyJuliaValue_New(_t, @nospecialize(v)) = Base.GC.@preserve _t begin
-    t = C.asptr(_t)
+PyJuliaValue_New(t::C.PyPtr, @nospecialize(v)) = begin
     if C.PyType_IsSubtype(t, PyJuliaBase_Type[]) != 1
         C.PyErr_SetString(
             C.POINTERS.PyExc_TypeError,

src/JlWrap/base.jl

@@ -1,10 +1,10 @@
 const pyjlbasetype = pynew()
 
-_pyjl_getvalue(x) = @autopy x Cjl.PyJuliaValue_GetValue(x_)
+_pyjl_getvalue(x) = @autopy x Cjl.PyJuliaValue_GetValue(getptr(x_))
 
-_pyjl_setvalue!(x, v) = @autopy x Cjl.PyJuliaValue_SetValue(x_, v)
+_pyjl_setvalue!(x, v) = @autopy x Cjl.PyJuliaValue_SetValue(getptr(x_), v)
 
-pyjl(t, v) = pynew(errcheck(@autopy t Cjl.PyJuliaValue_New(t_, v)))
+pyjl(t, v) = pynew(errcheck(@autopy t Cjl.PyJuliaValue_New(getptr(t_), v)))
 
 """
     pyisjl(x)
@@ -16,7 +16,7 @@ export pyisjl
 
 pyjlisnull(x) = @autopy x begin
     if pyisjl(x_)
-        Cjl.PyJuliaValue_IsNull(x_)
+        Cjl.PyJuliaValue_IsNull(getptr(x_))
     else
         error("Expecting a 'juliacall.ValueBase', got a '$(pytype(x_).__name__)'")
     end
@@ -85,13 +85,13 @@ function Cjl._pyjl_callmethod(f, self_::C.PyPtr, args_::C.PyPtr, nargs::C.Py_ssi
                 "__jl_callmethod not implemented for this many arguments",
             )
         end
-        return getptr(incref(ans))
+        return incref(getptr(ans))
     catch exc
         if exc isa PyException
             Base.GC.@preserve exc C.PyErr_Restore(
-                incref(exc._t),
-                incref(exc._v),
-                incref(exc._b),
+                incref(getptr(exc._t)),
+                incref(getptr(exc._v)),
+                incref(getptr(exc._b)),
             )
             return C.PyNULL
         else
@@ -126,7 +126,7 @@ function pyjl_handle_error(f, self, exc)
         return C.PyNULL
     else
         # Otherwise, return the given object (e.g. NotImplemented)
-        return getptr(incref(t))
+        return Base.GC.@preserve t incref(getptr(t))
     end
 end
 

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(getptr(m)))
     if buf.readonly != 0
         pydel!(m)
         errset(pybuiltins.ValueError, "output buffer is read-only")
@@ -125,7 +125,7 @@ function pyjlbinaryio_write(io::IO, b::Py)
         return PyNULL
     end
     pydel!(c)
-    buf = unsafe_load(C.PyMemoryView_GET_BUFFER(m))
+    buf = unsafe_load(C.PyMemoryView_GET_BUFFER(getptr(m)))
     data = unsafe_wrap(Array, Ptr{UInt8}(buf.buf), buf.len)
     write(io, data)
     pydel!(m)

src/JlWrap/objectarray.jl

@@ -51,7 +51,7 @@ end
     @boundscheck checkbounds(x, i...)
     v_ = Py(v)
     @inbounds decref(x.ptrs[i...])
-    @inbounds x.ptrs[i...] = getptr(incref(v_))
+    @inbounds x.ptrs[i...] = incref(getptr(v_))
     return x
 end