Skip to content

Commit 673564d

Browse files
committed
Rename old PhantomClasses to avoid name clashes with phantom types.
1 parent f20ca3d commit 673564d

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ class Definitions {
819819
lazy val UnqualifiedOwnerTypes: Set[NamedType] =
820820
RootImportTypes.toSet[NamedType] ++ RootImportTypes.map(_.symbol.moduleClass.typeRef)
821821

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

824824
/** Classes that are known not to have an initializer irrespective of
825825
* whether NoInits is set. Note: FunctionXXLClass is in this set
@@ -831,7 +831,7 @@ class Definitions {
831831
* trait gets screwed up. Therefore, it is mandatory that FunctionXXL
832832
* is treated as a NoInit trait.
833833
*/
834-
lazy val NoInitClasses = PhantomClasses + FunctionXXLClass
834+
lazy val NoInitClasses = NotRuntimeClasses + FunctionXXLClass
835835

836836
def isPolymorphicAfterErasure(sym: Symbol) =
837837
(sym eq Any_isInstanceOf) || (sym eq Any_asInstanceOf)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,8 +501,8 @@ object SymDenotations {
501501
def isNumericValueClass(implicit ctx: Context) =
502502
maybeOwner == defn.ScalaPackageClass && defn.ScalaNumericValueClasses().contains(symbol)
503503

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class ElimRepeated extends MiniPhaseTransform with InfoTransformer with Annotati
8989
case _ =>
9090
val elemType = tree.tpe.elemType
9191
var elemClass = elemType.classSymbol
92-
if (defn.PhantomClasses contains elemClass) elemClass = defn.ObjectClass
92+
if (defn.NotRuntimeClasses contains elemClass) elemClass = defn.ObjectClass
9393
ref(defn.DottyArraysModule)
9494
.select(nme.seqToArray)
9595
.appliedToType(elemType)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class Mixin extends MiniPhaseTransform with SymTransformer { thisTransform =>
174174

175175
def superCallOpt(baseCls: Symbol): List[Tree] = superCalls.get(baseCls) match {
176176
case Some(call) =>
177-
if (defn.PhantomClasses.contains(baseCls)) Nil else call :: Nil
177+
if (defn.NotRuntimeClasses.contains(baseCls)) Nil else call :: Nil
178178
case None =>
179179
if (baseCls.is(NoInitsTrait) || defn.NoInitClasses.contains(baseCls)) Nil
180180
else {

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

Lines changed: 1 addition & 1 deletion
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)