Merge remote-tracking branch 'origin/dmd-rewrite-stable' into merge-2.112

Author: kinke

dmd/dstruct.d

@@ -310,7 +310,7 @@ version (IN_LLVM) {} else
             }
             if (auto ctorDecl = s.isCtorDeclaration())
             {
-                if (!ctorDecl.isCpCtor && (!ignoreDisabled || !(ctorDecl.storage_class & STC.disable)))
+                if (!ctorDecl.isCpCtor && !ctorDecl.isMoveCtor && (!ignoreDisabled || !(ctorDecl.storage_class & STC.disable)))
                 {
                     result = true;
                     return 1;

dmd/func.d

@@ -1425,7 +1425,8 @@ extern (C++) final class CtorDeclaration : FuncDeclaration
 
     override const(char)* kind() const
     {
-        return isCpCtor ? "copy constructor" : "constructor";
+        return isCpCtor ? "copy constructor" :
+             isMoveCtor ? "move constructor" : "constructor";
     }
 
     override bool isVirtual() const

tests/dmd/compilable/test21476.d

@@ -0,0 +1,13 @@
+// https://github.com/dlang/dmd/issues/21476
+
+struct S21476
+{
+    string field;
+    this(ref return scope S21476);
+    this(return scope S21476);
+}
+
+void test21476()
+{
+    auto o = S21476("aoe");
+}