fix Meta.partially_inline! again (#39112)

forgot to take `statement_offset` into account in #38519 (cherry picked from commit 9f8bdc2)
JuliaLang · Jan 15, 2021 · a4bd7f5 · a4bd7f5
1 parent 9071d15
commit a4bd7f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/base/meta.jl b/base/meta.jl
@@ -354,7 +354,7 @@ function _partially_inline!(@nospecialize(x), slot_replacements::Vector{Any},
         return Core.GotoIfNot(
             _partially_inline!(x.cond, slot_replacements, type_signature, static_param_values,
                                slot_offset, statement_offset, boundscheck),
-            x.dest,
+            x.dest + statement_offset,
         )
     end
     if isa(x, Expr)

diff --git a/test/meta.jl b/test/meta.jl
@@ -243,3 +243,5 @@ g(::Val{x}) where {x} = x ? 1 : 0
 ci = code_lowered(g, Tuple{Val{true}})[1]
 @test Meta.partially_inline!(ci.code, [], Tuple{typeof(g),Val{true}}, Any[Val{true}], 0, 0, :propagate)[1] ==
    Core.GotoIfNot(QuoteNode(Val{true}), 3)
+@test Meta.partially_inline!(ci.code, [], Tuple{typeof(g),Val{true}}, Any[Val{true}], 0, 2, :propagate)[1] ==
+   Core.GotoIfNot(QuoteNode(Val{true}), 5)