save

Author: ViralBShah

Project.toml

@@ -24,7 +24,7 @@ Reexport = "0.2, 1.0"
 SciMLBase = "1.92"
 PrecompileTools = "1"
 Sundials_jll = "6"
-julia = "1.10"
+julia = "1.6"
 
 [extras]
 AlgebraicMultigrid = "2169fc97-5a83-5252-b627-83903c6c433c"

gen/Project.toml

@@ -6,3 +6,5 @@ Sundials_jll = "fb77eaff-e24c-56d4-86b1-d163f2edb164"
 
 [compat]
 Clang = "0.17"
+Sundials_jll = "6.6"
+julia = "1.10"

gen/rewrite.sh

@@ -0,0 +1,10 @@
+cat libsundials_api.jl | \
+    perl -pe 's/ARKRhsFn_wrapper//g' | \
+    perl -pe 's/CVRhsFn_wrapper//g' | \
+    perl -pe 's/CVRootFn_wrapper//g' | \
+    perl -pe 's/IDAResFn_wrapper//g' | \
+    perl -pe 's/IDARootFn_wrapper//g' | \
+    perl -pe 's/KINSysFn_wrapper//g' | \
+    perl -pe 's/ARKRhsFn_wrapper//g' | \
+    perl -pe 's/convert\(N_Vector, (.+)\)/$1/g' \
+    > libsundials_api_rewrite.jl

src/Sundials.jl

@@ -61,7 +61,7 @@ include("types_and_consts_additions.jl")
 include("handle.jl")
 include("nvector_wrapper.jl")
 
-include("./lib/libsundials_api.jl")
+include("./lib/libsundials_api_rewrite.jl")
 
 for ff in names(@__MODULE__; all = true)
     fname = string(ff)

src/lib/libsundials_api.jl

@@ -1,3 +1,14 @@
+# Modified from autogenerated code to fix memory safety:
+#
+# N_Vector https://github.com/SciML/Sundials.jl/issues/367
+# Global edits:
+#    convert(N_Vector, x) -> x
+#    some_arg::::N_Vector -> some_arg::Union{N_Vector, NVector}
+#
+# Remove automatic use of @cfunction by CVRhsFn_wrapper and similar
+# (this is unsafe as a C ptr is returned from the temporary @cfunction closure which may then be garbage collected)
+
+
 function ARKStepCreate(fe::ARKRhsFn, fi::ARKRhsFn, t0::realtype, y0::N_Vector)
     ccall((:ARKStepCreate, libsundials_arkode), ARKStepMemPtr, (ARKRhsFn, ARKRhsFn, realtype, N_Vector), fe, fi, t0, y0)
 end
@@ -7871,4 +7882,3 @@ end
 function SUNNonlinSolGetSysFn_Newton(NLS::SUNNonlinearSolver, SysFn)
     ccall((:SUNNonlinSolGetSysFn_Newton, libsundials_sunnonlinsolnewton), Cint, (SUNNonlinearSolver, Ptr{SUNNonlinSolSysFn}), NLS, SysFn)
 end
-