Make Transparent method imply Erased

odersky · odersky · commit 39cd368f94d3 · 2018-07-26T10:22:06.000+02:00
Transparent methods are now always assumed to be erased. This required
updating quote a few tests.
diff --git a/compiler/src/dotty/tools/dotc/core/CheckRealizable.scala b/compiler/src/dotty/tools/dotc/core/CheckRealizable.scala
@@ -158,7 +158,7 @@ class CheckRealizable(implicit ctx: Context) {
   private def memberRealizability(tp: Type) = {
     def checkField(sofar: Realizability, fld: SingleDenotation): Realizability =
       sofar andAlso {
-        if (checkedFields.contains(fld.symbol) || fld.symbol.is(Private | Mutable | Lazy | Erased))
+        if (checkedFields.contains(fld.symbol) || fld.symbol.is(Private | Mutable | LateInitialized))
           // if field is private it cannot be part of a visible path
           // if field is mutable it cannot be part of a path
           // if field is lazy or erased it does not need to be initialized when the owning object is
diff --git a/compiler/src/dotty/tools/dotc/core/Flags.scala b/compiler/src/dotty/tools/dotc/core/Flags.scala
@@ -560,9 +560,6 @@ object Flags {
   /** A transparent method */
   final val TransparentMethod = allOf(Transparent, Method)
 
-  /** An erased transparent method */
-  final val TypeLevelMethod = allOf(Transparent, Erased, Method)
-
   /** A transparent parameter */
   final val TransparentParam = allOf(Transparent, Param)
 
diff --git a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala
@@ -165,7 +165,10 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
 
       def markAsMacro(c: Context): Unit =
         if (c.owner eq c.outer.owner) markAsMacro(c.outer)
-        else if (c.owner.isTransparentInlineable) c.owner.setFlag(Macro)
+        else if (c.owner.isTransparentMethod) {
+          c.owner.setFlag(Macro)
+          c.owner.resetFlag(Erased) // FIXME: Macros should be Erased, but that causes problems right now
+        }
         else if (!c.outer.owner.is(Package)) markAsMacro(c.outer)
 
       if (sym.isSplice || sym.isQuote) {
diff --git a/compiler/src/dotty/tools/dotc/transform/Splicer.scala b/compiler/src/dotty/tools/dotc/transform/Splicer.scala
@@ -154,7 +154,7 @@ object Splicer {
       try clazz.getMethod(name.toString, paramClasses: _*)
       catch {
         case _: NoSuchMethodException =>
-          val msg = s"Could not find transparent macro method ${clazz.getCanonicalName}.$name with parameters $paramClasses$extraMsg"
+          val msg = em"Could not find macro method ${clazz.getCanonicalName}.$name with parameters ($paramClasses%, %)$extraMsg"
           throw new StopInterpretation(msg, pos)
       }
     }
diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -1195,6 +1195,7 @@ class Namer { typer: Typer =>
       instantiateDependent(restpe, typeParams, termParamss)
       ctx.methodType(tparams map symbolOfTree, termParamss, restpe, isJava = ddef.mods is JavaDefined)
     }
+    if (sym.is(Transparent)) sym.setFlag(Erased)
     if (isConstructor) {
       // set result type tree to unit, but take the current class as result type of the symbol
       typedAheadType(ddef.tpt, defn.UnitType)
diff --git a/compiler/src/dotty/tools/dotc/typer/PrepareTransparent.scala b/compiler/src/dotty/tools/dotc/typer/PrepareTransparent.scala
@@ -48,7 +48,6 @@ object PrepareTransparent {
 
   def markTopLevelMatches(meth: Symbol, tree: untpd.Tree)(implicit ctx: Context): Unit = tree match {
     case tree: untpd.Match =>
-      meth.setFlag(Erased)
       tree.putAttachment(TopLevelMatch, ())
       tree.cases.foreach(markTopLevelMatches(meth, _))
     case tree: untpd.Block =>
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -2351,7 +2351,7 @@ class Typer extends Namer
       //  - the current tree is a synthetic apply which is not expandable (eta-expasion would simply undo that)
       if (arity >= 0 &&
           !tree.symbol.isConstructor &&
-          !tree.symbol.is(TypeLevelMethod) &&
+          !tree.symbol.is(TransparentMethod) &&
           !ctx.mode.is(Mode.Pattern) &&
           !(isSyntheticApply(tree) && !isExpandableApply))
         simplify(typed(etaExpand(tree, wtp, arity), pt), pt, locked)
diff --git a/library/src/dotty/runtime/LazyVals.scala b/library/src/dotty/runtime/LazyVals.scala
@@ -25,20 +25,20 @@ object LazyVals {
   final val LAZY_VAL_MASK = 3L
   final val debug = false
 
-  @forceInline def STATE(cur: Long, ord: Int) = {
+  @inline def STATE(cur: Long, ord: Int) = {
     val r = (cur >> (ord * BITS_PER_LAZY_VAL)) & LAZY_VAL_MASK
     if (debug)
       println(s"STATE($cur, $ord) = $r")
     r
   }
-  @forceInline def CAS(t: Object, offset: Long, e: Long, v: Int, ord: Int) = {
+  @inline def CAS(t: Object, offset: Long, e: Long, v: Int, ord: Int) = {
     if (debug)
       println(s"CAS($t, $offset, $e, $v, $ord)")
     val mask = ~(LAZY_VAL_MASK << ord * BITS_PER_LAZY_VAL)
     val n = (e & mask) | (v.toLong << (ord * BITS_PER_LAZY_VAL))
     compareAndSet(t, offset, e, n)
   }
-  @forceInline def setFlag(t: Object, offset: Long, v: Int, ord: Int) = {
+  @inline def setFlag(t: Object, offset: Long, v: Int, ord: Int) = {
     if (debug)
       println(s"setFlag($t, $offset, $v, $ord)")
     var retry = true
@@ -57,7 +57,7 @@ object LazyVals {
       }
     }
   }
-  @forceInline def wait4Notification(t: Object, offset: Long, cur: Long, ord: Int) = {
+  @inline def wait4Notification(t: Object, offset: Long, cur: Long, ord: Int) = {
     if (debug)
       println(s"wait4Notification($t, $offset, $cur, $ord)")
     var retry = true
@@ -75,8 +75,8 @@ object LazyVals {
     }
   }
 
-  @forceInline def compareAndSet(t: Object, off: Long, e: Long, v: Long) = unsafe.compareAndSwapLong(t, off, e, v)
-  @forceInline def get(t: Object, off: Long) = {
+  @inline def compareAndSet(t: Object, off: Long, e: Long, v: Long) = unsafe.compareAndSwapLong(t, off, e, v)
+  @inline def get(t: Object, off: Long) = {
     if (debug)
       println(s"get($t, $off)")
     unsafe.getLongVolatile(t, off)
@@ -88,7 +88,7 @@ object LazyVals {
     x => new Object()
   }.toArray
 
-  @forceInline def getMonitor(obj: Object, fieldId: Int = 0) = {
+  @inline def getMonitor(obj: Object, fieldId: Int = 0) = {
     var id = (
       /*java.lang.System.identityHashCode(obj) + */ // should be here, but #548
       fieldId) % base
@@ -97,7 +97,7 @@ object LazyVals {
     monitors(id)
   }
 
-  @forceInline def getOffset(clz: Class[_], name: String) = {
+  @inline def getOffset(clz: Class[_], name: String) = {
     val r = unsafe.objectFieldOffset(clz.getDeclaredField(name))
     if (debug)
       println(s"getOffset($clz, $name) = $r")
diff --git a/tests/neg/inline-i1773.scala b/tests/neg/inline-i1773.scala
@@ -7,7 +7,7 @@ object Test {
   }
 
   def main(args: Array[String]): Unit = {
-    val q"class $name extends $parent" = new Object
+    val q"class $name extends $parent" = new Object // error: method unapply is used
     println(name)
     println(parent)
   }
diff --git a/tests/pos/i3873.scala b/tests/pos/i3873.scala
@@ -2,5 +2,5 @@ object Test {
   transparent def sum2(ys: List[Int]): Unit = {
     ys.foldLeft(1)
   }
-  val h1: ((List[Int]) => Unit) = sum2
+  val h1 = (xs: List[Int]) => sum2(xs)
 }
diff --git a/tests/pos/inline-i2570.scala b/tests/pos/inline-i2570.scala
@@ -1,4 +1,4 @@
 object Test {
   transparent def sum2(ys: List[Int]): Int = (1 /: ys)(_ + _)
-  val h1: ((List[Int]) => Int) = sum2
+  val h1 = (xs:  List[Int]) => sum2(xs)
 }
diff --git a/tests/pos/inline-t9232a.scala b/tests/pos/inline-t9232a.scala
diff --git a/tests/pos/inline-t9232b.scala b/tests/pos/inline-t9232b.scala
diff --git a/tests/pos/transparent.scala b/tests/pos/transparent.scala
diff --git a/tests/run/i2895.scala b/tests/run/i2895.scala
diff --git a/tests/run/transparentAssign.scala b/tests/run/transparentAssign.scala
@@ -10,8 +10,8 @@ object Test {
   def main(args: Array[String]) = {
     var x = 1
     var y = 2
-    transparent def setX(z: Int) = x = z
-    transparent def setY(z: Int) = y = z
+    def setX(z: Int) = x = z
+    def setY(z: Int) = y = z
     swap(x, setX, y, setY)
     assert(x == 2 && y == 1)
 
diff --git a/tests/run/transparentByName.scala b/tests/run/transparentByName.scala
@@ -25,7 +25,7 @@ object Test {
     assert(j == 45, j)
     twice { x => j = j - x }
     thrice { j = j + 1 }
-    val f = new Range(1, 10).foreach
+    val f = (g: Int => Unit) => new Range(1, 10).foreach(g)
     f(j -= _)
     assert(j == 0, j)
     new Range(1, 10).foreach { i1 =>
diff --git a/tests/run/typelevel-patmat.scala b/tests/run/typelevel-patmat.scala
@@ -3,17 +3,9 @@ object typelevel {
   case class Typed[T](value: T) { type Type = T }
 }
 
-trait Nat {
-  def toInt: Int
-}
-
-case object Z extends Nat {
-  transparent def toInt = 0
-}
-
-case class S[N <: Nat](n: N) extends Nat {
-  transparent def toInt = n.toInt + 1
-}
+trait Nat
+case object Z extends Nat
+case class S[N <: Nat](n: N) extends Nat
 
 trait HList
 
diff --git a/tests/run/typelevel.scala b/tests/run/typelevel.scala
@@ -1,18 +1,18 @@
 
 trait Nat {
-  def toInt: Int
+  def toInt: Int = ???
 }
 
 case object Z extends Nat {
-  transparent def toInt = 0
+  transparent override def toInt = 0
 }
 
 case class S[N <: Nat](n: N) extends Nat {
-  transparent def toInt = n.toInt + 1
+  transparent override def toInt = n.toInt + 1
 }
 
 trait HList {
-  def length: Int
+  def length: Int = ???
   def head: Any
   def tail: HList
   transparent def isEmpty: Boolean =
@@ -21,15 +21,15 @@ trait HList {
 
 // ()
 case object HNil extends HList {
-  transparent def length = 0
+  transparent override def length = 0
   def head: Nothing = ???
   def tail: Nothing = ???
 }
 
 // (H, T)
 @annotation.showAsInfix(true)
 case class HCons [H, T <: HList](hd: H, tl: T) extends HList {
-  transparent def length = 1 + tl.length
+  transparent override def length = 1 + tl.length
   def head: H = this.hd
   def tail: T = this.tl
 }
diff --git a/tests/run/typelevel1.scala b/tests/run/typelevel1.scala
@@ -1,20 +1,20 @@
 
 trait HList {
-  def length: Int
+  def length: Int = ???
   def head: Any
   def tail: HList
 
   transparent def isEmpty: Boolean = length == 0
 }
 
 case object HNil extends HList {
-  transparent def length = 0
+  transparent override def length = 0
   def head: Nothing = ???
   def tail: Nothing = ???
 }
 
 case class :: [H, T <: HList] (hd: H, tl: T) extends HList {
-  transparent def length = 1 + tl.length
+  transparent override def length = 1 + tl.length
   def head: H = this.hd
   def tail: T = this.tl
 }
diff --git a/tests/run/typelevel3.scala b/tests/run/typelevel3.scala
@@ -1,20 +1,20 @@
 
 trait HList {
-  def length: Int
+  def length: Int = 0
   def head: Any
   def tail: HList
 
   transparent def isEmpty: Boolean = length == 0
 }
 
 case object HNil extends HList {
-  transparent def length = 0
+  transparent override def length = 0
   def head: Nothing = ???
   def tail: Nothing = ???
 }
 
 case class HCons[H, T <: HList](hd: H, tl: T) extends HList {
-  transparent def length = 1 + tl.length
+  transparent override def length = 1 + tl.length
   def head: H = this.hd
   def tail: T = this.tl
 }

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ object Splicer {`
`154`	`154`	`try clazz.getMethod(name.toString, paramClasses: _*)`
`155`	`155`	`catch {`
`156`	`156`	`case _: NoSuchMethodException =>`
`157`		`- val msg = s"Could not find transparent macro method ${clazz.getCanonicalName}.$name with parameters $paramClasses$extraMsg"`
	`157`	`+ val msg = em"Could not find macro method ${clazz.getCanonicalName}.$name with parameters ($paramClasses%, %)$extraMsg"`
`158`	`158`	`throw new StopInterpretation(msg, pos)`
`159`	`159`	`}`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1195,6 +1195,7 @@ class Namer { typer: Typer =>`
`1195`	`1195`	`instantiateDependent(restpe, typeParams, termParamss)`
`1196`	`1196`	`ctx.methodType(tparams map symbolOfTree, termParamss, restpe, isJava = ddef.mods is JavaDefined)`
`1197`	`1197`	`}`
	`1198`	`+ if (sym.is(Transparent)) sym.setFlag(Erased)`
`1198`	`1199`	`if (isConstructor) {`
`1199`	`1200`	`// set result type tree to unit, but take the current class as result type of the symbol`
`1200`	`1201`	`typedAheadType(ddef.tpt, defn.UnitType)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ object Test {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`def main(args: Array[String]): Unit = {`
`10`		`- val q"class $name extends $parent" = new Object`
	`10`	`+ val q"class $name extends $parent" = new Object // error: method unapply is used`
`11`	`11`	`println(name)`
`12`	`12`	`println(parent)`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ object Test {`
`2`	`2`	`transparent def sum2(ys: List[Int]): Unit = {`
`3`	`3`	`ys.foldLeft(1)`
`4`	`4`	`}`
`5`		`- val h1: ((List[Int]) => Unit) = sum2`
	`5`	`+ val h1 = (xs: List[Int]) => sum2(xs)`
`6`	`6`	`}`