From edaa193aac1d7880a81cd6a836fe3d7c3d652d45 Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Fri, 14 Aug 2015 18:57:34 -0700
Subject: Fix CaputuredVars/LiftTry interaction.

CapturedVars introduced an assignment that could cause a try to be
executed with a non-empty stack, even after LiftTry had already run.
We now avoid this by introducing a temporary variable.
---
 tests/run/liftedTry.scala | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/run/liftedTry.scala b/tests/run/liftedTry.scala
index 2e4c25c2b..0d956fc1f 100644
--- a/tests/run/liftedTry.scala
+++ b/tests/run/liftedTry.scala
@@ -12,10 +12,20 @@ object Test {
 
   foo(try 3 catch handle)
 
-  def main(args: Array[String]) = {
+  def main(args: Array[String]): Unit = {
     assert(x == 1)
     assert(foo(2) == 2)
     assert(foo(try raise(3) catch handle) == 3)
+    Tr.foo
   }
 }
 
+
+object Tr {
+  def fun(a: Int => Unit) = a(2)
+  def foo: Int = {
+    var s = 1
+    s = try {fun(s = _); 3} catch{ case ex: Throwable => s = 4; 5 }
+    s
+  }
+}
-- 
cgit v1.2.3