fix gc issues

Author: Christopher Doris

src/Py.jl

@@ -88,7 +88,7 @@ the top level then `pycopy!(x, pything())` inside `__init__()`.
 
 Assumes `dst` is NULL, otherwise a memory leak will occur.
 """
-pycopy!(dst::Py, src) = GC.@preserve src setptr!(dst, incref(getptr(src)))
+pycopy!(dst::Py, src) = Base.GC.@preserve src setptr!(dst, incref(getptr(src)))
 
 """
     pydel!(x::Py)

src/PythonCall.jl

@@ -10,6 +10,7 @@ include("utils.jl")
 
 include("cpython/CPython.jl")
 
+include("gc.jl")
 include("Py.jl")
 include("err.jl")
 include("config.jl")

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) = GC.@preserve x pynew(errcheck_ambig(C.PyIter_Next(getptr(x))))
+unsafe_pynext(x::Py) = Base.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))
-    GC.@preserve x errcheck(C.PyBytes_AsStringAndSize(getptr(x), ptr, len))
+    Base.GC.@preserve x errcheck(C.PyBytes_AsStringAndSize(getptr(x), ptr, len))
     ptr[], len[]
 end
 

src/concrete/ctypes.jl

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

src/concrete/numpy.jl

@@ -1,7 +1,7 @@
 struct pyconvert_rule_numpysimplevalue{R,S} <: Function end
 
 function (::pyconvert_rule_numpysimplevalue{R,SAFE})(::Type{T}, x::Py) where {R,SAFE,T}
-    ans = GC.@preserve x C.PySimpleObject_GetValue(R, getptr(x))
+    ans = Base.GC.@preserve x C.PySimpleObject_GetValue(R, getptr(x))
     if SAFE
         pyconvert_return(convert(T, ans))
     else

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) = GC.@preserve x pynew(errcheck(C.PyUnicode_AsUTF8String(getptr(x))))
+pystr_asUTF8bytes(x::Py) = Base.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

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

src/cpython/CPython.jl

@@ -16,7 +16,6 @@ include("extras.jl")
 include("context.jl")
 include("gil.jl")
 include("jlwrap.jl")
-include("gc.jl")
 
 function __init__()
     init_context()

src/err.jl

@@ -25,9 +25,9 @@ function errget()
     (pynew(t[]), pynew(v[]), pynew(b[]))
 end
 
-errset(t::Py) = GC.@preserve t 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)
+errset(t::Py) = Base.GC.@preserve t C.PyErr_SetNone(getptr(t))
+errset(t::Py, v::Py) = Base.GC.@preserve t v C.PyErr_SetObject(getptr(t), getptr(v))
+errset(t::Py, v::String) = Base.GC.@preserve t C.PyErr_SetString(getptr(t), v)
 
 function errnormalize!(t::Py, v::Py, b::Py)
     tptr = getptr(t)

src/gc.jl

@@ -8,7 +8,7 @@ module GC
 import ..PythonCall.C
 
 const ENABLED = Ref(true)
-const QUEUE = PyPtr[]
+const QUEUE = C.PyPtr[]
 
 """
     PythonCall.GC.disable()

src/jlwrap/base.jl

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