Merge pull request #9069 from lrytz/revert9023

Revert "Fix cycle when annotation argument references the annottee"
scala · Jun 22, 2020 · a9d3775 · a9d3775
2 parents bc040e4 + a41a919
commit a9d3775
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 76 deletions.
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -1890,19 +1890,12 @@ trait Namers extends MethodSynthesis {
     def annotSig(annotations: List[Tree], annotee: Tree, pred: AnnotationInfo => Boolean): List[AnnotationInfo] =
       annotations filterNot (_ eq null) map { ann =>
         val ctx = typer.context
-        // enteringTyper to allow inferView in annotation args, scala/bug#5892
-        def createAnnotationInfo = enteringTyper {
-          val annotSig = newTyper(ctx.makeNonSilent(ann)).typedAnnotation(ann, Some(annotee))
-          if (pred(annotSig)) annotSig else UnmappableAnnotation // UnmappableAnnotation will be dropped in typedValDef and typedDefDef
-        }
-
-        ann match {
-          case Apply(_, Nil)  =>
-            // zero-argument annotations can be computed eagerly, see also TreeInfo.isUncheckedStable
-            createAnnotationInfo
-          case _ =>
-            // need to be lazy, scala/bug#1782
-            AnnotationInfo lazily createAnnotationInfo
+        // need to be lazy, #1782. enteringTyper to allow inferView in annotation args, scala/bug#5892.
+        AnnotationInfo lazily {
+          enteringTyper {
+            val annotSig = newTyper(ctx.makeNonSilent(ann)).typedAnnotation(ann, Some(annotee))
+            if (pred(annotSig)) annotSig else UnmappableAnnotation // UnmappableAnnotation will be dropped in typedValDef and typedDefDef
+          }
         }
       }
 

diff --git a/src/reflect/scala/reflect/internal/TreeInfo.scala b/src/reflect/scala/reflect/internal/TreeInfo.scala
@@ -118,9 +118,7 @@ abstract class TreeInfo {
   private def symOk(sym: Symbol) = sym != null && !sym.isError && sym != NoSymbol
   private def typeOk(tp: Type)   =  tp != null && ! tp.isError
 
-  private def isUncheckedStable(sym: Symbol) =
-    // zero-arg annotations (like @uncheckedStable) are created eagerly. avoid forcing all annotations (scala/bug#11870).
-    sym.isTerm && sym.annotations.exists(ann => ann.isInstanceOf[CompleteAnnotationInfo] && ann.symbol == uncheckedStableClass)
+  private def isUncheckedStable(sym: Symbol) = sym.isTerm && sym.hasAnnotation(uncheckedStableClass)
 
   /** Assuming `sym` is a member of `tree`, is it a "stable member"?
    *

diff --git a/test/files/pos/t11870.scala b/test/files/pos/t11870.scala