WIP Simplifications

compiler/src/dotty/tools/dotc/config/Feature.scala

@@ -148,7 +148,7 @@ object Feature:
       false
 
   def checkExperimentalFeature(which: String, srcPos: SrcPos, note: => String = "")(using Context) =
-    if !isExperimentalGloballyEnabled && !isExperimentalByImportEnabled && !isExperimentalUnstableEnabled then
+    if !isExperimentalEnabled && !isExperimentalUnstableEnabled then
       report.error(
         em"""Experimental $which may only be used under experimental mode:
             |  1. In a definition marked as @experimental
@@ -161,7 +161,7 @@ object Feature:
     ccEnabled && defn.ccExperimental.contains(sym)
 
   def checkExperimentalDef(sym: Symbol, srcPos: SrcPos)(using Context) =
-    if !isExperimentalGloballyEnabled && !isExperimentalByImportEnabled && !isExperimentalUnstableEnabled then
+    if !isExperimentalEnabled && !isExperimentalUnstableEnabled then
       val experimentalSym =
         if sym.hasAnnotation(defn.ExperimentalAnnot) then sym
         else if sym.owner.hasAnnotation(defn.ExperimentalAnnot) then sym.owner
@@ -184,17 +184,14 @@ object Feature:
   def isExperimentalUnstableEnabled(using Context): Boolean =
     Properties.experimental && !ctx.settings.YnoExperimental.value
 
-  /** Experimental mode enabled in this compilation unit
+  /** Experimental mode enabled in this scope if:
    *  - Compiled with `-experimental`
    *  - Compiled with `-language:experimental.xyz`
+   *  - A `language.experimental.xyz` import is in scope
    */
-  def isExperimentalGloballyEnabled(using Context): Boolean =
+  def isExperimentalEnabled(using Context): Boolean =
     ctx.settings.experimental.value ||
-    experimentalAutoEnableFeatures.exists(enabledBySetting)
-
-  /** Experimental mode enabled by a `language.experimental` import in scope */
-  def isExperimentalByImportEnabled(using Context): Boolean =
-    experimentalAutoEnableFeatures.exists(enabledByImport)
+    experimentalAutoEnableFeatures.exists(enabled)
 
   /** Handle language import `import language.<prefix>.<imported>` if it is one
    *  of the global imports `pureFunctions` or `captureChecking`. In this case

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

@@ -545,22 +545,14 @@ class PostTyper extends MacroTransform with InfoTransformer { thisPhase =>
           report.error("`erased` definition cannot be implemented with en expression of type Null", tree.srcPos)
 
     private def annotateExperimental(sym: Symbol)(using Context): Unit =
-      def companionOfExperimental =
-        sym.is(Module) && sym.companionClass.hasAnnotation(defn.ExperimentalAnnot)
-      def topLevelDefinitionWithExperimentalEnabledInUnit =
-        sym.isTopLevelDefinition && (Feature.isExperimentalGloballyEnabled || Feature.isExperimentalByImportEnabled)
-      if !sym.hasAnnotation(defn.ExperimentalAnnot) && (companionOfExperimental || topLevelDefinitionWithExperimentalEnabledInUnit) then
+      def companionOfErasedNeedsErased =
+        !sym.hasAnnotation(defn.ExperimentalAnnot) && sym.is(Module) && sym.companionClass.hasAnnotation(defn.ExperimentalAnnot)
+      def needsExperimentalByImportOrSetting =
+        !sym.ownersIterator.exists(_.hasAnnotation(defn.ExperimentalAnnot))
+        && Feature.isExperimentalEnabled
+      if companionOfErasedNeedsErased || needsExperimentalByImportOrSetting then
         sym.addAnnotation(Annotation(defn.ExperimentalAnnot, sym.span))
 
-      // TODO do this on import statement
-      val topLevelDefinition = sym.topLevelDefinition
-      if topLevelDefinition.exists &&
-        !topLevelDefinition.hasAnnotation(defn.ExperimentalAnnot)
-        && Feature.isExperimentalByImportEnabled
-      then
-        topLevelDefinition.addAnnotation(Annotation(defn.ExperimentalAnnot, sym.span))
-        if topLevelDefinition.is(Module) then topLevelDefinition.companionModule.addAnnotation(Annotation(defn.ExperimentalAnnot, sym.span))
-
     private def scala2LibPatch(tree: TypeDef)(using Context) =
       val sym = tree.symbol
       if compilingScala2StdLib && sym.is(ModuleClass) then