fix Issue 7435 - Regression(master):dmd crashes when 'scope(failure) …

…debug ...' without -debug option.
dlang · Feb 4, 2012 · 766bfba · 766bfba
1 parent 30d0a2c
commit 766bfba
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/statement.c b/src/statement.c
@@ -520,11 +520,12 @@ Statement *CompoundStatement::semantic(Scope *sc)
                     statements->insert(i, sentry);
                     i++;
                 }
+                if (sexception)
+                    sexception = sexception->semantic(sc);
                 if (sexception)
                 {
                     if (i + 1 == statements->dim && !sfinally)
                     {
-                        sexception = sexception->semantic(sc);
                     }
                     else
                     {
@@ -546,7 +547,7 @@ Statement *CompoundStatement::semantic(Scope *sc)
 
                         Identifier *id = Lexer::uniqueId("__o");
 
-                        Statement *handler = sexception->semantic(sc);
+                        Statement *handler = sexception;
                         if (sexception->blockExit(FALSE) & BEfallthru)
                         {   handler = new ThrowStatement(0, new IdentifierExp(0, id));
                             handler = new CompoundStatement(0, sexception, handler);

diff --git a/test/runnable/testscope.d b/test/runnable/testscope.d
@@ -232,6 +232,15 @@ T readMessageEnd() {
 
 /********************************************/
 
+void test7435() {
+  scope(failure)
+    debug printf("error\n");
+
+  printf("do something\n");
+}
+
+/********************************************/
+
 void main()
 {
     test1();
@@ -244,6 +253,7 @@ void main()
     test8();
     test9();
     test10();
+    test7435();
 
     printf("Success\n");
 }