Skip to content

Commit e5e691e

Browse files
committed
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.
1 parent b2d3b89 commit e5e691e

File tree

5 files changed

+20
-4
lines changed

5 files changed

+20
-4
lines changed

compiler/src/dotty/tools/dotc/Compiler.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ class Compiler {
4848
List(new Pickler), // Generate TASTY info
4949
List(new FirstTransform, // Some transformations to put trees into a canonical form
5050
new CheckReentrant), // Internal use only: Check that compiled program has no data races involving global vars
51-
List(new RefChecks, // Various checks mostly related to abstract members and overriding
52-
new CheckStatic, // Check restrictions that apply to @static members
51+
List(new CheckStatic, // Check restrictions that apply to @static members
5352
new ElimRepeated, // Rewrite vararg parameters and arguments
53+
new RefChecks, // Various checks mostly related to abstract members and overriding
5454
new NormalizeFlags, // Rewrite some definition flags
5555
new ExtensionMethods, // Expand methods of value classes with extension methods
5656
new ExpandSAMs, // Expand single abstract method closures to anonymous classes

compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ class ElimRepeated extends MiniPhaseTransform with InfoTransformer with Annotati
9595
assert(ctx.phase == thisTransformer)
9696
def overridesJava = tree.symbol.allOverriddenSymbols.exists(_ is JavaDefined)
9797
if (tree.symbol.info.isVarArgsMethod && overridesJava)
98-
addVarArgsBridge(tree)(ctx.withPhase(thisTransformer.next))
99-
else
98+
addVarArgsBridge(tree)
99+
else
100100
tree
101101
}
102102

@@ -120,6 +120,11 @@ class ElimRepeated extends MiniPhaseTransform with InfoTransformer with Annotati
120120
.appliedToArgs(vrefs :+ TreeGen.wrapArray(varArgRef, elemtp))
121121
.appliedToArgss(vrefss1)
122122
})
123+
124+
// Drop the override flag on the user-written method, only the added bridge
125+
// is a real override.
126+
original.copySymDenotation(initFlags = original.flags &~ Override).installAfter(thisTransformer)
127+
123128
Thicket(ddef, bridgeDef)
124129
}
125130

compiler/src/dotty/tools/dotc/typer/RefChecks.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,9 @@ class RefChecks extends MiniPhase { thisTransformer =>
766766

767767
override def phaseName: String = "refchecks"
768768

769+
// Needs to run after ElimRepeated for override checks involving varargs methods
770+
override def runsAfter = Set(classOf[ElimRepeated])
771+
769772
val treeTransform = new Transform(NoLevelInfo)
770773

771774
class Transform(currentLevel: RefChecks.OptLevelInfo = RefChecks.NoLevelInfo) extends TreeTransform {
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class Base {
2+
public Object foo(Object... x) {
3+
return x;
4+
}
5+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class Sub extends Base {
2+
override def foo(x: Object*): Object = x
3+
}

0 commit comments

Comments
 (0)