Inline some methods

Author: nicolasstucki

compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala

@@ -93,7 +93,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
    * must-single-thread
    */
   def initBytecodeWriter(): BytecodeWriter = {
-    getSingleOutput match {
+    (None: Option[AbstractFile] /*getSingleOutput*/) match { // todo: implement
       case Some(f) if f.hasExtension("jar") =>
         new DirectToJarfileWriter(f.file)
       case _ =>
@@ -212,7 +212,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
 
     private def assertClassNotArray(sym: Symbol): Unit = {
       assert(sym.isClass, sym)
-      assert(sym != defn.ArrayClass || isCompilingArray, sym)
+      assert(sym != defn.ArrayClass || ctx.compilationUnit.source.file.name == "Array.scala", sym)
     }
 
     private def assertClassNotArrayNotPrimitive(sym: Symbol): Unit = {
@@ -613,7 +613,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
                                 null /* SourceDebugExtension */)
       }
 
-      val ssa = getAnnotPickle(mirrorName, if (moduleClass.is(Flags.Module)) moduleClass.companionClass else moduleClass.companionModule)
+      val ssa = None // getAnnotPickle(mirrorName, if (moduleClass.is(Flags.Module)) moduleClass.companionClass else moduleClass.companionModule)
       mirrorClass.visitAttribute(if (ssa.isDefined) pickleMarkerLocal else pickleMarkerForeign)
       emitAnnotations(mirrorClass, moduleClass.annotations ++ ssa)
 
@@ -641,8 +641,8 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
      */
     val androidFieldName = "CREATOR".toTermName
 
-    lazy val AndroidParcelableInterface : Symbol = getClassIfDefined("android.os.Parcelable")
-    lazy val AndroidCreatorClass        : Symbol = getClassIfDefined("android.os.Parcelable$Creator")
+    lazy val AndroidParcelableInterface : Symbol = NoSymbol // getClassIfDefined("android.os.Parcelable")
+    lazy val AndroidCreatorClass        : Symbol = NoSymbol // getClassIfDefined("android.os.Parcelable$Creator")
 
     /*
      * must-single-thread

compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala

@@ -170,7 +170,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
         case _ => ()
       }
 
-      val ssa = getAnnotPickle(thisName, claszSymbol)
+      val ssa = None // getAnnotPickle(thisName, claszSymbol)
       cnode.visitAttribute(if (ssa.isDefined) pickleMarkerLocal else pickleMarkerForeign)
       emitAnnotations(cnode, claszSymbol.annotations ++ ssa)
 

compiler/src/dotty/tools/backend/jvm/CoreBTypes.scala

@@ -4,6 +4,7 @@ package jvm
 
 import scala.annotation.switch
 
+import dotty.tools.dotc.core.Decorators._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.transform.Erasure
 
@@ -112,8 +113,8 @@ class CoreBTypes[BTFS <: BTypesFromSymbols[_ <: DottyBackendInterface]](val bTyp
    * names of NothingClass and NullClass can't be emitted as-is.
    * TODO @lry Once there's a 2.11.3 starr, use the commented argument list. The current starr crashes on the type literal `scala.runtime.Nothing$`
    */
-  lazy val RT_NOTHING : ClassBType = classBTypeFromSymbol(getRequiredClass("scala.runtime.Nothing$")) // (requiredClass[scala.runtime.Nothing$])
-  lazy val RT_NULL    : ClassBType = classBTypeFromSymbol(getRequiredClass("scala.runtime.Null$"))    // (requiredClass[scala.runtime.Null$])
+  lazy val RT_NOTHING : ClassBType = classBTypeFromSymbol(ctx.requiredClass("scala.runtime.Nothing$")) // (requiredClass[scala.runtime.Nothing$])
+  lazy val RT_NULL    : ClassBType = classBTypeFromSymbol(ctx.requiredClass("scala.runtime.Null$"))    // (requiredClass[scala.runtime.Null$])
 
   lazy val ObjectReference   : ClassBType = classBTypeFromSymbol(defn.ObjectClass)
   lazy val objArrayReference : ArrayBType = ArrayBType(ObjectReference)

compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

@@ -76,19 +76,6 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
     annot.tree.tpe.typeSymbol.getAnnotation(AnnotationRetentionAttr).
       flatMap(_.argumentConstant(0).map(_.symbolValue)).getOrElse(AnnotationRetentionClassAttr)
 
-  private def normalizeArgument(arg: Tree): Tree = arg match {
-    case Trees.NamedArg(_, arg1) => normalizeArgument(arg1)
-    case Trees.Typed(arg1, _) => normalizeArgument(arg1)
-    case _ => arg
-  }
-
-  def getAnnotPickle(jclassName: String, sym: Symbol): Option[Annotation] = None
-
-
-  def getRequiredClass(fullname: String): Symbol = ctx.requiredClass(fullname)
-
-  def getClassIfDefined(fullname: String): Symbol = NoSymbol // used only for android. todo: implement
-
   private def erasureString(clazz: Class[_]): String = {
     if (clazz.isArray) "Array[" + erasureString(clazz.getComponentType) + "]"
     else clazz.getName
@@ -153,8 +140,6 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
       (sym derivesFrom defn.BoxedBooleanClass)
   }
 
-  def getSingleOutput: Option[AbstractFile] = None // todo: implement
-
   // @M don't generate java generics sigs for (members of) implementation
   // classes, as they are monomorphic (TODO: ok?)
   private final def needsGenericSignature(sym: Symbol): Boolean = !(
@@ -417,7 +402,7 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
       */
     def primitiveOrClassToBType(sym: Symbol): BType = {
       assert(sym.isClass, sym)
-      assert(sym != defn.ArrayClass || isCompilingArray, sym)
+      assert(sym != defn.ArrayClass || ctx.compilationUnit.source.file.name == "Array.scala", sym)
       primitiveTypeMap.getOrElse(sym.asInstanceOf[ct.bTypes.coreBTypes.bTypes.int.Symbol],
         storage.getClassBTypeAndRegisterInnerClass(sym.asInstanceOf[ct.int.Symbol])).asInstanceOf[BType]
     }
@@ -427,7 +412,7 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
       * signatures, e.g. `def apply(i: Int): T`. A TyperRef to T is replaced by ObjectReference.
       */
     def nonClassTypeRefToBType(sym: Symbol): ClassBType = {
-      assert(sym.isType && isCompilingArray, sym)
+      assert(sym.isType && ctx.compilationUnit.source.file.name == "Array.scala", sym)
       ObjectReference.asInstanceOf[ct.bTypes.ClassBType]
     }
 
@@ -587,9 +572,6 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
     primitiveCompilationUnits(ctx.compilationUnit.source.file.name)
   }
 
-  def isCompilingArray = {
-    ctx.compilationUnit.source.file.name == "Array.scala"
-  }
 }
 
 object DottyBackendInterface {