Improve breakpoints on Julia 1.12 (#669)

This doesn't get all tests passing, but most uses of breakpoints now
work.

Author: timholy

src/optimize.jl

@@ -38,7 +38,6 @@ function smallest_ref(stmts, arg, idmin)
     return idmin
 end
 
-const isbindingresolved_deprecated = which(Base.isbindingresolved, Tuple{Module, Symbol}).file == Symbol("deprecated.jl")
 function lookup_global_ref(a::GlobalRef)
     isbindingresolved_deprecated && return a
     if Base.isbindingresolved(a.mod, a.name) &&

src/packagedef.jl

@@ -28,6 +28,8 @@ else
     const Scope = Any
 end
 
+const isbindingresolved_deprecated = which(Base.isbindingresolved, Tuple{Module, Symbol}).file == Symbol("deprecated.jl")
+
 include("types.jl")
 include("utils.jl")
 include("construct.jl")

src/types.jl

@@ -123,6 +123,13 @@ function is_breakpoint_expr(ex::Expr)
     q = ex.args[3]
     return isa(q, QuoteNode) && q.value === :__BREAKPOINT_MARKER__
 end
+
+@static if isbindingresolved_deprecated
+    is_breakpoint_marker(stmt) = is_global_ref(stmt, JuliaInterpreter, :__BREAK_POINT_MARKER__)
+else
+    is_breakpoint_marker(stmt) = stmt === __BREAK_POINT_MARKER__
+end
+
 function FrameCode(scope, src::CodeInfo; generator=false, optimize=true)
     if optimize
         src, methodtables = optimize!(copy(src), scope)
@@ -132,7 +139,7 @@ function FrameCode(scope, src::CodeInfo; generator=false, optimize=true)
     end
     breakpoints = Vector{BreakpointState}(undef, length(src.code))
     for (i, pc_expr) in enumerate(src.code)
-        if lookup_stmt(src.code, pc_expr) === __BREAK_POINT_MARKER__
+        if is_breakpoint_marker(lookup_stmt(src.code, pc_expr))
             breakpoints[i] = BreakpointState()
             src.code[i] = nothing
         end

test/debug.jl

@@ -203,6 +203,9 @@ end
         frame = JuliaInterpreter.enter_call(f, 2; b = 4)
         fr = JuliaInterpreter.maybe_step_through_wrapper!(frame)
         fr, pc = debug_command(fr, :nc)
+        if !isa(pc_expr(fr, pc), Core.ReturnNode)   # Julia 1.12 has an extra step for global lookup
+            fr, pc = debug_command(fr, :nc)
+        end
         debug_command(fr, :nc)
         @test get_return(frame) == 6
     end
@@ -395,6 +398,9 @@ end
     @testset "invokelatest" begin
         fr = JuliaInterpreter.enter_call(f_inv_latest, 2.0)
         fr, pc = JuliaInterpreter.debug_command(fr, :nc)
+        while is_getproperty(pc_expr(fr, pc).args[1])    # Julia 1.12 has more steps for global lookup
+            fr, pc = JuliaInterpreter.debug_command(fr, :nc)
+        end
         frame, pc = JuliaInterpreter.debug_command(fr, :s) # step into invokelatest
         @test frame.framecode.scope.sig == Tuple{typeof(f_inv),Real}
         JuliaInterpreter.debug_command(frame, :c)

test/utils.jl

@@ -6,6 +6,12 @@ using JuliaInterpreter: finish_and_return!, evaluate_call!, step_expr!, shouldbr
 using Base.Meta: isexpr
 using Test, Random, SHA
 
+@static if JuliaInterpreter.isbindingresolved_deprecated
+    is_getproperty(stmt) = JuliaInterpreter.is_global_ref(stmt, Base, :getproperty)
+else
+    is_getproperty(stmt) = JuliaInterpreter.is_quotenode_egal(stmt, Base.getproperty)
+end
+
 function stacklength(frame)
     n = 1
     frame = frame.callee