Merge pull request #5999 from dotty-staging/fix-i5001

liufengyun · web-flow · commit 8aed4a00ed28 · 2019-03-07T22:08:45.000+01:00
Fix #5001: add test
diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala
@@ -308,7 +308,10 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
   def AnonClass(parents: List[Type], fns: List[TermSymbol], methNames: List[TermName])(implicit ctx: Context): Block = {
     val owner = fns.head.owner
     val parents1 =
-      if (parents.head.classSymbol.is(Trait)) parents.head.parents.head :: parents
+      if (parents.head.classSymbol.is(Trait)) {
+        val head = parents.head.parents.head
+        if (head.isRef(defn.AnyClass)) defn.AnyRefType :: parents else head :: parents
+      }
       else parents
     val cls = ctx.newNormalizedClassSymbol(owner, tpnme.ANON_CLASS, Synthetic | Final, parents1,
         coord = fns.map(_.span).reduceLeft(_ union _))
diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -184,8 +184,8 @@ class Definitions {
     arr
   }
 
-  private def completeClass(cls: ClassSymbol): ClassSymbol = {
-    ensureConstructor(cls, EmptyScope)
+  private def completeClass(cls: ClassSymbol, ensureCtor: Boolean = true): ClassSymbol = {
+    if (ensureCtor) ensureConstructor(cls, EmptyScope)
     if (cls.linkedClass.exists) cls.linkedClass.info = NoType
     cls
   }
@@ -262,7 +262,7 @@ class Definitions {
    *       def getClass: java.lang.Class[T] = ???
    *     }
    */
-  lazy val AnyClass: ClassSymbol = completeClass(enterCompleteClassSymbol(ScalaPackageClass, tpnme.Any, Abstract, Nil))
+  lazy val AnyClass: ClassSymbol = completeClass(enterCompleteClassSymbol(ScalaPackageClass, tpnme.Any, Abstract, Nil), ensureCtor = false)
   def AnyType: TypeRef = AnyClass.typeRef
   lazy val AnyValClass: ClassSymbol = completeClass(enterCompleteClassSymbol(ScalaPackageClass, tpnme.AnyVal, Abstract, List(AnyClass.typeRef)))
   def AnyValType: TypeRef = AnyValClass.typeRef
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -517,7 +517,7 @@ class Typer extends Namer
       case templ: untpd.Template =>
         import untpd._
         var templ1 = templ
-        def isEligible(tp: Type) = tp.exists && !tp.typeSymbol.is(Final)
+        def isEligible(tp: Type) = tp.exists && !tp.typeSymbol.is(Final) && !tp.isRef(defn.AnyClass)
         if (templ1.parents.isEmpty &&
             isFullyDefined(pt, ForceDegree.noBottom) &&
             isEligible(pt.underlyingClassRef(refinementOK = false)))
diff --git a/library/src/scala/tasty/reflect/Printers.scala b/library/src/scala/tasty/reflect/Printers.scala
@@ -1034,6 +1034,7 @@ trait Printers
             case Term.Select(qual, _) => rec(qual)
             case Term.Apply(fn, _) => rec(fn)
             case Term.TypeApply(fn, _) => rec(fn)
+            case Term.Typed(_, _) => this += doubleLineBreak()
             case _ => this += lineBreak()
           }
           next match {
diff --git a/tests/neg/i4820.scala b/tests/neg/i4820.scala
@@ -0,0 +1,2 @@
+class Foo[A]
+class Bar[A] extends Foo  // error
diff --git a/tests/neg/i4820b.scala b/tests/neg/i4820b.scala
@@ -0,0 +1,5 @@
+trait SetOps[A, +C <: SetOps[A, C]]  {
+  def concat(that: Iterable[A]): C = ???
+}
+
+class Set1[A] extends SetOps // error: should be SetOps[A, Set1[A]]
diff --git a/tests/neg/i4820c.scala b/tests/neg/i4820c.scala
@@ -0,0 +1,2 @@
+trait Foo[A]
+class Bar[A] extends Foo // error
diff --git a/tests/neg/i5001.scala b/tests/neg/i5001.scala
@@ -0,0 +1 @@
+case class i1() extends Any // error: Any does not have a constructor
diff --git a/tests/pending/fuzzy/AE-3b3b6b8b578c2152ae06a6647f65684de4d4605d.scala b/tests/pending/fuzzy/AE-3b3b6b8b578c2152ae06a6647f65684de4d4605d.scala
diff --git a/tests/pos/i0306.decompiled b/tests/pos/i0306.decompiled
@@ -4,10 +4,12 @@ object bar {
   val y: scala.collection.Seq[_ >: scala.Nothing <: scala.Any] = bar.x match {
     case x: bar.C[u] =>
       def xx: u = xx
+
       ((xx: u): scala.collection.Seq[_ >: scala.Nothing <: scala.Any])
   }
   val z: java.lang.String = {
     def xx: scala.Predef.String = xx
+
     (xx: java.lang.String)
   }
-}
+}
diff --git a/tests/pos/i5001.scala b/tests/pos/i5001.scala
@@ -0,0 +1 @@
+case class i1() extends AnyRef
diff --git a/tests/pos/simpleRefinement.decompiled b/tests/pos/simpleRefinement.decompiled
@@ -32,6 +32,7 @@ class Foo() {
       def w[T]: scala.Predef.String = "a"
       def w2[T](a: scala.Null)(b: scala.Null): scala.Null = null
     }
+
     (new $anon(): Bar {
       type S >: scala.Int <: scala.Int
       type T >: scala.Function1[scala.Int, scala.Int] <: scala.Function1[scala.Int, scala.Int]
@@ -44,4 +45,4 @@ class Foo() {
       def w2[T >: scala.Nothing <: scala.Any](a: scala.Null)(b: scala.Null): scala.Null
     })
   }
-}
+}
diff --git a/tests/run-with-compiler/i3876-c.check b/tests/run-with-compiler/i3876-c.check
@@ -4,6 +4,7 @@
   val f: scala.Function1[scala.Int, scala.Int] {
     def apply(x: scala.Int): scala.Int
   } = ((x: scala.Int) => x.+(x))
+
   (f: scala.Function1[scala.Int, scala.Int] {
     def apply(x: scala.Int): scala.Int
   }).apply(x$1)
diff --git a/tests/run-with-compiler/quote-nested-3.check b/tests/run-with-compiler/quote-nested-3.check
@@ -2,5 +2,6 @@
   type T = scala.Predef.String
   val x: java.lang.String = "foo"
   val z: T = x
+
   (x: java.lang.String)
 }
diff --git a/tests/run-with-compiler/quote-nested-4.check b/tests/run-with-compiler/quote-nested-4.check
@@ -1,4 +1,5 @@
 {
   val t: scala.quoted.Type[scala.Predef.String] = scala.quoted.Type.apply[scala.Predef.String]
+
   (t: scala.quoted.Type[scala.Predef.String])
 }
diff --git a/tests/run-with-compiler/quote-owners-2.check b/tests/run-with-compiler/quote-owners-2.check
@@ -4,9 +4,12 @@
     val a: immutable.List[scala.Int] = {
       type T = scala.List[scala.Int]
       val b: T = scala.Nil.::[scala.Int](3)
+
       (b: collection.immutable.List[scala.Int])
     }
+
     (a.head: scala.Int)
   }
+
   (ff: scala.Int)
 }
diff --git a/tests/run-with-compiler/quote-owners.check b/tests/run-with-compiler/quote-owners.check
@@ -4,5 +4,6 @@
     val a: scala.Int = 9
     a.+(0)
   }
+
   (ff: scala.Int)
 }
diff --git a/tests/run-with-compiler/quote-unrolled-foreach.check b/tests/run-with-compiler/quote-unrolled-foreach.check
@@ -69,6 +69,7 @@
   array.update(1, 2)
   array.update(2, 3)
   array.update(3, 4)
+
   (array: scala.Array[scala.Int])
 }
 
@@ -79,6 +80,7 @@
     array.update(1, 3)
     array.update(2, 4)
     array.update(3, 5)
+
     (array: scala.Array[scala.Int])
   }
   val size: scala.Int = arr1.length
diff --git a/tests/run-with-compiler/shonan-hmm-simple.check b/tests/run-with-compiler/shonan-hmm-simple.check
@@ -13,6 +13,7 @@ Complex(4,3)
     sum = sum.+(arr1.apply(i).*(arr2.apply(i)))
     i = i.+(1)
   }
+
   (sum: scala.Int)
 })
 10
diff --git a/tests/run-with-compiler/shonan-hmm.check b/tests/run-with-compiler/shonan-hmm.check
@@ -25,6 +25,7 @@ List(25, 30, 20, 43, 44)
         sum = sum.+(v.apply(i$2).*(a.apply(i).apply(i$2)))
         i$2 = i$2.+(1)
       }
+
       (sum: scala.Int)
     })
     i = i.+(1)
@@ -232,6 +233,7 @@ List(25, 30, 20, 43, 44)
         sum = sum.+(v.apply(i).*(arr.apply(3).apply(i)))
         i = i.+(1)
       }
+
       (sum: scala.Int)
     })
     vout.update(4, v.apply(2).*(3).+(v.apply(4).*(7)))
@@ -261,6 +263,7 @@ List(25, 30, 20, 43, 44)
       }.apply(i)))
       i = i.+(1)
     }
+
     (sum: scala.Int)
   })
   vout.update(4, v.apply(2).*(3).+(v.apply(4).*(7)))
@@ -291,6 +294,7 @@ List(25, 30, 20, 43, 44)
         sum = sum.+(v.apply(i).*(row.apply(i)))
         i = i.+(1)
       }
+
       (sum: scala.Int)
     })
     vout.update(4, v.apply(2).*(3).+(v.apply(4).*(7)))
diff --git a/tests/run/t4300.decompiled b/tests/run/t4300.decompiled
@@ -17,9 +17,10 @@ object Test {
 
     {
       final class $anon() extends b.C
+
       (new $anon(): b.C)
     }.c()
     b.g()
     b.h()
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1034,6 +1034,7 @@ trait Printers`
`1034`	`1034`	`case Term.Select(qual, _) => rec(qual)`
`1035`	`1035`	`case Term.Apply(fn, _) => rec(fn)`
`1036`	`1036`	`case Term.TypeApply(fn, _) => rec(fn)`
	`1037`	`+ case Term.Typed(_, _) => this += doubleLineBreak()`
`1037`	`1038`	`case _ => this += lineBreak()`
`1038`	`1039`	`}`
`1039`	`1040`	`next match {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class Foo[A]`
	`2`	`+class Bar[A] extends Foo // error`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+trait Foo[A]`
	`2`	`+class Bar[A] extends Foo // error`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+case class i1() extends Any // error: Any does not have a constructor`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,12 @@ object bar {`
`4`	`4`	`val y: scala.collection.Seq[_ >: scala.Nothing <: scala.Any] = bar.x match {`
`5`	`5`	`case x: bar.C[u] =>`
`6`	`6`	`def xx: u = xx`
	`7`	`+`
`7`	`8`	`((xx: u): scala.collection.Seq[_ >: scala.Nothing <: scala.Any])`
`8`	`9`	`}`
`9`	`10`	`val z: java.lang.String = {`
`10`	`11`	`def xx: scala.Predef.String = xx`
	`12`	`+`
`11`	`13`	`(xx: java.lang.String)`
`12`	`14`	`}`
`13`		`-}`
	`15`	`+}`