Move ExcludedForwarderFlags to Flags

Author: nicolasstucki

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

@@ -563,7 +563,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
       }
       ctx.debuglog(s"Potentially conflicting names for forwarders: $conflictingNames")
 
-      for (m0 <- sortedMembersBasedOnFlags(moduleClass.info, required = Flags.Method, excluded = DottyBackendInterface.ExcludedForwarderFlags)) {
+      for (m0 <- sortedMembersBasedOnFlags(moduleClass.info, required = Flags.Method, excluded = Flags.ExcludedForwarder)) {
         val m = if (m0.is(Flags.Bridge)) m0.nextOverriddenSymbol else m0
         if (m == NoSymbol)
           ctx.log(s"$m0 is a bridge method that overrides nothing, something went wrong in a previous phase.")

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

@@ -41,7 +41,7 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
 
 
    // require LambdaMetafactory: scalac uses getClassIfDefined, but we need those always.
-  @threadUnsafe lazy val LambdaMetaFactory: ClassSymbol = ctx.requiredClass("java.lang.invoke.LambdaMetafactory")
+  // @threadUnsafe lazy val LambdaMetaFactory: ClassSymbol = ctx.requiredClass("java.lang.invoke.LambdaMetafactory")
   @threadUnsafe lazy val MethodHandle: ClassSymbol      = ctx.requiredClass("java.lang.invoke.MethodHandle")
 
   val externalEquals: Symbol = defn.BoxesRunTimeModule.info.decl(nme.equals_).suchThat(toDenot(_).info.firstParamTypes.size == 2).symbol
@@ -221,10 +221,3 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
   }
 
 }
-
-object DottyBackendInterface {
-  val ExcludedForwarderFlags: Flags.FlagSet = {
-    Flags.Specialized | Flags.Lifted | Flags.Protected | Flags.JavaStatic |
-    Flags.Private | Flags.Macro
-  }
-}

compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala

@@ -548,9 +548,8 @@ class JSCodeGen()(implicit ctx: Context) {
     }.toSet
 
     val members = {
-      import dotty.tools.backend.jvm.DottyBackendInterface.ExcludedForwarderFlags
       moduleClass.info.membersBasedOnFlags(required = Flags.Method,
-          excluded = ExcludedForwarderFlags).map(_.symbol)
+          excluded = Flags.ExcludedForwarder).map(_.symbol)
     }
 
     def isExcluded(m: Symbol): Boolean = {

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

@@ -536,6 +536,7 @@ object Flags {
   val FinalOrInline: FlagSet                 = Final | Inline
   val FinalOrModuleClass: FlagSet            = Final | ModuleClass                            // A module class or a final class
   val EffectivelyFinalFlags: FlagSet         = Final | Private
+  val ExcludedForwarder: Flags.FlagSet       = Specialized | Lifted | Protected | JavaStatic | Private | Macro
   val FinalOrSealed: FlagSet                 = Final | Sealed
   val GivenOrImplicit: FlagSet               = Given | Implicit
   val GivenOrImplicitVal: FlagSet            = GivenOrImplicit.toTermFlags