Merge pull request #7447 from dotty-staging/compile-primitives

Fully compile primitive value classes

Author: odersky

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

@@ -270,11 +270,12 @@ class Mixin extends MiniPhase with SymTransformer { thisPhase =>
       parents = impl.parents.map(p => TypeTree(p.tpe).withSpan(p.span)),
       body =
         if (cls.is(Trait)) traitDefs(impl.body)
-        else {
+        else if (!cls.isPrimitiveValueClass) {
           val mixInits = mixins.flatMap { mixin =>
             flatten(traitInits(mixin)) ::: superCallOpt(mixin) ::: setters(mixin) ::: mixinForwarders(mixin)
           }
           superCallOpt(superCls) ::: mixInits ::: impl.body
-        })
+        }
+        else impl.body)
   }
 }

compiler/src/dotty/tools/dotc/typer/FrontEnd.scala

@@ -86,7 +86,7 @@ class FrontEnd extends Phase {
   }
 
   protected def discardAfterTyper(unit: CompilationUnit)(implicit ctx: Context): Boolean =
-    unit.isJava || firstTopLevelDef(unit.tpdTree :: Nil).isPrimitiveValueClass
+    unit.isJava
 
   override def runOn(units: List[CompilationUnit])(implicit ctx: Context): List[CompilationUnit] = {
     val unitContexts = for (unit <- units) yield {

compiler/src/dotty/tools/dotc/typer/RefChecks.scala

@@ -790,7 +790,14 @@ object RefChecks {
           case Nil =>
             ctx.error(OverridesNothing(member), member.sourcePos)
           case ms =>
-            ctx.error(OverridesNothingButNameExists(member, ms), member.sourcePos)
+            // getClass in primitive value classes is defined in the standard library as:
+            //     override def getClass(): Class[Int] = ???
+            // However, it's not actually an override in Dotty because our Any#getClass
+            // is polymorphic (see `Definitions#Any_getClass`), so since we can't change
+            // the standard library, we need to drop the override flag without reporting
+            // an error.
+            if (!(member.name == nme.getClass_ && clazz.isPrimitiveValueClass))
+              ctx.error(OverridesNothingButNameExists(member, ms), member.sourcePos)
         }
         member.resetFlag(Override)
         member.resetFlag(AbsOverride)