From c35c9c77a976b06aeae04d15493ec4995a2a6448 Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@gmail.com>
Date: Thu, 27 Aug 2015 22:12:28 +0200
Subject: Revert workaround for SI-8334

The new optimizer doesn't have this problem.
---
 test/files/pos/list-optim-check.flags |  1 -
 test/files/pos/list-optim-check.scala | 21 ---------------------
 test/files/run/t8334.scala            | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 22 deletions(-)
 delete mode 100644 test/files/pos/list-optim-check.flags
 delete mode 100644 test/files/pos/list-optim-check.scala
 create mode 100644 test/files/run/t8334.scala

(limited to 'test/files')

diff --git a/test/files/pos/list-optim-check.flags b/test/files/pos/list-optim-check.flags
deleted file mode 100644
index 49d036a887..0000000000
--- a/test/files/pos/list-optim-check.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimize
diff --git a/test/files/pos/list-optim-check.scala b/test/files/pos/list-optim-check.scala
deleted file mode 100644
index f6e6ddec77..0000000000
--- a/test/files/pos/list-optim-check.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-// Tests a map known to crash in optimizer with faster List map in SI-8240.
-// Equivalent tests for collect and flatmap do not crash, but are provided
-// anyway.
-// See ticket SI-8334 for optimizer bug.
-// TODO - Remove this test once SI-8334 is fixed and has its own test.
-class A {
-  def f: Boolean = {
-    val xs = Nil map (_ => return false)
-    true
-  }
-
-  def g: Boolean = {
-    val xs = Nil collect { case _ => return false }
-    true
-  }
-
-  def h: Boolean = {
-    val xs = Nil flatMap { _ => return false }
-    true
-  }
-}
diff --git a/test/files/run/t8334.scala b/test/files/run/t8334.scala
new file mode 100644
index 0000000000..bc7e97bd04
--- /dev/null
+++ b/test/files/run/t8334.scala
@@ -0,0 +1,17 @@
+object Test extends App {
+  def f: Boolean = {
+    val xs = Nil map (_ => return false)
+    true
+  }
+
+  def g: Boolean = {
+    val xs = Nil collect { case _ => return false }
+    true
+  }
+
+  def h: Boolean = {
+    val xs = Nil flatMap { _ => return false }
+    true
+  }
+  assert(f && g && h)
+}
-- 
cgit v1.2.3