fix #21311, inlining _apply reordering evaluations

Backport of #21319.

(cherry picked from commit a27ce01)

Author: JeffBezanson

base/inference.jl

@@ -3044,6 +3044,8 @@ function inlining_pass(e::Expr, sv, linfo)
         if is(f, _apply)
             na = length(e.args)
             newargs = Vector{Any}(na-2)
+            newstmts = Any[]
+            effect_free_upto = 0
             for i = 3:na
                 aarg = e.args[i]
                 t = widenconst(exprtype(aarg, linfo))
@@ -3054,13 +3056,25 @@ function inlining_pass(e::Expr, sv, linfo)
                     newargs[i-2] = Any[ QuoteNode(x) for x in aarg ]
                 elseif isa(t, DataType) && t.name === Tuple.name && !isvatuple(t) &&
                          length(t.parameters) <= MAX_TUPLE_SPLAT
+                    for k = (effect_free_upto+1):(i-3)
+                        as = newargs[k]
+                        for kk = 1:length(as)
+                            ak = as[kk]
+                            if !effect_free(ak, linfo, true)
+                                tmpv = newvar!(sv, widenconst(exprtype(ak, linfo)))
+                                push!(newstmts, Expr(:(=), tmpv, ak))
+                                as[kk] = tmpv
+                            end
+                        end
+                    end
+                    effect_free_upto = i-3
                     if effect_free(aarg, linfo, true)
                         # apply(f,t::(x,y)) => f(t[1],t[2])
                         tmpv = aarg
                     else
                         # apply(f,t::(x,y)) => tmp=t; f(tmp[1],tmp[2])
                         tmpv = newvar!(sv, t)
-                        push!(stmts, Expr(:(=), tmpv, aarg))
+                        push!(newstmts, Expr(:(=), tmpv, aarg))
                     end
                     tp = t.parameters
                     newargs[i-2] = Any[ mk_getfield(tmpv,j,tp[j]) for j=1:length(tp) ]
@@ -3069,6 +3083,7 @@ function inlining_pass(e::Expr, sv, linfo)
                     return (e,stmts)
                 end
             end
+            append!(stmts, newstmts)
             e.args = [Any[e.args[2]]; newargs...]
 
             # now try to inline the simplified call

test/inline.jl

@@ -77,3 +77,21 @@ f18948() = (local bar::Int64; bar=1.5)
 g18948() = (local bar::Int32; bar=0x80000000)
 @test_throws InexactError f18948()
 @test_throws InexactError g18948()
+
+# issue #21311
+counter21311 = Ref(0)
+@noinline function update21311!(x)
+    counter21311[] += 1
+    x[] = counter21311[]
+    return x
+end
+@noinline map21311(t::Tuple{Any}) = (update21311!(t[1]),)
+@inline map21311(t::Tuple) = (update21311!(t[1]), map21311(Base.tail(t))...)
+function read21311()
+    xs = Ref(1), Ref(1)
+    map21311(xs)
+    return xs[1]
+end
+let a = read21311()
+    @test a[] == 1
+end