Merge pull request #3835 from 9rnsr/fix13201

[REG2.066a] Issue 13201 - Wrong "Warning: statement is not reachable" error with -w
dlang · Jul 30, 2014 · 64da724 · 64da724
1 parent 7119ce5
commit 64da724
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 9 deletions.
diff --git a/src/statement.c b/src/statement.c
@@ -632,11 +632,15 @@ int Statement::blockExit(FuncDeclaration *func, bool mustNotThrow)
                     s->finalbody->blockExit(func, mustNotThrow);
             }
 
+        #if 0
+            // Bugzilla 13201: Mask to prevent spurious warnings for
+            // destructor call, exit of synchronized statement, etc.
             if (result == BEhalt && finalresult != BEhalt && s->finalbody &&
                 s->finalbody->hasCode())
             {
                 s->finalbody->warning("statement is not reachable");
             }
+        #endif
 
             if (!(finalresult & BEfallthru))
                 result &= ~BEfallthru;

diff --git a/test/fail_compilation/warn12809.d b/test/fail_compilation/warn12809.d
@@ -3,19 +3,19 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/warn12809.d(16): Warning: statement is not reachable
 fail_compilation/warn12809.d(25): Warning: statement is not reachable
 fail_compilation/warn12809.d(33): Warning: statement is not reachable
 ---
 */
-void test_unrachable1()
-{
-    try assert(0);
-    finally
-    {
-        int x = 1;  // unreachable
-    }
-}
+
+//void test_unrachable1()
+//{
+//    try assert(0);
+//    finally
+//    {
+//        int x = 1;  // unreachable
+//    }
+//}
 
 void test_unrachable2()
 {

diff --git a/test/runnable/warning1.d b/test/runnable/warning1.d
@@ -153,6 +153,37 @@ struct S9332
     }
 }
 
+/******************************************/
+// 13201
+
+class C13201
+{
+    void foo()
+    {
+        synchronized(this)
+        {
+            assert(0);
+        }
+    }
+}
+
+void test13201a()
+{
+    auto c = new C13201();
+    synchronized(c)
+    {
+        assert(0);
+    }
+}
+
+void test13201b()
+{
+    struct S { ~this() {} }
+
+    S s;
+    assert(0);
+}
+
 /******************************************/
 
 void main()