Merge pull request #12516 from MartinNowak/merge_stable

merge stable
merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

Author: dlang-bot

VERSION

@@ -1 +1 @@
-v2.096.1
+v2.097.0-beta.1

src/dmd/dsymbolsem.d

@@ -6610,8 +6610,11 @@ void aliasInstanceSemantic(TemplateInstance tempinst, Scope* sc, TemplateDeclara
 
     TemplateTypeParameter ttp = (*tempdecl.parameters)[0].isTemplateTypeParameter();
     Type ta = tempinst.tdtypes[0].isType();
-    Declaration d = new AliasDeclaration(tempinst.loc, ttp.ident, ta.addMod(tempdecl.onemember.isAliasDeclaration.type.mod));
-    d.storage_class |= STC.templateparameter;
+    auto ad = tempdecl.onemember.isAliasDeclaration();
+
+    // Note: qualifiers can be in both 'ad.type.mod' and 'ad.storage_class'
+    Declaration d = new AliasDeclaration(tempinst.loc, ttp.ident, ta.addMod(ad.type.mod));
+    d.storage_class |= STC.templateparameter | ad.storage_class;
     d.dsymbolSemantic(sc);
 
     paramscope.pop();

src/dmd/escape.d

@@ -1847,9 +1847,10 @@ void escapeByRef(Expression e, EscapeByResults* er, bool live = false)
                      */
                     if (ExpInitializer ez = v._init.isExpInitializer())
                     {
-                        assert(ez.exp && ez.exp.op == TOK.construct);
-                        Expression ex = (cast(ConstructExp)ez.exp).e2;
-                        ex.accept(this);
+                        if (auto ce = ez.exp.isConstructExp())
+                            ce.e2.accept(this);
+                        else
+                            ez.exp.accept(this);
                     }
                 }
                 else

src/dmd/expressionsem.d

@@ -2346,7 +2346,7 @@ private bool functionParameters(const ref Loc loc, Scope* sc,
 
                 /* Declare temporary 'auto __pfx = arg' (needsDtor) or 'auto __pfy = arg' (!needsDtor)
                  */
-                auto tmp = copyToTemp(0,
+                auto tmp = copyToTemp(parameter.storageClass & (STC.scope_),
                     needsDtor ? "__pfx" : "__pfy",
                     !isRef ? arg : arg.addressOf());
                 tmp.dsymbolSemantic(sc);

test/compilable/issue21880.d

@@ -0,0 +1,23 @@
+// REQUIRED_ARGS: -preview=dip1000
+// https://issues.dlang.org/show_bug.cgi?id=21880
+extern(C++):
+void spawnProcess(scope const(char*)*, File = File()) @safe
+{
+}
+
+void pipeProcess(scope const(char*)* args) @safe
+{
+    pipeProcessImpl!spawnProcess(args);
+}
+
+void pipeProcessImpl(alias spawnFunc, Cmd)(Cmd command) @trusted
+{
+    spawnFunc(command);
+}
+
+struct File
+{
+    ~this() @safe
+    {
+    }
+}

test/compilable/issue21882.d

@@ -0,0 +1,14 @@
+// REQUIRED_ARGS: -preview=dip1021
+// https://issues.dlang.org/show_bug.cgi?id=21882
+bool buildPath()
+{
+    struct ByCodeUnitImpl
+    {
+        auto opIndex(size_t) { }
+    }
+    return isRandomAccessRange!ByCodeUnitImpl;
+}
+
+enum isRandomAccessRange(R) = is(typeof(lvalueOf!R[1]));
+
+ref T lvalueOf(T)();

test/compilable/test21898.d

@@ -0,0 +1,7 @@
+// https://issues.dlang.org/show_bug.cgi?id=21898
+
+alias Works(T) = immutable(T);
+alias Fails(T) = immutable T;
+
+static assert(is(Works!int == immutable int));
+static assert(is(Fails!int == immutable int));