fixup pull#2210 - Change error report timing

dlang · Jun 19, 2013 · 58f0c95 · 58f0c95
1 parent 3527e7d
commit 58f0c95
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/statement.c b/src/statement.c
@@ -3906,6 +3906,11 @@ Statement *ReturnStatement::semantic(Scope *sc)
 
     if (exp && tbret->ty == Tvoid && !implicit0)
     {
+        if (exp->type->ty != Tvoid)
+        {
+            error("cannot return non-void from void function");
+        }
+
         /* Replace:
          *      return exp;
          * with:
@@ -3915,11 +3920,6 @@ Statement *ReturnStatement::semantic(Scope *sc)
         Statement *s = new ExpStatement(loc, ce);
         s = s->semantic(sc);
 
-        if (exp->type->ty != Tvoid)
-        {
-            error("cannot return non-void from void function");
-        }
-
         exp = NULL;
         return new CompoundStatement(loc, s, this);
     }