Skip to content

Fix #6946: Fix generic signature for synthetic function types #6948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 28, 2019
Merged

Fix #6946: Fix generic signature for synthetic function types #6948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
478e416
Fix #6946: Fix generic signature for synthetic function types
odersky Jul 27, 2019
0569cd4
Add test
odersky Jul 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,10 @@ object GenericSignatures {
else
jsig(unboxedSeen, toplevel, primitiveOK)
}
else if (defn.isXXLFunctionClass(sym))
classSig(defn.FunctionXXLClass)
else if (defn.isSyntheticFunctionClass(sym)) {
val erasedSym = defn.erasedFunctionClass(sym)
classSig(erasedSym, pre, if (erasedSym.typeParams.isEmpty) Nil else args)
}
else if (sym.isClass)
classSig(sym, pre, args)
else
Expand Down
1 change: 1 addition & 0 deletions tests/generic-java-signatures/i3653.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
public <T> scala.FunctionXXL Foo.bar()
public scala.Function1<scala.Function1<java.lang.String, scala.runtime.BoxedUnit>, scala.runtime.BoxedUnit> Foo.baz()
9 changes: 7 additions & 2 deletions tests/generic-java-signatures/i3653.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@ class Foo {
(a0: T, a1: T, a2: T, a3: T, a4: T, a5: T, a6: T, a7: T, a8: T, a9: T,
b0: T, b1: T, b2: T, b3: T, b4: T, b5: T, b6: T, b7: T, b8: T, b9: T,
c0: T, c1: T, c2: T, c3: T, c4: T, c5: T, c6: T, c7: T, c8: T, c9: T) => 0

// #6946
def baz = (x: given String => Unit) => x given ""
}

object Test {
def main(args: Array[String]): Unit = {
val meth = classOf[Foo].getDeclaredMethod("bar")
println(meth.toGenericString)
val meth1 = classOf[Foo].getDeclaredMethod("bar")
println(meth1.toGenericString)
val meth2 = classOf[Foo].getDeclaredMethod("baz")
println(meth2.toGenericString)
}
}