summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-01-30 16:05:46 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-01-30 16:05:46 -0800
commit62681e191a101213a6af65bb88d77230f1f5d663 (patch)
tree0981586d45880072ab0de63778fd1be7b6cec77d /test
parentccd7abe897ab23056e6bf66f02c279647dfe3a57 (diff)
parentd3f3394fbdfbc82111b9aff71f0e32e2ad578d98 (diff)
downloadscala-62681e191a101213a6af65bb88d77230f1f5d663.tar.gz
scala-62681e191a101213a6af65bb88d77230f1f5d663.tar.bz2
scala-62681e191a101213a6af65bb88d77230f1f5d663.zip
Merge pull request #2007 from retronym/backport/1021
[backport] Fix for SI-6154, VerifyError originating in uncurry.
Diffstat (limited to 'test')
-rw-r--r--test/files/run/t6154.check1
-rw-r--r--test/files/run/t6154.scala10
2 files changed, 11 insertions, 0 deletions
diff --git a/test/files/run/t6154.check b/test/files/run/t6154.check
new file mode 100644
index 0000000000..9766475a41
--- /dev/null
+++ b/test/files/run/t6154.check
@@ -0,0 +1 @@
+ok
diff --git a/test/files/run/t6154.scala b/test/files/run/t6154.scala
new file mode 100644
index 0000000000..02ef62905f
--- /dev/null
+++ b/test/files/run/t6154.scala
@@ -0,0 +1,10 @@
+object Test {
+ def foo(a: Int) {
+ var bar: Int = 0
+ bar = try { 0 } catch { case ex: Throwable => 0 }
+ new { foo(bar) }
+ }
+
+ def main(args: Array[String]): Unit =
+ try foo(0) catch { case _: java.lang.StackOverflowError => println("ok") }
+}