diff options
| -rw-r--r-- | src/dotty/tools/dotc/core/SymDenotations.scala | 6 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/typer/ProtoTypes.scala | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/src/dotty/tools/dotc/core/SymDenotations.scala index fb6a40100..8b7c28e19 100644 --- a/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/src/dotty/tools/dotc/core/SymDenotations.scala @@ -105,7 +105,7 @@ object SymDenotations { ownerIfExists: Symbol, final val name: Name, initFlags: FlagSet, - final val initInfo: Type, + initInfo: Type, initPrivateWithin: Symbol = NoSymbol) extends SingleDenotation(symbol) { //assert(symbol.id != 4940, name) @@ -232,7 +232,7 @@ object SymDenotations { case _ => } */ - if (Config.checkNoSkolemsInInfo) assertNoSkolems(initInfo) + if (Config.checkNoSkolemsInInfo) assertNoSkolems(tp) myInfo = tp } @@ -751,7 +751,7 @@ object SymDenotations { // def isOverridable: Boolean = !!! need to enforce that classes cannot be redefined def isSkolem: Boolean = name == nme.SKOLEM - def isInlineMethod(implicit ctx: Context): Boolean = is(InlineMethod, butNot = Accessor) + def isInlineMethod(implicit ctx: Context): Boolean = is(InlineMethod, butNot = Accessor) // ------ access to related symbols --------------------------------- diff --git a/src/dotty/tools/dotc/typer/ProtoTypes.scala b/src/dotty/tools/dotc/typer/ProtoTypes.scala index 5eef096db..9a20a452e 100644 --- a/src/dotty/tools/dotc/typer/ProtoTypes.scala +++ b/src/dotty/tools/dotc/typer/ProtoTypes.scala @@ -477,11 +477,9 @@ object ProtoTypes { def apply(tp: Type) = wildApprox(tp, this) } - @sharable private def dummyTree = untpd.Literal(Constant(null)) - /** Dummy tree to be used as an argument of a FunProto or ViewProto type */ object dummyTreeOfType { - def apply(tp: Type): Tree = dummyTree withTypeUnchecked tp + def apply(tp: Type): Tree = untpd.Literal(Constant(null)) withTypeUnchecked tp def unapply(tree: Tree): Option[Type] = tree match { case Literal(Constant(null)) => Some(tree.typeOpt) case _ => None |