Merge pull request #986 from 9rnsr/fix3574

Issue 3574 - post-condition in void main() is not evaluated if there is no return statement

src/func.c

@@ -1317,15 +1317,7 @@ void FuncDeclaration::semantic3(Scope *sc)
 
                 int offend = blockexit & BEfallthru;
 #endif
-                if (type->nextOf()->ty == Tvoid)
-                {
-                    if (offend && isMain())
-                    {   // Add a return 0; statement
-                        Statement *s = new ReturnStatement(0, new IntegerExp(0));
-                        fbody = new CompoundStatement(0, fbody, s);
-                    }
-                }
-                else
+                if (type->nextOf()->ty != Tvoid)
                 {
                     if (offend)
                     {   Expression *e;
@@ -1551,6 +1543,11 @@ void FuncDeclaration::semantic3(Scope *sc)
                     a->push(s);
                 }
             }
+            if (isMain() && type->nextOf()->ty == Tvoid)
+            {   // Add a return 0; statement
+                Statement *s = new ReturnStatement(0, new IntegerExp(0));
+                a->push(s);
+            }
 
             fbody = new CompoundStatement(0, a);
 #if DMDV2

test/runnable/test3574a.d

@@ -0,0 +1,13 @@
+int g = 0;
+static ~this() { assert(g == 100); }
+
+void main()
+out
+{
+    g = 100;
+}
+body
+{
+    return;
+    // expected return code == 0
+}

test/runnable/test3574b.d

@@ -0,0 +1,13 @@
+int g = 0;
+static ~this() { assert(g == 100); }
+
+void main()
+out
+{
+    g = 100;
+}
+body
+{
+    //return;
+    // expected return code == 0
+}

test/runnable/test3574c.d

@@ -0,0 +1,13 @@
+//int g = 0;
+//static ~this() { assert(g == 100); }
+
+void main()
+//out
+//{
+//    g = 100;
+//}
+//body
+{
+    return;
+    // expected return code == 0
+}

test/runnable/test3574d.d

@@ -0,0 +1,13 @@
+//int g = 0;
+//static ~this() { assert(g == 100); }
+
+void main()
+//out
+//{
+//    g = 100;
+//}
+//body
+{
+    //return;
+    // expected return code == 0
+}