Fix for spurious warning.

Eliminates spurious "catch block may intercept non-local return"
seen in recent builds of master.  Unified some catch logic
in TreeInfo, and removed some which never worked.

1 files changed, 11 insertions, 0 deletions

diff --git a/test/files/neg/nonlocal-warning.scala b/test/files/neg/nonlocal-warning.scala
index cc98bd631a..f908a86302 100644
--- a/test/files/neg/nonlocal-warning.scala
+++ b/test/files/neg/nonlocal-warning.scala
@@ -4,4 +4,15 @@ class Foo {
     catch { case x => 11 }
     22
   }
+
+  val pf: PartialFunction[Throwable, Unit] = {
+    case x if false => ()
+  }
+
+  def bar(l: List[Int]): Int = {
+    try l foreach { _ => return 5 }
+    catch pf
+    finally println()
+    22
+  }
 }