QuickFix Quickfix #2704

DarkDimius · DarkDimius · commit 0269f92321a4 · 2017-06-15T13:16:59.000+02:00
diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/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 =
@@ -532,7 +531,13 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
       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
+            }
+
+            }
         }
     }
   }
diff --git a/scala-backend b/scala-backend
@@ -1 +1 @@
-Subproject commit cee714f5331650f0ccf86343a4bf79255c6a602a
+Subproject commit 253ae6c0155a553bef4b1a312e25fc5f18f4c5e4
diff --git a/scala2-library b/scala2-library
@@ -1 +1 @@
-Subproject commit c14809b706da013349581c713a7fde04ed47d2d3
+Subproject commit de7e6a71e527d559ddad3a29af5861dd919f9079

Original file line number	Diff line number	Diff line change
`@@ -224,8 +224,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma`
`224`	`224`	`def shouldEmitAnnotation(annot: Annotation): Boolean = {`
`225`	`225`	`annot.symbol.isJavaDefined &&`
`226`	`226`	`retentionPolicyOf(annot) != AnnotationRetentionSourceAttr &&`
`227`		`- annot.args.isEmpty &&`
`228`		`- !annot.tree.isInstanceOf[Block] // unblocking Olaf, needs a proper fix`
	`227`	`+ annot.args.isEmpty`
`229`	`228`	`}`
`230`	`229`
`231`	`230`	`private def retentionPolicyOf(annot: Annotation): Symbol =`
`@@ -532,7 +531,13 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma`
`532`	`531`	`case Apply(fun, args) =>`
`533`	`532`	`fun.tpe.widen match {`
`534`	`533`	`case MethodType(names) =>`
`535`		`- names zip args`
	`534`	`+ (names zip args).filter{x => x match {`
	`535`	`+ case t: tpd.Ident if (t.tpe.normalizedPrefix eq NoPrefix) =>`
	`536`	`+ false`
	`537`	`+ case _ => true`
	`538`	`+ }`
	`539`	`+`
	`540`	`+ }`
`536`	`541`	`}`
`537`	`542`	`}`
`538`	`543`	`}`