Fix for broken non-local returns.

Don't change the owner of a return if the new owner is nested
inside the old owner.  Closes SI-5612.

1 files changed, 15 insertions, 0 deletions

diff --git a/test/files/run/nonlocalreturn.scala b/test/files/run/nonlocalreturn.scala
new file mode 100644
index 0000000000..3c1e7420ed
--- /dev/null
+++ b/test/files/run/nonlocalreturn.scala
@@ -0,0 +1,15 @@
+object Test {
+  def wrap[K](body: => K): K = body
+
+  def f(): Option[Int] = {
+    wrap({ return Some(1) ; None })
+  }
+
+  def main(args: Array[String]) {
+    println(f())
+  }
+}
+// java.lang.ClassCastException: scala.Some cannot be cast to scala.None$
+//  at Test$$anonfun$f$1.apply(nonlocalreturn.scala:5)
+//  at Test$$anonfun$f$1.apply(nonlocalreturn.scala:5)
+//  at Test$.wrap(nonlocalreturn.scala:2)