4 files changed, 26 insertions, 0 deletions
diff --git a/test/files/run/t8601.flags b/test/files/run/t8601.flags
new file mode 100644
index 0000000000..1182725e86
--- /dev/null
+++ b/test/files/run/t8601.flags
@@ -0,0 +1 @@
+-optimize
+\ No newline at end of file
diff --git a/test/files/run/t8601.scala b/test/files/run/t8601.scala
new file mode 100644
index 0000000000..e1afc23cc4
--- /dev/null
+++ b/test/files/run/t8601.scala
@@ -0,0 +1,15 @@
+object Test {
+  def idiv(x: Int): Unit = x / 0
+  def ldiv(x: Long): Unit = x / 0
+  def irem(x: Int): Unit = x % 0
+  def lrem(x: Long): Unit = x % 0
+
+  def check(x: => Any) = try { x; sys.error("failed to throw divide by zero!") } catch { case _: ArithmeticException => }
+
+  def main(args: Array[String]) {
+    check(idiv(1))
+    check(ldiv(1L))
+    check(irem(1))
+    check(lrem(1L))
+  }
+}
diff --git a/test/files/run/t8601b.flags b/test/files/run/t8601b.flags
new file mode 100644
index 0000000000..1182725e86
--- /dev/null
+++ b/test/files/run/t8601b.flags
@@ -0,0 +1 @@
+-optimize
+\ No newline at end of file
diff --git a/test/files/run/t8601b.scala b/test/files/run/t8601b.scala
new file mode 100644
index 0000000000..42b562af96
--- /dev/null
+++ b/test/files/run/t8601b.scala
@@ -0,0 +1,9 @@
+object Test {
+  def len(x: Array[String]): Unit = x.length
+
+  def check(x: => Any) = try { x; sys.error("failed to throw NPE!") } catch { case _: NullPointerException => }
+
+  def main(args: Array[String]) {
+    check(len(null))
+  }
+}