merge D2 pull #846

dlang · Mar 30, 2012 · 82227e4 · 82227e4
1 parent c6866d4
commit 82227e4
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/interpret.c b/src/interpret.c
@@ -724,6 +724,11 @@ Expression *FuncDeclaration::interpret(InterState *istate, Expressions *argument
     // If fell off the end of a void function, return void
     if (!e && type->toBasetype()->nextOf()->ty == Tvoid)
         return EXP_VOID_INTERPRET;
+
+    // If result is void, return void
+    if (e == EXP_VOID_INTERPRET)
+        return e;
+
     // If it generated an exception, return it
     if (exceptionOrCantInterpret(e))
     {
@@ -732,6 +737,9 @@ Expression *FuncDeclaration::interpret(InterState *istate, Expressions *argument
         ((ThrownExceptionExp *)e)->generateUncaughtError();
         return EXP_CANT_INTERPRET;
     }
+
+    // If we're about to leave CTFE, make sure we don't crash the
+    // compiler by returning a CTFE-internal expression.
     if (!istate && !evaluatingArgs)
     {
         e = scrubReturnValue(loc, e);