Add casts, and debug implementation

An issue occurs when trying to specialize certain methods when relying
on typer only - this is described by scala#592 , and occured in test
`this_specialization`.
        # with '#' will be ignored, and an empty message aborts the commit.

Author: AlexSikia

src/dotty/tools/dotc/ast/Trees.scala

@@ -109,8 +109,9 @@ object Trees {
      */
     val uniqueId = {
       nextId += 1
-      if (nextId == 72)
-        println("asdsad")
+      /*if (nextId == 246) {
+        println()
+      }*/
       //assert(nextId != 214, this)
       nextId
     }

src/dotty/tools/dotc/core/Symbols.scala

@@ -344,9 +344,9 @@ object Symbols {
 
     type ThisName <: Name
     private[this] var _id: Int = nextId
-    if (_id == 16651) {
-      println("plop")
-    }
+    /*if (_id == 29792) {
+      println()
+    }*/
     //assert(_id != 30214)
 
     /** The unique id of this symbol */

src/dotty/tools/dotc/transform/TypeSpecializer.scala

@@ -2,7 +2,6 @@ package dotty.tools.dotc.transform
 
 import dotty.tools.dotc.ast.{tpd, TreeTypeMap}
 import dotty.tools.dotc.ast.Trees._
-import dotty.tools.dotc.core.Annotations.Annotation
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Decorators.StringDecorator
 import dotty.tools.dotc.core.DenotTransformers.InfoTransformer
@@ -13,6 +12,7 @@ import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.transform.TreeTransforms.{TransformerInfo, MiniPhaseTransform}
 import scala.collection.mutable
 import dotty.tools.dotc.core.StdNames.nme
+import dotty.tools._
 
 class TypeSpecializer extends MiniPhaseTransform  with InfoTransformer {
 
@@ -176,36 +176,34 @@ class TypeSpecializer extends MiniPhaseTransform  with InfoTransformer {
               val tmap: (Tree => Tree) = _ match {
                 case Return(t, from) if from.symbol == tree.symbol => Return(t, ref(newSym))
                 case t: TypeApply => transformTypeApply(t)
-                case t: Apply =>
-                  transformApply(t)
+                case t: Apply => transformApply(t)
                 case t => t
               }
-              val tp = new TreeMap() {
-                  // needed to workaround https://github.com/lampepfl/dotty/issues/592
-                  override def transform(t: Tree)(implicit ctx: Context) = super.transform(t) match {
-                  case t @ Apply(fun, args) =>
-                    val newArgs = (args zip fun.tpe.firstParamTypes).map{case(t, tpe) => t.ensureConforms(tpe)}
-                    if (sameTypes(args, newArgs)) {
-                      t
-                    } else tpd.Apply(fun, newArgs)
-                  case t: ValDef =>
-                    cpy.ValDef(t)(rhs = t.rhs.ensureConforms(t.tpe.widen))
-                  case t: DefDef =>
-                    cpy.DefDef(t)(rhs = t.rhs.ensureConforms(t.tpe.finalResultType))
-                  case t => t
-                }
-              }
 
               val typesReplaced = new TreeTypeMap(
                 treeMap = tmap,
                 typeMap = _
                     .substDealias(origTParams, instantiations(index))
-                    .subst(origVParams, vparams.flatten.map(_.tpe))
-                ,
+                    .subst(origVParams, vparams.flatten.map(_.tpe)),
                 oldOwners = tree.symbol :: Nil,
                 newOwners = newSym :: Nil
               ).transform(tree.rhs)
 
+              val tp = new TreeMap() {
+              // needed to workaround https://github.com/lampepfl/dotty/issues/592
+              override def transform(t: Tree)(implicit ctx: Context) = super.transform(t) match {
+                case t @ Apply(fun, args) =>
+                  assert(sameLength(args, fun.tpe.widen.firstParamTypes))
+                  val newArgs = (args zip fun.tpe.widen.firstParamTypes).map{case(t, tpe) => t.ensureConforms(tpe)}
+                  if (sameTypes(args, newArgs)) {
+                    t
+                  } else tpd.Apply(fun, newArgs)
+                case t: ValDef =>
+                  cpy.ValDef(t)(rhs = if(t.rhs.isEmpty) EmptyTree else t.rhs.ensureConforms(t.tpt.tpe))
+                case t: DefDef =>
+                  cpy.DefDef(t)(rhs = if(t.rhs.isEmpty) EmptyTree else t.rhs.ensureConforms(t.tpt.tpe))
+                case t => t
+              }}
               val expectedTypeFixed = tp.transform(typesReplaced)
               expectedTypeFixed.ensureConforms(newSym.info.widen.finalResultType)
             }})
@@ -228,23 +226,13 @@ class TypeSpecializer extends MiniPhaseTransform  with InfoTransformer {
     val Apply(fun, args) = tree
     fun match {
       case fun: TypeApply => {
-        println(
-          s"""
-               |args             ->  ${args}
-
-              |f.fun            ->  ${fun.fun.tree}
-             """.stripMargin)
-
         val newFun = rewireTree(fun)
         if (fun ne newFun) {
-        val b = (args zip newFun.tpe.firstParamTypes)
-        val a = b.map{
+        val as = (args zip newFun.tpe.widen.firstParamTypes).map{
           case (arg, tpe) =>
             arg.ensureConforms(tpe)
         }
-        Apply(newFun,a)
-        /* zip (instantiations zip paramTypes)).map{
-              case (argType, (specType, castType)) => argType.ensureConforms(specType)})*/
+        Apply(newFun,as)
         } else tree
       }
       case _ => tree

test/dotc/tests.scala

@@ -207,19 +207,18 @@ class tests extends CompilerTest {
 
   val javaDir = "./tests/pos/java-interop/"
   @Test def java_all = compileFiles(javaDir, twice)
-
 */
-  //@Test def specialization = compileFile(specialDir, "specialization")
-  //@Test def mutual_spec = compileFile(specialDir, "mutual_specialization", List("-Xprint:all"))
-  //@Test def return_spec = compileFile(specialDir, "return_specialization")
-  //  @Test def nothing_spec = compileFile(specialDir, "nothing_specialization")
-  //  @Test def method_in_class_spec = compileFile(specialDir, "method_in_class_specialization")
-  //  @Test def method_in_method_spec = compileFile(specialDir, "method_in_method_specialization")
-  //  @Test def pos_type_check = compileFile(specialDir, "type_test")
-  //  @Test def bounds_spec = compileFile(specialDir, "bounds_specialization")
-  //  @Test def multi_spec = compileFile(specialDir, "multi_specialization")
-  //  @Test def pos_spec_all = compileFiles(specialDir)
-    @Test def pos_this_specialization = compileFile(specialDir, "this_specialization", List("-Xprint:specialize"))
+  @Test def specialization = compileFile(specialDir, "specialization", List("-Xprint:specialize"))
+  @Test def mutual_spec = compileFile(specialDir, "mutual_specialization", List("-Xprint:specialize"))
+  @Test def return_spec = compileFile(specialDir, "return_specialization", List("-Xprint:specialize"))
+  @Test def nothing_spec = compileFile(specialDir, "nothing_specialization", List("-Xprint:specialize"))
+  @Test def method_in_class_spec = compileFile(specialDir, "method_in_class_specialization", List("-Xprint:specialize"))
+  @Test def method_in_method_spec = compileFile(specialDir, "method_in_method_specialization", List("-Xprint:specialize"))
+  @Test def pos_type_check = compileFile(specialDir, "type_test", List("-Xprint:specialize"))
+  @Test def bounds_spec = compileFile(specialDir, "bounds_specialization", List("-Xprint:specialize"))
+  @Test def multi_spec = compileFile(specialDir, "multi_specialization", List("-Xprint:specialize"))
+  @Test def pos_this_specialization = compileFile(specialDir, "this_specialization", List("-Xprint:specialize"))
+  @Test def pos_spec_all = compileFiles(specialDir)
 
   //@Test def mini_method = compileFiles(miniMethodDir)//, List("-Xprint:all"))
   //@Test def mini_more = compileFiles(miniMoreDir)//, List("-Xprint:all"))

tests/pos/specialization/method_in_method_specialization.scala

@@ -10,4 +10,10 @@ object method_in_method_specialization {
 
   outer(2)
   outer('d')
+
+  def outer2[@specialized(Int) O](o: O): Int = {
+    def inner2[@specialized(Int) I] (i: I) = 1
+    inner2(42)
+  }
+  outer2(1)
 }

tests/pos/specialization/multi_specialization.scala

@@ -2,4 +2,8 @@ object multi_specialization {
   def one[@specialized T](n: T): T = n
   def two[@specialized T, U](n: T, m: U): (T,U) = (n,m)
   def three[@specialized T, U, V](n: T, m: U, o: V): (T,U,V) = (n,m,o)
+
+  one(1)
+  two(1,2)
+  two('a', null)
 }

tests/pos/specialization/nothing_specialization.scala

@@ -1,7 +1,8 @@
 object nothing_specialization {
-  def ret_nothing[@specialized T] = {
+  def ret_nothing[@specialized(Char) T] = {
     //val a: List[T] = List[Nothing]()
-    def apply[@specialized X](xs : X*) : List[X] = List(xs:_*)
-    def apply6[@specialized X](xs : Nothing*) : List[Nothing] = List(xs: _*)
+    def apply[@specialized(Char) X](xs : X*) : List[X] = List(xs:_*)
+    def apply6[@specialized(Char) X](xs : Nothing*) : List[Nothing] = List(xs: _*)
+    def apply2[@specialized(Long) U] = 1.asInstanceOf[U]
   }
 }

tests/pos/specialization/specialization.scala

@@ -1,15 +1,14 @@
-class specialization {
+trait specialization {
   def printer1[@specialized(Int, Long) T](a: T) = {
     println(a.toString)
   }
-
   def printer2[@specialized(Int, Long) T, U](a: T, b: U) = {
     println(a.toString + b.toString)
   }
-  def print(a: Int) = {
-    printer1(a)
+  def print(i: Int) = {
+    printer1(i)
     println(" ---- ")
-    printer2(a,a)
+    printer2(i,i)
   }
   print(9)
 }