Merge pull request #10818 from dotty-staging/fix-#10817

Fix #10817: Harden CheckStatic

Author: odersky

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

@@ -36,6 +36,7 @@ class CheckStatic extends MiniPhase {
       if (defn.symbol.isScalaStatic) {
         if (!ctx.owner.is(Module))
           report.error(StaticFieldsOnlyAllowedInObjects(defn.symbol), defn.srcPos)
+          defn.symbol.resetFlag(JavaStatic)
 
         if (defn.isInstanceOf[ValDef] && hadNonStaticField)
           report.error(StaticFieldsShouldPrecedeNonStatic(defn.symbol, defns), defn.srcPos)
@@ -68,6 +69,7 @@ class CheckStatic extends MiniPhase {
           case t: Select => isSafeQual(t.qualifier) && symbolWhitelist.contains(t.symbol)
           case t: Ident => symbolWhitelist.contains(t.symbol)
           case t: Block => t.stats.forall(tpd.isPureExpr) && isSafeQual(t.expr)
+          case _ => false
         }
       if (isSafeQual(tree.qualifier))
         ref(tree.symbol)

tests/neg/i10817.scala

@@ -0,0 +1,6 @@
+import annotation.static
+
+class T:
+  @static val foo = 10 // error
+
+val x = (new T).foo