Merge pull request #8100 from RazvanN7/Issue_18688

Fix Issue 18688 - Constructors shouldn't have implicit super call if it throws merged-on-behalf-of: Andrei Alexandrescu <andralex@users.noreply.github.com>
dlang · Mar 31, 2018 · 830f9e0 · 830f9e0
2 parents c83e4b5 + 978cb05
commit 830f9e0
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/src/dmd/expressionsem.d b/src/dmd/expressionsem.d
@@ -3264,7 +3264,7 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
                 return setError();
             }
 
-            if (!sc.intypeof && !(sc.callSuper & CSX.halt))
+            if (!sc.intypeof)
             {
                 if (sc.noctor || sc.callSuper & CSX.label)
                     exp.error("constructor calls not allowed in loops or after labels");
@@ -3301,7 +3301,7 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
                 return setError();
             }
 
-            if (!sc.intypeof && !(sc.callSuper & CSX.halt))
+            if (!sc.intypeof)
             {
                 if (sc.noctor || sc.callSuper & CSX.label)
                     exp.error("constructor calls not allowed in loops or after labels");

diff --git a/test/compilable/test18688.d b/test/compilable/test18688.d
@@ -0,0 +1,43 @@
+// https://issues.dlang.org/show_bug.cgi?id=18688
+
+class A
+{
+    this(int x){}
+    @disable this();
+}
+
+class B: A
+{
+    this(int x)
+    {
+        super(x);
+    }
+
+    this(string b)
+    {
+        switch(b)
+        {
+            case "a":break;
+            default: assert(false);
+        }
+        this(1);
+    }
+}
+
+class C: A
+{
+    this(int x)
+    {
+        super(x);
+    }
+
+    this(string b)
+    {
+        switch(b)
+        {
+            case "a":break;
+            default: assert(false);
+        }
+        super(1);
+    }
+}