Reverts r23174, which I believe will bring the ...

Reverts r23174, which I believe will bring the build back to life. It
only chokes under -optimise. No review.

4 files changed, 0 insertions, 77 deletions

diff --git a/test/files/run/t3887.scala b/test/files/run/t3887.scala
deleted file mode 100644
index 16ce983efc..0000000000
--- a/test/files/run/t3887.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-object Test {
-    def main(args: Array[String]) {
-        assert( matchPair(1) )
-        assert( !matchPair(2) )
-    }
-
-    def matchPair(i: Int) = {
-        (i, "abc") match {
-            case this.option1 => true
-            case _ => false
-        }
-    }
-
-    val option1: (Int, String) = (1, "abc")
-
-}
diff --git a/test/files/run/t3888.scala b/test/files/run/t3888.scala
deleted file mode 100644
index ecdf87e925..0000000000
--- a/test/files/run/t3888.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-object Test {
-
-  val T1 = new P
-  private[this] val T2 = T1
-
-  def m1 =
-    (1, 2) match {
-      case T1 => true
-      case _ => false
-    }
-
-  def m2 =
-    (1, 2) match {
-      case T2 => true
-      case _ => false
-    }
-
-  def main(args: Array[String]) = {
-    assert( m1 )
-    assert( m2 )
-  }
-}
-
-class P extends Pair(1, 1) {
-  override def equals(x: Any) = true
-}
\ No newline at end of file
diff --git a/test/files/run/tuple-match.check b/test/files/run/tuple-match.check
deleted file mode 100644
index 0c1ea0005b..0000000000
--- a/test/files/run/tuple-match.check
+++ /dev/null
@@ -1,8 +0,0 @@
-4, #3
-4, #2
-4, #4
-3, #2
-2, #2
-1, #1
-FOUR
-THREE
diff --git a/test/files/run/tuple-match.scala b/test/files/run/tuple-match.scala
deleted file mode 100644
index fcaefbff5b..0000000000
--- a/test/files/run/tuple-match.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-object Test {
-  val FOUR = (-1, -2, -3, "bingo donkey vegas")
-  val THREE = (-1, -2, -3)
-
-  def f(x: Any) = x match {
-    case FOUR         => "FOUR"
-    case (_, _, 3, _) => "4, #3"
-    case (_, 2, _, _) => "4, #2"
-    case (_, 2, _)    => "3, #2"
-    case Tuple1(1)    => "1, #1"
-    case (_, _, _, 4) => "4, #4"
-    case THREE        => "THREE"
-    case (_, 2)       => "2, #2"
-    case _            => "default"
-  }
-
-  def main(args: Array[String]): Unit = {
-    println(f((1, 2, 3, 4)))
-    println(f((1, 2, 30, 4)))
-    println(f((1, 20, 30, 4)))
-    println(f((1, 2, 3)))
-    println(f((1, 2)))
-    println(f(Tuple1(1)))
-    println(f((-1, -2, -3, "bingo donkey vegas")))
-    println(f((-1, -2, -3)))
-  }
-}