Skip to content

Commit f77e8de

Browse files
authored
Merge pull request #2762 from dotty-staging/unblock-olaf
Quick-fix #2704, to get Olaf unblocked.
2 parents 7381e9d + 7a23b29 commit f77e8de

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,12 +525,16 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
525525
def args: List[Tree] = List.empty // those arguments to scala-defined annotations. they are never emmited
526526
}
527527

528-
def assocsFromApply(tree: Tree) = {
528+
def assocsFromApply(tree: Tree): List[(Name, Tree)] = {
529529
tree match {
530+
case Block(_, expr) => assocsFromApply(expr)
530531
case Apply(fun, args) =>
531532
fun.tpe.widen match {
532533
case MethodType(names) =>
533-
names zip args
534+
(names zip args).filter {
535+
case (_, t: tpd.Ident) if (t.tpe.normalizedPrefix eq NoPrefix) => false
536+
case _ => true
537+
}
534538
}
535539
}
536540
}

0 commit comments

Comments
 (0)