summaryrefslogtreecommitdiff
path: root/test/files/run
diff options
context:
space:
mode:
authorJosh Suereth <Joshua.Suereth@gmail.com>2012-07-30 17:37:24 -0700
committerJosh Suereth <Joshua.Suereth@gmail.com>2012-07-30 17:37:24 -0700
commit8a2df611d2390caa4c2e1b56433408654dfc9d9a (patch)
treeec986e40924bc74cf2f0bad8b99a2cd5a298ab77 /test/files/run
parent4f248da9e8c00ea6b75b1042c50335ab53e19ab2 (diff)
parent48f8235822a2a100d6c4e8d3d7349df565ac6d40 (diff)
downloadscala-8a2df611d2390caa4c2e1b56433408654dfc9d9a.tar.gz
scala-8a2df611d2390caa4c2e1b56433408654dfc9d9a.tar.bz2
scala-8a2df611d2390caa4c2e1b56433408654dfc9d9a.zip
Merge pull request #1021 from paulp/issue/6154
Fix for SI-6154, VerifyError originating in uncurry.
Diffstat (limited to 'test/files/run')
-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") }
+}