Skip to content
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.

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

Get generic signature of fields entered after erasure from their accessor #19207

Merged
merged 1 commit into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,9 @@ trait BCodeHelpers extends BCodeIdiomatic {
atPhase(erasurePhase) {
val memberTpe =
if (sym.is(Method)) sym.denot.info
else if sym.denot.validFor.phaseId > erasurePhase.id && sym.isField && sym.getter.exists then
// Memoization field of getter entered after erasure, see run/i17069 for an example
sym.getter.denot.info.resultType
else owner.denot.thisType.memberInfo(sym)
getGenericSignatureHelper(sym, owner, memberTpe).orNull
}
Expand Down
10 changes: 10 additions & 0 deletions tests/generic-java-signatures/17069.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

class Foo:
val generic: List[String] = ???

@main def Test =
val tpe = classOf[Foo].getDeclaredField("generic").getGenericType()
assert(tpe.getTypeName == "scala.collection.immutable.List<java.lang.String>")

val tpe2 = classOf[Foo].getDeclaredMethod("generic").getGenericReturnType()
assert(tpe2.getTypeName == "scala.collection.immutable.List<java.lang.String>")
Loading