fix #38837, inference regression in tuple map (#38887)

(cherry picked from commit c28611f)
JuliaLang · Dec 22, 2022 · 0ad3a4d · 0ad3a4d
1 parent 532210f
commit 0ad3a4d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/base/tuple.jl b/base/tuple.jl
@@ -210,9 +210,9 @@ end
 
 # 1 argument function
 map(f, t::Tuple{}) = ()
-map(f, t::Tuple{Any,}) = (f(t[1]),)
-map(f, t::Tuple{Any, Any}) = (f(t[1]), f(t[2]))
-map(f, t::Tuple{Any, Any, Any}) = (f(t[1]), f(t[2]), f(t[3]))
+map(f, t::Tuple{Any,}) = (@_inline_meta; (f(t[1]),))
+map(f, t::Tuple{Any, Any}) = (@_inline_meta; (f(t[1]), f(t[2])))
+map(f, t::Tuple{Any, Any, Any}) = (@_inline_meta; (f(t[1]), f(t[2]), f(t[3])))
 map(f, t::Tuple) = (@_inline_meta; (f(t[1]), map(f,tail(t))...))
 # stop inlining after some number of arguments to avoid code blowup
 const Any16{N} = Tuple{Any,Any,Any,Any,Any,Any,Any,Any,
@@ -229,8 +229,8 @@ function map(f, t::Any16)
 end
 # 2 argument function
 map(f, t::Tuple{}, s::Tuple{}) = ()
-map(f, t::Tuple{Any,}, s::Tuple{Any,}) = (f(t[1],s[1]),)
-map(f, t::Tuple{Any,Any}, s::Tuple{Any,Any}) = (f(t[1],s[1]), f(t[2],s[2]))
+map(f, t::Tuple{Any,}, s::Tuple{Any,}) = (@_inline_meta; (f(t[1],s[1]),))
+map(f, t::Tuple{Any,Any}, s::Tuple{Any,Any}) = (@_inline_meta; (f(t[1],s[1]), f(t[2],s[2])))
 function map(f, t::Tuple, s::Tuple)
  @_inline_meta
  (f(t[1],s[1]), map(f, tail(t), tail(s))...)

diff --git a/test/tuple.jl b/test/tuple.jl
@@ -593,3 +593,7 @@ end
  @test r isa Iterators.Rest
  @test collect(r) == -[3, 2, 4]
 end
+
+# issue #38837
+f38837(xs) = map((F,x)->F(x), (Float32, Float64), xs)
+@test @inferred(f38837((1,2))) === (1.0f0, 2.0)