# HG changeset patch
# User Leandro Lucarella <llucax@gmail.com>
# Date 1262801902 10800
# Node ID 0333945a915e3501e7838c007254d1856df37e6f
# Parent  c61782a76dff36ef2929cbaf04f4bf08444a5b40
Merge DMD r310: bugzilla 3645 manifest constant (enum) crashes dmd
---
 dmd/interpret.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff -r c61782a76dff -r 0333945a915e dmd/interpret.c
--- a/dmd/interpret.c	Wed Jan 06 15:18:22 2010 -0300
+++ b/dmd/interpret.c	Wed Jan 06 15:18:22 2010 -0300
@@ -228,7 +228,8 @@
 	}
     }
     // Don't restore the value of 'this' upon function return
-    if (needThis() && thisarg->op==TOKvar) {
+    if (needThis() && thisarg->op == TOKvar && istate)
+    {
 	VarDeclaration *thisvar = ((VarExp *)(thisarg))->var->isVarDeclaration();
     	for (size_t i = 0; i < istate->vars.dim; i++)
 	{   VarDeclaration *v = (VarDeclaration *)istate->vars.data[i];