Merge upstream stable (dlang/dmd@9337377c8a)

dmd/escape.d

@@ -841,7 +841,7 @@ ByRef:
          * then uncount that address of. This is so it won't cause a
          * closure to be allocated.
          */
-        if (va && va.isScope() && fd.tookAddressOf)
+        if (va && va.isScope() && !(va.storage_class & STC.return_) && fd.tookAddressOf)
             --fd.tookAddressOf;
 
         foreach (v; vars)

dmd/expressionsem.d

@@ -2068,7 +2068,7 @@ private bool functionParameters(const ref Loc loc, Scope* sc,
                 if (global.params.vsafe)
                     err |= checkParamArgumentEscape(sc, fd, p, arg, false, false);
             }
-            else
+            else if (!(p.storageClass & STC.return_))
             {
                 /* Argument value cannot escape from the called function.
                  */
@@ -2077,7 +2077,7 @@ private bool functionParameters(const ref Loc loc, Scope* sc,
                     a = (cast(CastExp)a).e1;
 
                 ArrayLiteralExp ale;
-                if (p.type.toBasetype().ty == Tarray && !(p.storageClass & STC.return_) &&
+                if (p.type.toBasetype().ty == Tarray &&
                     (ale = a.isArrayLiteralExp()) !is null)
                 {
                     // allocate the array literal as temporary static array on the stack