Merge pull request #1241 from dotty-staging/fix-#1222

Transform annotations only if defined in current run

4 files changed, 20 insertions, 7 deletions

diff --git a/src/dotty/tools/dotc/ast/Desugar.scala b/src/dotty/tools/dotc/ast/Desugar.scala
index b6a4dc5e7..12c1e65a6 100644
--- a/src/dotty/tools/dotc/ast/Desugar.scala
+++ b/src/dotty/tools/dotc/ast/Desugar.scala
@@ -46,7 +46,11 @@ object desugar {
      */
     override def ensureCompletions(implicit ctx: Context) =
       if (!(ctx.owner is Package))
-        if (ctx.owner is ModuleClass) ctx.owner.linkedClass.ensureCompleted()
+        if (ctx.owner.isClass) {
+          ctx.owner.ensureCompleted()
+          if (ctx.owner is ModuleClass)
+            ctx.owner.linkedClass.ensureCompleted()
+        }
         else ensureCompletions(ctx.outer)
 
     /** Return info of original symbol, where all references to siblings of the
diff --git a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
index 83d427a8f..cceaed53d 100644
--- a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
+++ b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
@@ -179,7 +179,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
     val ex = new BadSignature(
       sm"""error reading Scala signature of $classRoot from $source:
           |error occurred at position $readIndex: $msg""")
-    if (ctx.debug || true) original.getOrElse(ex).printStackTrace() // temporarilly enable printing of original failure signature to debug failing builds
+    if (ctx.debug || true) original.getOrElse(ex).printStackTrace() // temporarily enable printing of original failure signature to debug failing builds
     throw ex
   }
 
diff --git a/src/dotty/tools/dotc/transform/TreeTransform.scala b/src/dotty/tools/dotc/transform/TreeTransform.scala
index 67bd2f160..abada9ab4 100644
--- a/src/dotty/tools/dotc/transform/TreeTransform.scala
+++ b/src/dotty/tools/dotc/transform/TreeTransform.scala
@@ -185,12 +185,19 @@ object TreeTransforms {
 
       ref match {
         case ref: SymDenotation =>
-          val annotTrees = ref.annotations.map(_.tree)
-          val annotTrees1 = annotTrees.mapConserve(annotationTransformer.macroTransform)
-          val annots1 = if (annotTrees eq annotTrees1) ref.annotations else annotTrees1.map(new ConcreteAnnotation(_))
+          val annots1 =
+            if (!ref.symbol.isDefinedInCurrentRun) ref.annotations // leave annotations read from class files alone
+            else {
+              val annotTrees = ref.annotations.map(_.tree)
+              val annotTrees1 = annotTrees.mapConserve(annotationTransformer.macroTransform)
+              if (annotTrees eq annotTrees1) ref.annotations
+              else annotTrees1.map(new ConcreteAnnotation(_))
+            }
           if ((info1 eq ref.info) && (annots1 eq ref.annotations)) ref
           else ref.copySymDenotation(info = info1, annotations = annots1)
-        case _ => if (info1 eq ref.info) ref else ref.derivedSingleDenotation(ref.symbol, info1)
+        case _ =>
+          if (info1 eq ref.info) ref
+          else ref.derivedSingleDenotation(ref.symbol, info1)
       }
     }
   }
diff --git a/src/dotty/tools/dotc/typer/Applications.scala b/src/dotty/tools/dotc/typer/Applications.scala
index d70546f9d..390ecaee9 100644
--- a/src/dotty/tools/dotc/typer/Applications.scala
+++ b/src/dotty/tools/dotc/typer/Applications.scala
@@ -925,7 +925,9 @@ trait Applications extends Compatibility { self: Typer =>
     /** Drop any implicit parameter section */
     def stripImplicit(tp: Type): Type = tp match {
       case mt: ImplicitMethodType if !mt.isDependent =>
-        mt.resultType // todo: make sure implicit method types are not dependent
+        mt.resultType
+          // todo: make sure implicit method types are not dependent?
+          // but check test case in /tests/pos/depmet_implicit_chaining_zw.scala
       case pt: PolyType =>
         pt.derivedPolyType(pt.paramNames, pt.paramBounds, stripImplicit(pt.resultType))
       case _ =>