Merge pull request lampepfl#32 from dotty-staging/compact1-profile

 Remove compiler dependency on @BeanInfo and @Remote

Author: smarter

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

@@ -511,120 +511,6 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
 
   } // end of class JMirrorBuilder
 
-  /* builder of bean info classes */
-  class JBeanInfoBuilder extends BCInnerClassGen {
-
-    /*
-     * Generate a bean info class that describes the given class.
-     *
-     * @author Ross Judson ([email protected])
-     *
-     * must-single-thread
-     */
-    def genBeanInfoClass(cls: Symbol, cunit: CompilationUnit, fieldSymbols: List[Symbol], methodSymbols: List[Symbol]): asm.tree.ClassNode = {
-
-      def javaSimpleName(s: Symbol): String = { s.javaSimpleName.toString }
-
-      innerClassBufferASM.clear()
-
-      val flags = javaFlags(cls)
-
-      val beanInfoName  = (internalName(cls) + "BeanInfo")
-      val beanInfoClass = new asm.tree.ClassNode
-      beanInfoClass.visit(
-        classfileVersion,
-        flags,
-        beanInfoName,
-        null, // no java-generic-signature
-        "scala/beans/ScalaBeanInfo",
-        EMPTY_STRING_ARRAY
-      )
-
-      beanInfoClass.visitSource(
-        sourceFileFor(cunit).toString,
-        null /* SourceDebugExtension */
-      )
-
-      var fieldList = List[String]()
-
-      for (f <- fieldSymbols if f.hasGetter;
-	         g = f.getter(cls);
-	         s = f.setter(cls);
-	         if g.isPublic && !(f.name startsWith "$")
-          ) {
-             // inserting $outer breaks the bean
-             fieldList = javaSimpleName(f) :: javaSimpleName(g) :: (if (s != NoSymbol) javaSimpleName(s) else null) :: fieldList
-      }
-
-      val methodList: List[String] =
-	     for (m <- methodSymbols
-	          if !m.isConstructor &&
-	          m.isPublic &&
-	          !(m.name startsWith "$") &&
-	          !m.isGetter &&
-	          !m.isSetter)
-       yield javaSimpleName(m)
-
-      val constructor = beanInfoClass.visitMethod(
-        asm.Opcodes.ACC_PUBLIC,
-        INSTANCE_CONSTRUCTOR_NAME,
-        "()V",
-        null, // no java-generic-signature
-        EMPTY_STRING_ARRAY // no throwable exceptions
-      )
-
-      val stringArrayJType: BType = ArrayBType(StringRef)
-      val conJType: BType = MethodBType(
-        classBTypeFromSymbol(ClassClass) :: stringArrayJType :: stringArrayJType :: Nil,
-        UNIT
-      )
-
-      def push(lst: List[String]): Unit = {
-        var fi = 0
-        for (f <- lst) {
-          constructor.visitInsn(asm.Opcodes.DUP)
-          constructor.visitLdcInsn(new java.lang.Integer(fi))
-          if (f == null) { constructor.visitInsn(asm.Opcodes.ACONST_NULL) }
-          else           { constructor.visitLdcInsn(f) }
-          constructor.visitInsn(StringRef.typedOpcode(asm.Opcodes.IASTORE))
-          fi += 1
-        }
-      }
-
-      constructor.visitCode()
-
-      constructor.visitVarInsn(asm.Opcodes.ALOAD, 0)
-      // push the class
-      constructor.visitLdcInsn(classBTypeFromSymbol(cls).toASMType)
-
-      // push the string array of field information
-      constructor.visitLdcInsn(new java.lang.Integer(fieldList.length))
-      constructor.visitTypeInsn(asm.Opcodes.ANEWARRAY, StringRef.internalName)
-      push(fieldList)
-
-      // push the string array of method information
-      constructor.visitLdcInsn(new java.lang.Integer(methodList.length))
-      constructor.visitTypeInsn(asm.Opcodes.ANEWARRAY, StringRef.internalName)
-      push(methodList)
-
-      // invoke the superclass constructor, which will do the
-      // necessary java reflection and create Method objects.
-      constructor.visitMethodInsn(asm.Opcodes.INVOKESPECIAL, "scala/beans/ScalaBeanInfo", INSTANCE_CONSTRUCTOR_NAME, conJType.descriptor, false)
-      constructor.visitInsn(asm.Opcodes.RETURN)
-
-      constructor.visitMaxs(0, 0) // just to follow protocol, dummy arguments
-      constructor.visitEnd()
-
-      innerClassBufferASM ++= classBTypeFromSymbol(cls).info.memberClasses
-      addInnerClassesASM(beanInfoClass, innerClassBufferASM.toList)
-
-      beanInfoClass.visitEnd()
-
-      beanInfoClass
-    }
-
-  } // end of class JBeanInfoBuilder
-
   trait JAndroidBuilder {
     self: BCInnerClassGen =>
 

src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala

@@ -559,7 +559,7 @@ abstract class BTypes {
    * Mirror Classes
    * --------------
    *
-   * TODO: innerclass attributes on mirror class, bean info class
+   * TODO: innerclass attributes on mirror class
    */
 
   /**

src/compiler/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala

@@ -179,9 +179,6 @@ class BTypesFromSymbols[I <: BackendInterface](val int: I) extends BTypes {
     }
   }
 
-  // legacy, to be removed when the @remote annotation gets removed
-  final def hasPublicBitSet(flags: Int) = ((flags & asm.Opcodes.ACC_PUBLIC) != 0)
-
   /**
    * Return the Java modifiers for the given symbol.
    * Java modifiers for classes:

src/compiler/scala/tools/nsc/backend/jvm/BackendInterface.scala

@@ -457,7 +457,6 @@ abstract class BackendInterface extends BackendInterfaceDefinitions {
     def hasPackageFlag: Boolean
     def isImplClass: Boolean
     def isInterface: Boolean
-    def hasGetter: Boolean
     def isGetter: Boolean
     def isSetter: Boolean
     def isGetClass: Boolean
@@ -558,7 +557,6 @@ abstract class BackendInterface extends BackendInterfaceDefinitions {
     def isOriginallyStaticOwner: Boolean
 
 
-    def addRemoteRemoteExceptionAnnotation: Unit
     def samMethod(): Symbol
   }
 
@@ -710,7 +708,6 @@ abstract class BackendInterfaceDefinitions { self: BackendInterface =>
   val BoxedFloatClass: Symbol = requiredClass[java.lang.Float]
   val BoxedDoubleClass: Symbol = requiredClass[java.lang.Double]
   val StringClass: Symbol = requiredClass[java.lang.String]
-  val StringBuilderClass: Symbol = requiredClass[scala.collection.mutable.StringBuilder]
   val JavaStringBuilderClass: Symbol = requiredClass[java.lang.StringBuilder]
   val JavaStringBufferClass: Symbol = requiredClass[java.lang.StringBuffer]
   val JavaCharSequenceClass: Symbol = requiredClass[java.lang.CharSequence]
@@ -723,7 +720,6 @@ abstract class BackendInterfaceDefinitions { self: BackendInterface =>
 
   val ClassfileAnnotationClass: Symbol = requiredClass[scala.annotation.ClassfileAnnotation]
   val BoxedNumberClass: Symbol = requiredClass[java.lang.Number]
-  val RemoteExceptionClass: Symbol = requiredClass[java.rmi.RemoteException]
   val ThrowsClass: Symbol = requiredClass[scala.throws[_]]
 
   // Module symbols used in backend