Merge branch 'master' into GenASM

Author: magarciaEPFL

src/compiler/scala/tools/nsc/matching/Patterns.scala

@@ -49,7 +49,7 @@ trait Patterns extends ast.TreeDSL {
 
   // 8.1.1 (b)
   case class WildcardPattern() extends Pattern {
-    val tree = EmptyTree
+    def tree = EmptyTree
     override def covers(sym: Symbol) = true
     override def isDefault = true
     override def description = "_"

src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala

@@ -511,7 +511,17 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
        *  was both already used for a map and mucho long.  So "sClass" is the
        *  specialized subclass of "clazz" throughout this file.
        */
-      val sClass = clazz.owner.newClass(specializedName(clazz, env0).toTypeName, clazz.pos, (clazz.flags | SPECIALIZED) & ~CASE)
+      
+      // SI-5545: Eliminate classes with the same name loaded from the bytecode already present - all we need to do is
+      // to force .info on them, as their lazy type will be evaluated and the symbols will be eliminated. Unfortunately
+      // evaluating the info after creating the specialized class will mess the specialized class signature, so we'd
+      // better evaluate it before creating the new class symbol 
+      val clazzName = specializedName(clazz, env0).toTypeName
+      val bytecodeClazz = clazz.owner.info.decl(clazzName)      
+      debuglog("Specializing " + clazz + " found " + bytecodeClazz + " already there")
+      bytecodeClazz.info
+      
+      val sClass = clazz.owner.newClass(clazzName, clazz.pos, (clazz.flags | SPECIALIZED) & ~CASE)
 
       def cloneInSpecializedClass(member: Symbol, flagFn: Long => Long) =
         member.cloneSymbol(sClass, flagFn(member.flags | SPECIALIZED))

src/compiler/scala/tools/nsc/typechecker/Infer.scala

@@ -1385,9 +1385,10 @@ trait Infer {
               case _ =>
             }
           }
+          // todo: missing test case
           NoBestExprAlternativeError(tree, pt)
         } else if (!competing.isEmpty) {
-          if (secondTry) NoBestExprAlternativeError(tree, pt)
+          if (secondTry) { NoBestExprAlternativeError(tree, pt); setError(tree) }
           else if (!pt.isErroneous) AmbiguousExprAlternativeError(tree, pre, best, competing.head, pt)
         } else {
 //          val applicable = alts1 filter (alt =>

src/compiler/scala/tools/nsc/typechecker/Typers.scala

@@ -604,6 +604,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
      *  1. Check that non-function pattern expressions are stable
      *  2. Check that packages and static modules are not used as values
      *  3. Turn tree type into stable type if possible and required by context.
+     *  4. Give getClass calls a more precise type based on the type of the target of the call.
      */
     private def stabilize(tree: Tree, pre: Type, mode: Int, pt: Type): Tree = {
       if (tree.symbol.isOverloaded && !inFunMode(mode))
@@ -627,7 +628,18 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
         if (sym.isStable && pre.isStable && !isByNameParamType(tree.tpe) &&
             (isStableContext(tree, mode, pt) || sym.isModule && !sym.isMethod))
           tree.setType(singleType(pre, sym))
-        else tree
+        // To fully benefit from special casing the return type of
+        // getClass, we have to catch it immediately so expressions
+        // like x.getClass().newInstance() are typed with the type of x.
+        else if (  tree.symbol.name == nme.getClass_
+                && tree.tpe.params.isEmpty
+                // TODO: If the type of the qualifier is inaccessible, we can cause private types
+                // to escape scope here, e.g. pos/t1107.  I'm not sure how to properly handle this
+                // so for now it requires the type symbol be public.
+                && pre.typeSymbol.isPublic)
+          tree setType MethodType(Nil, erasure.getClassReturnType(pre))
+        else
+          tree
       }
     }
 
@@ -3802,7 +3814,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
           if (settings.warnSelectNullable.value && isPotentialNullDeference && unit != null)
             unit.warning(tree.pos, "potential null pointer dereference: "+tree)
 
-          val selection = result match {
+          result match {
             // could checkAccessible (called by makeAccessible) potentially have skipped checking a type application in qual?
             case SelectFromTypeTree(qual@TypeTree(), name) if qual.tpe.typeArgs nonEmpty => // TODO: somehow the new qual is not checked in refchecks
               treeCopy.SelectFromTypeTree(
@@ -3824,22 +3836,6 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
             case _ =>
               result
           }
-          // To fully benefit from special casing the return type of
-          // getClass, we have to catch it immediately so expressions
-          // like x.getClass().newInstance() are typed with the type of x.
-          val isRefinableGetClass = (
-            !selection.isErrorTyped
-            && selection.symbol.name == nme.getClass_
-            && selection.tpe.params.isEmpty
-            // TODO: If the type of the qualifier is inaccessible, we can cause private types
-            // to escape scope here, e.g. pos/t1107.  I'm not sure how to properly handle this
-            // so for now it requires the type symbol be public.
-            && qual.tpe.typeSymbol.isPublic
-          )
-          if (isRefinableGetClass)
-            selection setType MethodType(Nil, erasure.getClassReturnType(qual.tpe))
-          else
-            selection
         }
       }
 

test/files/neg/t5553_1.check

@@ -0,0 +1,54 @@
+t5553_1.scala:18: error: ambiguous reference to overloaded definition,
+both method apply in object Foo1 of type (z: String)Base[T]
+and  method apply in object Foo1 of type (a: Int)Base[T]
+match expected type ?
+  def test1[T] = Foo1[T]
+                     ^
+t5553_1.scala:19: error: type mismatch;
+ found   : [T](z: String)Base[T] <and> (a: Int)Base[T]
+ required: Int
+  def test2[T]: Int = Foo1[T]
+                          ^
+t5553_1.scala:20: error: type mismatch;
+ found   : [T(in method apply)](z: String)Base[T(in method apply)] <and> (a: Int)Base[T(in method apply)]
+ required: Base[T(in method test3)]
+  def test3[T]: Base[T] = Foo1[T]
+                              ^
+t5553_1.scala:24: error: ambiguous reference to overloaded definition,
+both method apply in object Foo2 of type (z: String)Base[T]
+and  method apply in object Foo2 of type (a: Int)Base[T]
+match expected type ?
+  def test4[T] = Foo2[T]
+                     ^
+t5553_1.scala:25: error: type mismatch;
+ found   : [T](z: String)Base[T] <and> (a: Int)Base[T]
+ required: Int
+  def test5[T]: Int = Foo2[T]
+                          ^
+t5553_1.scala:26: error: type mismatch;
+ found   : [T(in method apply)](z: String)Base[T(in method apply)] <and> (a: Int)Base[T(in method apply)]
+ required: Base[T(in method test6)]
+  def test6[T]: Base[T] = Foo2[T]
+                              ^
+t5553_1.scala:30: error: ambiguous reference to overloaded definition,
+both method apply in object Foo3 of type (z: String)String
+and  method apply in object Foo3 of type (a: Int)Base[T]
+match expected type ?
+  def test7[T] = Foo3[T]
+                     ^
+t5553_1.scala:31: error: type mismatch;
+ found   : [T](z: String)String <and> (a: Int)Base[T]
+ required: String
+  def test8[T]: String = Foo3[T]
+                             ^
+t5553_1.scala:32: error: type mismatch;
+ found   : [T](z: String)String <and> (a: Int)Base[T]
+ required: Int
+  def test9[T]: Int = Foo3[T]
+                          ^
+t5553_1.scala:33: error: type mismatch;
+ found   : [T(in method apply)](z: String)String <and> (a: Int)Base[T(in method apply)]
+ required: Base[T(in method test10)]
+  def test10[T]: Base[T] = Foo3[T]
+                               ^
+10 errors found

test/files/neg/t5553_1.scala

@@ -0,0 +1,34 @@
+class Base[T]
+
+object Foo1 {
+  def apply[T](a: Int): Base[T] = new Base[T]
+  def apply[T](z: String): Base[T] = new Base[T]
+}
+
+object Foo2 {
+  def apply[T](a: Int): Base[T] = new Base[T]
+  def apply[T](z: String="abc"): Base[T] = new Base[T]
+}
+
+object Foo3 {
+  def apply[T](a: Int): Base[T] = new Base[T]
+  def apply[T](z: String="abc"): String = z
+}
+object Test {
+  def test1[T] = Foo1[T]
+  def test2[T]: Int = Foo1[T]
+  def test3[T]: Base[T] = Foo1[T]
+}
+
+object Test2 {
+  def test4[T] = Foo2[T]
+  def test5[T]: Int = Foo2[T]
+  def test6[T]: Base[T] = Foo2[T]
+}
+
+object Test3{
+  def test7[T] = Foo3[T]
+  def test8[T]: String = Foo3[T]
+  def test9[T]: Int = Foo3[T]
+  def test10[T]: Base[T] = Foo3[T]
+}

test/files/neg/t5553_2.check

@@ -0,0 +1,50 @@
+t5553_2.scala:27: error: type mismatch;
+ found   : Base[T]
+ required: Int
+  def test4[T]: Int     = Foo1[T](1)
+                                 ^
+t5553_2.scala:34: error: type mismatch;
+ found   : String
+ required: Base[T]
+  def test7[T]: Base[T] = Foo2[T]
+                              ^
+t5553_2.scala:35: error: type mismatch;
+ found   : String
+ required: Int
+  def test8[T]: Int     = Foo2[T]
+                              ^
+t5553_2.scala:40: error: type mismatch;
+ found   : String
+ required: Int
+  def test9[T]: Int     = Foo3[T]
+                              ^
+t5553_2.scala:41: error: type mismatch;
+ found   : String
+ required: Base[T]
+  def test10[T]: Base[T] = Foo3[T]
+                               ^
+t5553_2.scala:47: error: could not find implicit value for parameter z: String
+  def test13[T]: Int     = Foo3[T]
+                               ^
+t5553_2.scala:48: error: could not find implicit value for parameter z: String
+  def test14[T]: Base[T] = Foo3[T]
+                               ^
+t5553_2.scala:49: error: could not find implicit value for parameter z: String
+  def test15[T]: String = Foo3[T]
+                              ^
+t5553_2.scala:50: error: could not find implicit value for parameter z: String
+  def test16[T]         = Foo3[T]
+                              ^
+t5553_2.scala:54: error: ambiguous reference to overloaded definition,
+both method apply in object Foo4 of type (x: Int)(implicit z: String)Base[T]
+and  method apply in object Foo4 of type (x: Int)Base[T]
+match argument types (Int)
+  def test17[T]          = Foo4[T](1)
+                               ^
+t5553_2.scala:55: error: ambiguous reference to overloaded definition,
+both method apply in object Foo4 of type (x: Int)(implicit z: String)Base[T]
+and  method apply in object Foo4 of type (x: Int)Base[T]
+match argument types (Int) and expected result type Base[T]
+  def test18[T]: Base[T] = Foo4[T](1)
+                               ^
+11 errors found

test/files/neg/t5553_2.scala

@@ -0,0 +1,59 @@
+class Base[T]
+
+object Foo1 {
+  def apply[T](x: Int): Base[T] = new Base[T]
+  def apply[T](x: Int, z: String="abc"): String = z
+}
+
+object Foo2 {
+  def apply[T](a: Int): Base[T] = new Base[T]
+  def apply[T]: String = "abc"
+}
+
+object Foo3 {
+  def apply[T](x: Int): Base[T] = new Base[T]
+  def apply[T](implicit z: String): String = z
+}
+
+object Foo4 {
+  def apply[T](x: Int): Base[T] = new Base[T]
+  def apply[T](x: Int)(implicit z: String): Base[T] = new Base[T]
+}
+
+object Test1 {
+  def test1[T]          = Foo1[T](1)
+  def test2[T]: String  = Foo1[T](1)
+  def test3[T]: Base[T] = Foo1[T](1)
+  def test4[T]: Int     = Foo1[T](1)
+
+}
+
+object Test2 {
+  def test5[T]          = Foo2[T]
+  def test6[T]: String  = Foo2[T]
+  def test7[T]: Base[T] = Foo2[T]
+  def test8[T]: Int     = Foo2[T]
+}
+
+object Test3 {
+  implicit val v: String = "abc"
+  def test9[T]: Int     = Foo3[T]
+  def test10[T]: Base[T] = Foo3[T]
+  def test11[T]: String  = Foo3[T]
+  def test12[T]          = Foo3[T]
+}
+
+object Test4 {
+  def test13[T]: Int     = Foo3[T]
+  def test14[T]: Base[T] = Foo3[T]
+  def test15[T]: String = Foo3[T]
+  def test16[T]         = Foo3[T]
+}
+
+object Test5 {
+  def test17[T]          = Foo4[T](1)
+  def test18[T]: Base[T] = Foo4[T](1)
+  //def test19[T]: String  = Foo4[T](1) // #5554
+}
+
+

test/files/pos/t5546.scala

@@ -0,0 +1 @@
+class A { def foo: Class[_ <: A] = getClass }

test/files/run/t5545.check

@@ -0,0 +1,27 @@
+import scala.tools.partest._
+import java.io._
+
+object Test extends DirectTest {
+
+  override def extraSettings: String = "-usejavacp -d " + testOutput.path + " -cp " + testOutput.path
+
+  override def code = """
+    // SI-5545
+    trait F[@specialized(Int) T1, R] {
+      def f(v1: T1): R
+      def g = v1 => f(v1)
+    }
+  """.trim
+
+  override def show(): Unit = {
+    // redirect err to out, for logging
+    val prevErr = System.err
+    System.setErr(System.out)
+    compile()
+    // the bug manifests at the second compilation, when the bytecode is already there
+    compile()
+    System.setErr(prevErr)
+  }
+
+  override def isDebug = false // so we don't get the newSettings warning
+}