Merge pull request #4272 from retronym/merge/2.11.x-to-2.12.x-20150129

Merge 2.11.x to 2.12.x

1 files changed, 31 insertions, 0 deletions

diff --git a/test/files/run/t8925.scala b/test/files/run/t8925.scala
new file mode 100644
index 0000000000..33f4505f03
--- /dev/null
+++ b/test/files/run/t8925.scala
@@ -0,0 +1,31 @@
+object Ex {
+  def unapply(t: Throwable): Option[Throwable] = Some(t)
+}
+
+class A {
+  var x = ""
+
+  def bar =
+    try {
+      "bar"
+    } finally {
+      try {
+        x += "a"
+      } finally {
+        x += "b"
+        try {
+          x += "c"
+          throw null
+        } catch {
+          case Ex(_) =>
+            x += "d"
+        }
+      }
+    }
+}
+
+object Test extends App {
+  val a = new A
+  println(a.bar)
+  println(a.x)
+}