From a928d99799be8f9ab567b5aca5e21cdd861fb5df Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Mon, 15 Dec 2014 17:48:49 +0100
Subject: Fix typechecking rules for Binds of type trees.

---
 src/dotty/tools/dotc/typer/TypeAssigner.scala |  4 ++--
 src/dotty/tools/dotc/typer/Typer.scala        |  9 ++++++---
 tests/pos/i0290-type-bind.scala               | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 tests/pos/i0290-type-bind.scala

diff --git a/src/dotty/tools/dotc/typer/TypeAssigner.scala b/src/dotty/tools/dotc/typer/TypeAssigner.scala
index 0f1b81be8..17d6478fe 100644
--- a/src/dotty/tools/dotc/typer/TypeAssigner.scala
+++ b/src/dotty/tools/dotc/typer/TypeAssigner.scala
@@ -357,8 +357,8 @@ trait TypeAssigner {
   def assignType(tree: untpd.TypeBoundsTree, lo: Tree, hi: Tree)(implicit ctx: Context) =
     tree.withType(TypeBounds(lo.tpe, hi.tpe))
 
-  def assignType(tree: untpd.Bind, sym: TermSymbol)(implicit ctx: Context) =
-    tree.withType(TermRef(NoPrefix, sym))
+  def assignType(tree: untpd.Bind, sym: Symbol)(implicit ctx: Context) =
+    tree.withType(NamedType.withFixedSym(NoPrefix, sym))
 
   def assignType(tree: untpd.Alternative, trees: List[Tree])(implicit ctx: Context) =
     tree.withType(ctx.typeComparer.lub(trees.tpes))
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala
index f6027165b..10bc59a1a 100644
--- a/src/dotty/tools/dotc/typer/Typer.scala
+++ b/src/dotty/tools/dotc/typer/Typer.scala
@@ -776,7 +776,10 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
 
   def typedAppliedTypeTree(tree: untpd.AppliedTypeTree)(implicit ctx: Context): AppliedTypeTree = track("typedAppliedTypeTree") {
     val tpt1 = typed(tree.tpt)
-    val args1 = tree.args mapconserve (typed(_))
+    val argPts =
+      if (ctx.mode is Mode.Pattern) tpt1.tpe.typeParams.map(_.info)
+      else tree.args.map(_ => WildcardType)
+    val args1 = tree.args.zipWithConserve(argPts)(typed(_, _)).asInstanceOf[List[Tree]]
     // check that arguments conform to bounds is done in phase FirstTransform
     assignType(cpy.AppliedTypeTree(tree)(tpt1, args1), tpt1, args1)
   }
@@ -798,7 +801,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
   def typedBind(tree: untpd.Bind, pt: Type)(implicit ctx: Context): Bind = track("typedBind") {
     val body1 = typed(tree.body, pt)
     typr.println(i"typed bind $tree pt = $pt bodytpe = ${body1.tpe}")
-    val sym = ctx.newSymbol(ctx.owner, tree.name.asTermName, EmptyFlags, body1.tpe, coord = tree.pos)
+    val sym = ctx.newSymbol(ctx.owner, tree.name, EmptyFlags, body1.tpe, coord = tree.pos)
     assignType(cpy.Bind(tree)(tree.name, body1), sym)
   }
 
@@ -1339,7 +1342,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
               }
             case _ =>
               if (ctx.mode is Mode.Type)
-                if (tree.tpe <:< pt) tree
+                if ((ctx.mode is Mode.Pattern) || tree.tpe <:< pt) tree
                 else err.typeMismatch(tree, pt)
               else adaptNoArgs(wtp)
           }
diff --git a/tests/pos/i0290-type-bind.scala b/tests/pos/i0290-type-bind.scala
new file mode 100644
index 000000000..83fdbbcc5
--- /dev/null
+++ b/tests/pos/i0290-type-bind.scala
@@ -0,0 +1,19 @@
+object foo{
+  val x = List(1,2,3)
+  x match {
+    case t: List[tt] => t.head.asInstanceOf[tt]
+  }
+}
+
+object bar {
+
+  class C[T <: Seq[_]]
+
+  val x: AnyRef = new C
+
+  x match {
+    case x: C[u] =>
+      def x: u = x
+      val s: Seq[_] = x
+  }
+}
-- 
cgit v1.2.3