fix Issue 13082 - Spurious error message with failed call to class ctor

dlang · Jul 11, 2014 · 320636d · 320636d
1 parent 49f0db5
commit 320636d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -4869,12 +4869,10 @@ Expression *NewExp::semantic(Scope *sc)
             goto Lerr;
         }
 
-        FuncDeclaration *f = NULL;
         if (cd->ctor)
-            f = resolveFuncCall(loc, sc, cd->ctor, NULL, tb, arguments, 0);
-        if (f)
         {
-            if (f->errors)
+            FuncDeclaration *f = resolveFuncCall(loc, sc, cd->ctor, NULL, tb, arguments, 0);
+            if (!f || f->errors)
                 goto Lerr;
             checkDeprecated(sc, f);
             checkPurity(sc, f);
@@ -4911,7 +4909,7 @@ Expression *NewExp::semantic(Scope *sc)
                 newargs = new Expressions();
             newargs->shift(e);
 
-            f = resolveFuncCall(loc, sc, cd->aggNew, NULL, tb, newargs);
+            FuncDeclaration *f = resolveFuncCall(loc, sc, cd->aggNew, NULL, tb, newargs);
             if (!f || f->errors)
                 goto Lerr;
             allocator = f->isNewDeclaration();
@@ -4974,12 +4972,10 @@ Expression *NewExp::semantic(Scope *sc)
             }
         }
 
-        FuncDeclaration *f = NULL;
         if (sd->ctor && nargs)
-            f = resolveFuncCall(loc, sc, sd->ctor, NULL, tb, arguments, 0);
-        if (f)
         {
-            if (f->errors)
+            FuncDeclaration *f = resolveFuncCall(loc, sc, sd->ctor, NULL, tb, arguments, 0);
+            if (!f || f->errors)
                 goto Lerr;
             checkDeprecated(sc, f);
             checkPurity(sc, f);

diff --git a/test/fail_compilation/diag13082.d b/test/fail_compilation/diag13082.d
@@ -0,0 +1,24 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/diag13082.d(22): Error: constructor diag13082.C.this (int a) is not callable using argument types (string)
+fail_compilation/diag13082.d(23): Error: constructor diag13082.S.this (int a) is not callable using argument types (string)
+---
+*/
+
+class C
+{
+    this(int a) {}
+}
+
+struct S
+{
+    this(int a) {}
+}
+
+void main()
+{
+    string b;
+    auto c = new C(b);
+    auto s = new S(b);
+}