Merge upstream stable (dlang/dmd@37b74d7219)

CMakeLists.txt

@@ -113,7 +113,7 @@ set(LDC_VERSION "1.26.0") # May be overridden by git hash tag
 set(DMDFE_MAJOR_VERSION   2)
 set(DMDFE_MINOR_VERSION   0)
 set(DMDFE_PATCH_VERSION   96)
-set(DMDFE_FIX_LEVEL       0)
+set(DMDFE_FIX_LEVEL       1)
 
 set(DMD_VERSION ${DMDFE_MAJOR_VERSION}.${DMDFE_MINOR_VERSION}${DMDFE_PATCH_VERSION})
 if(DEFINED DMDFE_FIX_LEVEL)

dmd/dcast.d

@@ -1400,7 +1400,13 @@ MATCH implicitConvTo(Expression e, Type t)
             {
                 typeb = toStaticArrayType(e);
                 if (typeb)
+                {
+                    // Try: T[] -> T[dim]
+                    // (Slice with compile-time known boundaries to static array)
                     result = typeb.implicitConvTo(t);
+                    if (result > MATCH.convert)
+                        result = MATCH.convert; // match with implicit conversion at most
+                }
                 return;
             }
 

dmd/dmangle.d

@@ -654,7 +654,7 @@ public:
                     n /= 10;
                     ++ndigits;
                 }
-                buf.printf("%u__S%u", ndigits + 4, localNum);
+                buf.printf("%u__S%u", ndigits + 3, localNum);
             }
         }
     }

dmd/dsymbol.d

@@ -2206,7 +2206,7 @@ extern (C++) final class AliasAssign : Dsymbol
     Dsymbol aliassym; /// replace previous RHS of AliasDeclaration with `aliassym`
                       /// only one of type and aliassym can be != null
 
-    extern (D) this(const ref Loc loc, Identifier ident, Type type, Dsymbol aliasssym)
+    extern (D) this(const ref Loc loc, Identifier ident, Type type, Dsymbol aliassym)
     {
         super(loc, null);
         this.ident = ident;

dmd/dsymbolsem.d

@@ -6690,7 +6690,7 @@ void aliasSemantic(AliasDeclaration ds, Scope* sc)
     // pass to distinguish.
     // If it is a type, then `.type` is set and getType() will return that
     // type. If it is a symbol, then `.aliassym` is set and type is `null` -
-    // toAlias() will return `.aliasssym`
+    // toAlias() will return `.aliassym`
 
     const errors = global.errors;
     Type oldtype = ds.type;

dmd/dtemplate.d

@@ -4879,6 +4879,8 @@ MATCH deduceType(RootObject o, Scope* sc, Type tparam, TemplateParameters* param
                 if (Type tsa = toStaticArrayType(e))
                 {
                     tsa.accept(this);
+                    if (result > MATCH.convert)
+                        result = MATCH.convert; // match with implicit conversion at most
                     return;
                 }
             }

dmd/traits.d

@@ -1450,10 +1450,10 @@ else
 
         if (stc & STC.out_)
             push("out");
-        else if (stc & STC.ref_)
-            push("ref");
         else if (stc & STC.in_)
             push("in");
+        else if (stc & STC.ref_)
+            push("ref");
         else if (stc & STC.lazy_)
             push("lazy");
         else if (stc & STC.alias_)