Merge pull request #4705 from 9rnsr/fix14351

[REG2.063] Issue 14351 - `inout` base class constructor can't be called
dlang · Jun 1, 2015 · e801243 · e801243
2 parents 8518309 + e4fd828
commit e801243
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -1932,14 +1932,17 @@ bool functionParameters(Loc loc, Scope *sc, TypeFunction *tf,
         //printf("[%s] fd = %s %s, %d %d %d\n", loc.toChars(), fd->toChars(), fd->type->toChars(),
         //    wildmatch, tf->isWild(), fd->isolateReturn());
         if (!tthis)
-        {   assert(sc->intypeof || global.errors);
+        {
+            assert(sc->intypeof || global.errors);
             tthis = fd->isThis()->type->addMod(fd->type->mod);
         }
         if (tf->isWild() && !fd->isolateReturn())
         {
             if (wildmatch)
                 tret = tret->substWildTo(wildmatch);
-            if (!tret->implicitConvTo(tthis))
+            int offset;
+            if (!tret->implicitConvTo(tthis) &&
+                !(MODimplicitConv(tret->mod, tthis->mod) && tret->isBaseOf(tthis, &offset) && offset == 0))
             {
                 const char* s1 = tret ->isNaked() ? " mutable" : tret ->modToChars();
                 const char* s2 = tthis->isNaked() ? " mutable" : tthis->modToChars();
@@ -1951,7 +1954,8 @@ bool functionParameters(Loc loc, Scope *sc, TypeFunction *tf,
         tret = tthis;
     }
     else if (wildmatch)
-    {   /* Adjust function return type based on wildmatch
+    {
+        /* Adjust function return type based on wildmatch
          */
         //printf("wildmatch = x%x, tret = %s\n", wildmatch, tret->toChars());
         tret = tret->substWildTo(wildmatch);

diff --git a/test/runnable/sctor.d b/test/runnable/sctor.d
@@ -293,6 +293,29 @@ struct S14376
     }
 }
 
+/***************************************************/
+// 14351
+
+class B14351
+{
+    this(inout int[]) inout { }
+}
+
+class D14351a : B14351
+{
+    this(int[] arr) { super(arr); }
+}
+
+class D14351b : B14351
+{
+    this(const int[] arr) const { super(arr); }
+}
+
+class D14351c : B14351
+{
+    this(inout int[] arr) inout { super(arr); }
+}
+
 /***************************************************/
 
 int main()