fix Meta.partially_inline! for ReturnNode

lazarusA · Nov 21, 2020 · 09eb415 · 09eb415
1 parent c36cf8c
commit 09eb415
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/base/meta.jl b/base/meta.jl
@@ -344,6 +344,12 @@ function _partially_inline!(@nospecialize(x), slot_replacements::Vector{Any},
  x.edges .+= slot_offset
  return x
  end
+ if isa(x, Core.ReturnNode)
+ return Core.ReturnNode(
+ _partially_inline!(x.val, slot_replacements, type_signature, static_param_values,
+ slot_offset, statement_offset, boundscheck)
+ )
+ end
  if isa(x, Expr)
  head = x.head
  if head === :static_parameter

diff --git a/test/meta.jl b/test/meta.jl
@@ -233,3 +233,8 @@ macro m() 2 end
 end
 
 @test _lower(TestExpandInWorldModule, :(@m), TestExpandInWorldModule.wa) == 1
+
+f(::T) where {T} = T
+ci = code_lowered(f, Tuple{Int})[1]
+@test Meta.partially_inline!(ci.code, [], Tuple{typeof(f),Int}, Any[Int], 0, 0, :propagate) ==
+ Any[Core.ReturnNode(QuoteNode(Int))]