From 6543b2d983a4e44ad9bd2ea036d53ce52c37284c Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Wed, 15 Feb 2012 12:14:49 -0800
Subject: [PATCH] Revert "Fix for SI-5452."

This reverts commit 2b731911e97a281e324060099631e2374b2144ec.
---
 .../tools/nsc/typechecker/ContextErrors.scala |  4 +--
 test/files/neg/t5452.check                    |  6 ----
 test/files/neg/t5452.scala                    | 29 -------------------
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 test/files/neg/t5452.check
 delete mode 100644 test/files/neg/t5452.scala

diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
index 466b5125a8bb..6ee09d064f12 100644
--- a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
@@ -714,11 +714,9 @@ trait ContextErrors {
         setError(tree)
       }
 
-      def NoBestMethodAlternativeError(tree: Tree, argtpes: List[Type], pt: Type) = {
+      def NoBestMethodAlternativeError(tree: Tree, argtpes: List[Type], pt: Type) =
         issueNormalTypeError(tree,
           applyErrorMsg(tree, " cannot be applied to ", argtpes, pt))
-        setError(tree)
-      }
 
       def AmbiguousMethodAlternativeError(tree: Tree, pre: Type, best: Symbol,
             firstCompeting: Symbol, argtpes: List[Type], pt: Type) = {
diff --git a/test/files/neg/t5452.check b/test/files/neg/t5452.check
deleted file mode 100644
index baf544499bc5..000000000000
--- a/test/files/neg/t5452.check
+++ /dev/null
@@ -1,6 +0,0 @@
-t5452.scala:28: error: overloaded method value apply with alternatives:
-
- cannot be applied to (Queryable[CoffeesTable])
-  Queryable[CoffeesTable](  q.treeFilter(null)  )
-           ^
-one error found
diff --git a/test/files/neg/t5452.scala b/test/files/neg/t5452.scala
deleted file mode 100644
index 1032db7a4b48..000000000000
--- a/test/files/neg/t5452.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-// /scala/trac/5452/a.scala
-// Mon Feb 13 22:52:36 PST 2012
-
-// import scala.reflect.mirror._
-
-trait Tree
-
-object Bip {
-  def ??? = sys.error("")
-}
-import Bip._
-
-case class Queryable[T]() {
-  def treeFilter( t:Tree ) : Queryable[T] = ???
-}
-
-object Queryable {
-  def apply[T:Manifest] = ???
-  def apply[T:Manifest]( t:Tree ) = ???
-}
-
-trait CoffeesTable{
-  def sales : Int
-}
-
-object Test extends App{
-  val q = new Queryable[CoffeesTable]
-  Queryable[CoffeesTable](  q.treeFilter(null)  )
-}