Add isScalaStatic to SymUtils

Author: nicolasstucki

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

@@ -17,6 +17,7 @@ import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.core.StdNames.{nme, str}
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.transform.Erasure
+import dotty.tools.dotc.transform.SymUtils._
 import dotty.tools.dotc.util.Spans._
 
 /*
@@ -464,7 +465,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
      * must-single-thread
      */
     private def fieldOp(field: Symbol, isLoad: Boolean, specificReceiver: Symbol): Unit = {
-      val useSpecificReceiver = specificReceiver != null && !field.hasAnnotation(ctx.definitions.ScalaStaticAnnot)
+      val useSpecificReceiver = specificReceiver != null && !field.isScalaStatic
 
       val owner      = internalName(if (useSpecificReceiver) specificReceiver else field.owner)
       val fieldJName = field.name.mangledString.toString
@@ -1126,7 +1127,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
         if (specificReceiver != null)
           assert(style.isVirtual || specificReceiver == methodOwner, s"specificReceiver can only be specified for virtual calls. $method - $specificReceiver")
 
-        val useSpecificReceiver = specificReceiver != null && (specificReceiver ne defn.NullClass) && (specificReceiver ne defn.NothingClass) && !method.hasAnnotation(ctx.definitions.ScalaStaticAnnot)
+        val useSpecificReceiver = specificReceiver != null && (specificReceiver ne defn.NullClass) && (specificReceiver ne defn.NothingClass) && !method.isScalaStatic
         val receiver = if (useSpecificReceiver) specificReceiver else methodOwner
 
         // workaround for a JVM bug: https://bugs.openjdk.java.net/browse/JDK-8154587

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

@@ -123,7 +123,7 @@ object DottyBackendInterface {
     def isStaticConstructor(using Context): Boolean = (sym.isStaticMember && sym.isClassConstructor) || (sym.name eq nme.STATIC_CONSTRUCTOR)
 
     def isStaticMember(using Context): Boolean = (sym ne NoSymbol) &&
-      (sym.is(Flags.JavaStatic) || sym.hasAnnotation(ctx.definitions.ScalaStaticAnnot))
+      (sym.is(Flags.JavaStatic) || sym.isScalaStatic)
       // guard against no sumbol cause this code is executed to select which call type(static\dynamic) to use to call array.clone
 
     /**

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

@@ -10,6 +10,8 @@ import dotty.tools.dotc.ast.tpd
 import Decorators._
 import reporting.messages._
 
+import dotty.tools.dotc.transform.SymUtils._
+
 /** A transformer that check that requirements of Static fields\methods are implemented:
   *  1. Only objects can have members annotated with `@static`
   *  2. The fields annotated with `@static` should precede any non-`@static` fields.
@@ -31,7 +33,7 @@ class CheckStatic extends MiniPhase {
     val defns = tree.body.collect{case t: ValOrDefDef => t}
     var hadNonStaticField = false
     for (defn <- defns)
-      if (defn.symbol.hasAnnotation(ctx.definitions.ScalaStaticAnnot)) {
+      if (defn.symbol.isScalaStatic) {
         if (!ctx.owner.is(Module))
           ctx.error(StaticFieldsOnlyAllowedInObjects(defn.symbol), defn.sourcePos)
 

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

@@ -9,6 +9,7 @@ import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core._
 import dotty.tools.dotc.transform.MegaPhase._
+import dotty.tools.dotc.transform.SymUtils._
 
 /** Removes selects that would be compiled into GetStatic
  * otherwise backend needs to be aware that some qualifiers need to be dropped.
@@ -25,7 +26,7 @@ class SelectStatic extends MiniPhase with IdentityDenotTransformer {
     def isStaticMember =
       (sym is Flags.Module) && sym.initial.maybeOwner.initial.isStaticOwner ||
       (sym is Flags.JavaStatic) ||
-      sym.hasAnnotation(ctx.definitions.ScalaStaticAnnot)
+      sym.isScalaStatic
     val isStaticRef = !sym.is(Package) && !sym.maybeOwner.is(Package) && isStaticMember
     val tree1 =
       if (isStaticRef && !tree.qualifier.symbol.isAllOf(JavaModule) && !tree.qualifier.isType)

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

@@ -227,4 +227,8 @@ class SymUtils(val self: Symbol) extends AnyVal {
 
   def isCollectiveExtensionClass(using Context): Boolean =
     self.is(ModuleClass) && self.sourceModule.is(Extension, butNot = Method)
+
+  def isScalaStatic(using Context): Boolean =
+    self.hasAnnotation(ctx.definitions.ScalaStaticAnnot)
+
 }