Handle class field uniformly

Author: liufengyun

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

@@ -128,18 +128,16 @@ trait BCodeSkelBuilder extends BCodeHelpers {
             MethodType(Nil)(_ => Nil, _ => defn.UnitType),
             privateWithin = NoSymbol,
             coord = claszSymbol.coord
-          )
+          ).entered
 
-        // We don't need to enter this field into the decls of claszSymbol.info as this is added manually to the generated class
-        // in addModuleInstanceField. TODO: try adding it to the decls and making the usual field generation do the right thing.
         val moduleField = ctx.newSymbol(
             claszSymbol,
             str.MODULE_INSTANCE_FIELD.toTermName,
             JavaStatic | Private,
             claszSymbol.typeRef,
             privateWithin = NoSymbol,
             coord = claszSymbol.coord
-          )
+          ).entered
 
         val thisMap = new TreeTypeMap(
           treeMap = {
@@ -191,7 +189,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
       addClassFields()
 
       innerClassBufferASM ++= classBTypeFromSymbol(claszSymbol).info.memberClasses
-      gen(impl)
+      gen(cd.rhs)
       addInnerClassesASM(cnode, innerClassBufferASM.toList)
 
       if (AsmUtils.traceClassEnabled && cnode.name.contains(AsmUtils.traceClassPattern))
@@ -236,12 +234,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
       cnode.visitAttribute(if (ssa.isDefined) pickleMarkerLocal else pickleMarkerForeign)
       emitAnnotations(cnode, claszSymbol.annotations ++ ssa)
 
-      if (isCZStaticModule || isCZParcelable) {
-
-        if (isCZStaticModule) { addModuleInstanceField() }
-
-      } else {
-
+      if (!isCZStaticModule && !isCZParcelable) {
         val skipStaticForwarders = (claszSymbol.isInterface || claszSymbol.is(Module) || ctx.settings.XnoForwarders.value)
         if (!skipStaticForwarders) {
           val lmoc = claszSymbol.companionModule
@@ -262,21 +255,6 @@ trait BCodeSkelBuilder extends BCodeHelpers {
 
     } // end of method initJClass
 
-    /*
-     * can-multi-thread
-     */
-    private def addModuleInstanceField(): Unit = {
-      val fv =
-        cnode.visitField(GenBCodeOps.PublicStaticFinal, // TODO confirm whether we really don't want ACC_SYNTHETIC nor ACC_DEPRECATED
-                         str.MODULE_INSTANCE_FIELD,
-                         "L" + thisName + ";",
-                         null, // no java-generic-signature
-                         null  // no initial value
-        )
-
-      fv.visitEnd()
-    }
-
     /*
      * must-single-thread
      */