Skip to content

Commit 88ff215

Browse files
committed
Rename old PhantomClasses to avoid name clashes with phantom types.
1 parent 9396006 commit 88ff215

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ class Definitions {
656656
lazy val UnqualifiedOwnerTypes: Set[NamedType] =
657657
RootImportTypes.toSet[NamedType] ++ RootImportTypes.map(_.symbol.moduleClass.typeRef)
658658

659-
lazy val PhantomClasses = Set[Symbol](AnyClass, AnyValClass, NullClass, NothingClass)
659+
lazy val NotRuntimeClasses = Set[Symbol](AnyClass, AnyValClass, NullClass, NothingClass)
660660

661661
def isPolymorphicAfterErasure(sym: Symbol) =
662662
(sym eq Any_isInstanceOf) || (sym eq Any_asInstanceOf)
@@ -729,7 +729,7 @@ class Definitions {
729729
def wrapArrayMethodName(elemtp: Type): TermName = {
730730
val cls = elemtp.classSymbol
731731
if (cls.isPrimitiveValueClass) nme.wrapXArray(cls.name)
732-
else if (cls.derivesFrom(ObjectClass) && !cls.isPhantomClass) nme.wrapRefArray
732+
else if (cls.derivesFrom(ObjectClass) && !cls.isNotRuntimeClass) nme.wrapRefArray
733733
else nme.genericWrapArray
734734
}
735735

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,8 @@ object SymDenotations {
468468
def isNumericValueClass(implicit ctx: Context) =
469469
maybeOwner == defn.ScalaPackageClass && defn.ScalaNumericValueClasses().contains(symbol)
470470

471-
/** Is symbol a phantom class for which no runtime representation exists? */
472-
def isPhantomClass(implicit ctx: Context) = defn.PhantomClasses contains symbol
471+
/** Is symbol a class for which no runtime representation exists? */
472+
def isNotRuntimeClass(implicit ctx: Context) = defn.NotRuntimeClasses contains symbol
473473

474474
/** Is this symbol a class representing a refinement? These classes
475475
* are used only temporarily in Typer and Unpickler as an intermediate

src/dotty/tools/dotc/transform/ElimRepeated.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class ElimRepeated extends MiniPhaseTransform with InfoTransformer with Annotati
7676
case _ =>
7777
val elemType = tree.tpe.elemType
7878
var elemClass = elemType.classSymbol
79-
if (defn.PhantomClasses contains elemClass) elemClass = defn.ObjectClass
79+
if (defn.NotRuntimeClasses contains elemClass) elemClass = defn.ObjectClass
8080
ref(defn.DottyArraysModule)
8181
.select(nme.seqToArray)
8282
.appliedToType(elemType)

src/dotty/tools/dotc/transform/Mixin.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ class Mixin extends MiniPhaseTransform with SymTransformer { thisTransform =>
173173

174174
def superCallOpt(baseCls: Symbol): List[Tree] = superCalls.get(baseCls) match {
175175
case Some(call) =>
176-
if (defn.PhantomClasses.contains(baseCls)) Nil else call :: Nil
176+
if (defn.NotRuntimeClasses.contains(baseCls)) Nil else call :: Nil
177177
case None =>
178-
if (baseCls.is(NoInitsTrait) || defn.PhantomClasses.contains(baseCls)) Nil
178+
if (baseCls.is(NoInitsTrait) || defn.NotRuntimeClasses.contains(baseCls)) Nil
179179
else {
180180
//println(i"synth super call ${baseCls.primaryConstructor}: ${baseCls.primaryConstructor.info}")
181181
transformFollowingDeep(superRef(baseCls.primaryConstructor).appliedToNone) :: Nil

src/dotty/tools/dotc/transform/TreeGen.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object TreeGen {
1414
def wrapArrayMethodName(elemtp: Type)(implicit ctx: Context): TermName = {
1515
val elemCls = elemtp.classSymbol
1616
if (elemCls.isPrimitiveValueClass) nme.wrapXArray(elemCls.name)
17-
else if (elemCls.derivesFrom(defn.ObjectClass) && !elemCls.isPhantomClass) nme.wrapRefArray
17+
else if (elemCls.derivesFrom(defn.ObjectClass) && !elemCls.isNotRuntimeClass) nme.wrapRefArray
1818
else nme.genericWrapArray
1919
}
2020

0 commit comments

Comments
 (0)