fixes a problem with an extractor object overloaded by a regular def

3 files changed, 42 insertions, 1 deletions

diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala
index 09e7303b90..81582db5f2 100644
--- a/src/compiler/scala/reflect/internal/Types.scala
+++ b/src/compiler/scala/reflect/internal/Types.scala
@@ -2663,6 +2663,10 @@ trait Types extends api.Types { self: SymbolTable =>
     override def kind = "OverloadedType"
   }
 
+  def overloadedType(pre: Type, alternatives: List[Symbol]): Type =
+    if (alternatives.tail.isEmpty) pre memberType alternatives.head
+    else OverloadedType(pre, alternatives)
+
   /** A class remembering a type instantiation for some a set of overloaded
    *  polymorphic symbols.
    *  Not used after phase `typer`.
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 34e1aaedfd..b5e58efaff 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -958,9 +958,14 @@ trait Typers extends Modes with Adaptations with Taggings {
        * see test/files/../t5189*.scala
        */
       def adaptConstrPattern(): Tree = { // (5)
-        val extractor = tree.symbol.filter(sym => reallyExists(unapplyMember(sym.tpe)))
+        def isExtractor(sym: Symbol) = reallyExists(unapplyMember(sym.tpe))
+        val extractor = tree.symbol filter isExtractor
         if (extractor != NoSymbol) {
           tree setSymbol extractor
+          tree.tpe match {
+            case OverloadedType(pre, alts) => tree.tpe = overloadedType(pre, alts filter isExtractor)
+            case _ =>
+          }
           val unapply = unapplyMember(extractor.tpe)
           val clazz = unapplyParameterType(unapply)
 
diff --git a/test/files/pos/overloaded_extractor_and_regular_def.scala b/test/files/pos/overloaded_extractor_and_regular_def.scala
new file mode 100644
index 0000000000..c8e7da5cad
--- /dev/null
+++ b/test/files/pos/overloaded_extractor_and_regular_def.scala
@@ -0,0 +1,32 @@
+trait TreesBase {
+  type Tree
+
+  type Apply <: Tree
+
+  val Apply: ApplyExtractor
+
+  abstract class ApplyExtractor {
+    def apply(x: Int): Apply
+    def unapply(apply: Apply): Option[Int]
+  }
+}
+
+trait TreesApi extends TreesBase {
+  def Apply(x: String)
+}
+
+class Universe extends TreesApi {
+  abstract class Tree
+  case class Apply(x: Int) extends Tree
+  object Apply extends ApplyExtractor
+  def Apply(x: String) = Apply(x.toInt)
+}
+
+object Test extends App {
+  def foo(tapi: TreesApi) {
+    import tapi._
+    def bar(tree: Tree) {
+      val Apply(x) = tree
+    }
+  }
+}
\ No newline at end of file