aboutsummaryrefslogtreecommitdiff
path: root/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2017-03-11 16:19:31 +0100
committerGuillaume Martres <smarter@ubuntu.com>2017-03-12 13:28:27 +0100
commite5e691ea2dd53abb64306b91bf172aaa8e2e6b9c (patch)
treebc6de92440d037bc9e080f97df9c4ff8de025040 /compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala
parentb2d3b8938391516e81f18962e67f5bacf0aa2440 (diff)
downloaddotty-e5e691ea2dd53abb64306b91bf172aaa8e2e6b9c.tar.gz
dotty-e5e691ea2dd53abb64306b91bf172aaa8e2e6b9c.tar.bz2
dotty-e5e691ea2dd53abb64306b91bf172aaa8e2e6b9c.zip
Fix overriding a Java method with varargs
If A method like: override def foo(x: Object*) overrides a Java method, it needs to be rewritten as: def foo(x: Seq[Object]) override def foo(x: Array[Object]): Object = foo(Predef.wrapRefArray(x)) This should be handled by ElimRepeated but there were two bugs: - `addVarArgsBridge` was called at phase `thisTransformer.next`, this is too late to create the bridge since `T*` has already been rewritten as `Seq[T]` - The original method symbol needs to have the `override` flag dropped, since it doesn't override anything. Furthermore, RefChecks had to be moved after ElimRepeated, otherwise the testcase would fail the overriding checks.
Diffstat (limited to 'compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala')
-rw-r--r--compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala9
1 files changed, 7 insertions, 2 deletions
diff --git a/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala b/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala
index 258b7f234..e67b3f114 100644
--- a/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala
+++ b/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala
@@ -95,8 +95,8 @@ class ElimRepeated extends MiniPhaseTransform with InfoTransformer with Annotati
assert(ctx.phase == thisTransformer)
def overridesJava = tree.symbol.allOverriddenSymbols.exists(_ is JavaDefined)
if (tree.symbol.info.isVarArgsMethod && overridesJava)
- addVarArgsBridge(tree)(ctx.withPhase(thisTransformer.next))
- else
+ addVarArgsBridge(tree)
+ else
tree
}
@@ -120,6 +120,11 @@ class ElimRepeated extends MiniPhaseTransform with InfoTransformer with Annotati
.appliedToArgs(vrefs :+ TreeGen.wrapArray(varArgRef, elemtp))
.appliedToArgss(vrefss1)
})
+
+ // Drop the override flag on the user-written method, only the added bridge
+ // is a real override.
+ original.copySymDenotation(initFlags = original.flags &~ Override).installAfter(thisTransformer)
+
Thicket(ddef, bridgeDef)
}