Merge pull request #489 from JuliaDebug/avi/fix488

fix #488, update to JuliaLang/julia#41137

Author: pfitzseb

src/interpret.jl

@@ -276,7 +276,12 @@ function evaluate_methoddef(frame, node)
     length(node.args) == 1 && return f
     sig = @lookup(frame, node.args[2])::SimpleVector
     body = @lookup(frame, node.args[3])
-    ccall(:jl_method_def, Cvoid, (Any, Any, Any), sig, body, moduleof(frame))
+    # branching on https://github.com/JuliaLang/julia/pull/41137
+    @static if isdefined(Core.Compiler, :OverlayMethodTable)
+        ccall(:jl_method_def, Cvoid, (Any, Ptr{Cvoid}, Any, Any), sig, C_NULL, body, moduleof(frame))
+    else
+        ccall(:jl_method_def, Cvoid, (Any, Any, Any), sig, body, moduleof(frame))
+    end
     return f
 end
 

test/interpret.jl

@@ -804,3 +804,10 @@ end
     # even after https://github.com/JuliaLang/julia/pull/41018
     @test Int === @interpret Core.Compiler.getfield_tfunc(m.Foo, Core.Compiler.Const(:foo))
 end
+
+@testset "https://github.com/JuliaDebug/JuliaInterpreter.jl/issues/488" begin
+    m = Module()
+    ex = :(foo() = return)
+    JuliaInterpreter.finish_and_return!(Frame(m, ex), true)
+    @test isdefined(m, :foo)
+end