Don't assume that method1 is always in a thunk

Fixes Revise test failures in JuliaLang/julia#57346.
timholy · Feb 11, 2025 · 43504ae · 43504ae
1 parent b919241
commit 43504ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/lowered.jl b/src/lowered.jl
@@ -356,7 +356,9 @@ function methods_by_execution!(@nospecialize(recurse), methodinfo, docexprs, fra
                             end
                         end
                     end
-                    pc = next_or_nothing!(frame)
+                    @assert length(stmt.args) == 1
+                    pc = mode !== :sigs ? step_expr!(recurse, frame, stmt, true) :
+                        next_or_nothing!(frame)
                 else
                     pc, pc3 = ret
                     # Get the line number from the body

diff --git a/test/backedges.jl b/test/backedges.jl
@@ -20,6 +20,7 @@ do_test("Backedges") && @testset "Backedges" begin
     laststmt = src.code[end]
     @assert isa(laststmt, Core.ReturnNode)
     to_skip = isa(laststmt.val, Revise.JuliaInterpreter.SSAValue) ? 2 : 1
+    # Revise.LoweredCodeUtils.print_with_code(stdout, src, isrequired)
     @test sum(isrequired) == length(src.code)-count(e->isexpr(e, :latestworld), src.code)-to_skip  # skips the `return` at the end (and its argument)
 
     src = """