QuickFix Quickfix #2704

Author: DarkDimius

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

@@ -224,8 +224,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
   def shouldEmitAnnotation(annot: Annotation): Boolean = {
     annot.symbol.isJavaDefined &&
       retentionPolicyOf(annot) != AnnotationRetentionSourceAttr &&
-      annot.args.isEmpty &&
-      !annot.tree.isInstanceOf[Block] // unblocking Olaf, needs a proper fix
+      annot.args.isEmpty
   }
 
   private def retentionPolicyOf(annot: Annotation): Symbol =
@@ -526,13 +525,19 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
     def args: List[Tree] = List.empty // those arguments to scala-defined annotations. they are never emmited
   }
 
-  def assocsFromApply(tree: Tree) = {
+  def assocsFromApply(tree: Tree): List[(Name, Tree)] = {
     tree match {
       case Block(_, expr) => assocsFromApply(expr)
       case Apply(fun, args) =>
         fun.tpe.widen match {
           case MethodType(names) =>
-            names zip args
+            (names zip args).filter{x => x match {
+              case t: tpd.Ident if (t.tpe.normalizedPrefix eq NoPrefix) =>
+                false
+              case _ => true
+            }
+
+            }
         }
     }
   }