Merge pull request #735 from dotty-staging/ycheck-methods

Ycheck that methods defined in ClassInfo exist in tree.

Author: odersky

project/Build.scala

@@ -42,7 +42,7 @@ object DottyBuild extends Build {
     resolvers += Resolver.sonatypeRepo("releases"),
 
     // get libraries onboard
-    partestDeps := Seq("me.d-d" % "scala-compiler" % "2.11.5-20150619-173733-3bcd390afa",
+    partestDeps := Seq("me.d-d" % "scala-compiler" % "2.11.5-20150714-145300-2ad68448c5",
                       "org.scala-lang" % "scala-reflect" % scalaVersion.value,
                       "org.scala-lang" % "scala-library" % scalaVersion.value % "test"),
     libraryDependencies ++= partestDeps.value,

src/dotty/tools/backend/jvm/DottyBackendInterface.scala

@@ -784,7 +784,7 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{
     def decls: List[Symbol] = tp.decls.map(_.symbol).toList
 
     def members: List[Symbol] =
-      tp.memberDenots(takeAllFilter, (name, buf) => buf ++= member(name).alternatives).map(_.symbol).toList
+      tp.memberDenots(takeAllFilter, (name, buf) => buf ++= tp.member(name).alternatives).map(_.symbol).toList
 
     def typeSymbol: Symbol = tp.widenDealias.typeSymbol
 

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

@@ -223,7 +223,7 @@ object Trees {
 
     override def toText(printer: Printer) = printer.toText(this)
 
-    override def hashCode(): Int = System.identityHashCode(this)
+    override def hashCode(): Int = uniqueId // for debugging; was: System.identityHashCode(this)
     override def equals(that: Any) = this eq that.asInstanceOf[AnyRef]
   }
 

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

@@ -177,25 +177,26 @@ object Contexts {
     /** The new implicit references that are introduced by this scope */
     private var implicitsCache: ContextualImplicits = null
     def implicits: ContextualImplicits = {
-      if (implicitsCache == null )
-        implicitsCache = {
-          val implicitRefs: List[TermRef] =
-            if (isClassDefContext)
-              try owner.thisType.implicitMembers
-              catch {
-                case ex: CyclicReference => Nil
-              }
-            else if (isImportContext) importInfo.importedImplicits
-            else if (isNonEmptyScopeContext) scope.implicitDecls
-            else Nil
-          val outerImplicits =
-            if (isImportContext && importInfo.hiddenRoot.exists)
-              outer.implicits exclude importInfo.hiddenRoot
-            else
-              outer.implicits
-          if (implicitRefs.isEmpty) outerImplicits
-          else new ContextualImplicits(implicitRefs, outerImplicits)(this)
+      if (implicitsCache == null ) {
+        val outerImplicits =
+          if (isImportContext && importInfo.hiddenRoot.exists)
+            outer.implicits exclude importInfo.hiddenRoot
+          else
+            outer.implicits
+        try
+          implicitsCache = {
+            val implicitRefs: List[TermRef] =
+              if (isClassDefContext) owner.thisType.implicitMembers
+              else if (isImportContext) importInfo.importedImplicits
+              else if (isNonEmptyScopeContext) scope.implicitDecls
+              else Nil
+            if (implicitRefs.isEmpty) outerImplicits
+            else new ContextualImplicits(implicitRefs, outerImplicits)(this)
+          }
+        catch {
+          case ex: CyclicReference => implicitsCache = outerImplicits
         }
+      }
       implicitsCache
     }
 

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

@@ -241,7 +241,7 @@ object NameOps {
       case nme.clone_ => nme.clone_
     }
 
-    def specializedFor(returnType: Types.Type, args: List[Types.Type])(implicit ctx: Context): name.ThisName = {
+    def specializedFor(classTargs: List[Types.Type], classTargsNames: List[Name], methodTargs: List[Types.Type], methodTarsNames: List[Name])(implicit ctx: Context): name.ThisName = {
 
       def typeToTag(tp: Types.Type): Name = {
         tp.classSymbol match {
@@ -258,9 +258,12 @@ object NameOps {
         }
       }
 
+      val methodTags: Seq[Name] = (methodTargs zip methodTarsNames).sortBy(_._2).map(x => typeToTag(x._1))
+      val classTags: Seq[Name] = (classTargs zip classTargsNames).sortBy(_._2).map(x => typeToTag(x._1))
+
       name.fromName(name ++ nme.specializedTypeNames.prefix ++
-        args.map(typeToTag).foldRight(typeToTag(returnType))(_ ++ _) ++
-        nme.specializedTypeNames.suffix)
+        methodTags.fold(nme.EMPTY)(_ ++ _) ++ nme.specializedTypeNames.separator ++
+        classTags.fold(nme.EMPTY)(_ ++ _) ++ nme.specializedTypeNames.suffix)
     }
 
     /** If name length exceeds allowable limit, replace part of it by hash */

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

@@ -348,4 +348,25 @@ object Names {
       StringBuilder.newBuilder.mapResult(s => from.fromChars(s.toCharArray, 0, s.length))
     def apply(): Builder[Char, Name] = termNameBuilder
   }
+
+  implicit val NameOrdering: Ordering[Name] = new Ordering[Name] {
+    def compare(x: Name, y: Name): Int = {
+      if (x.isTermName && y.isTypeName) 1
+      else if (x.isTypeName && y.isTermName) -1
+      else if (x eq y) 0
+      else {
+        val until = x.length min y.length
+        var i = 0
+
+        while (i < until && x(i) == y(i)) i = i + 1
+
+        if (i < until) {
+          if (x(i) < y(i)) -1
+          else /*(x(i) > y(i))*/ 1
+        } else {
+          x.length - y.length
+        }
+      }
+    }
+  }
 }

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

@@ -559,7 +559,8 @@ object StdNames {
       final val Void: N    = "V"
       final val Object: N  = "L"
 
-      final val prefix: N = "$mc"
+      final val prefix: N = "$m"
+      final val separator: N = "c"
       final val suffix: N = "$sp"
     }
 

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

@@ -404,6 +404,14 @@ object SymDenotations {
       name.toTermName == nme.COMPANION_CLASS_METHOD ||
       name.toTermName == nme.COMPANION_MODULE_METHOD
 
+    /** Is this a syntetic method that represents conversions between representations of a value class
+      *  These methods are generated in ExtensionMethods
+      *  and used in ElimErasedValueType.
+      */
+    final def isValueClassConvertMethod(implicit ctx: Context) =
+      name.toTermName == nme.U2EVT ||
+      name.toTermName == nme.EVT2U
+
     /** Is symbol a primitive value class? */
     def isPrimitiveValueClass(implicit ctx: Context) = defn.ScalaValueClasses contains symbol
 

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

@@ -503,6 +503,8 @@ object Symbols {
     def showKind(implicit ctx: Context): String = ctx.kindString(this)
     def showName(implicit ctx: Context): String = ctx.nameString(this)
     def showFullName(implicit ctx: Context): String = ctx.fullNameString(this)
+
+    override def hashCode() = id // for debugging.
   }
 
   type TermSymbol = Symbol { type ThisName = TermName }

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

@@ -1296,7 +1296,7 @@ object Types {
           case d: SymDenotation =>
             if (this.isInstanceOf[WithFixedSym]) d.current
             else if (d.validFor.runId == ctx.runId || ctx.stillValid(d))
-              if (prefix.isTightPrefix(d.owner) || d.isConstructor) d.current
+              if (d.exists && prefix.isTightPrefix(d.owner) || d.isConstructor) d.current
               else recomputeMember(d) // symbol could have been overridden, recompute membership
             else {
               val newd = loadDenot