Skip to content

Commit 5a70e5a

Browse files
authored
Get generic signature of fields entered after erasure from their accessor (#19207)
Fix #17069.
2 parents 1734148 + dad90f4 commit 5a70e5a

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,9 @@ trait BCodeHelpers extends BCodeIdiomatic {
397397
atPhase(erasurePhase) {
398398
val memberTpe =
399399
if (sym.is(Method)) sym.denot.info
400+
else if sym.denot.validFor.phaseId > erasurePhase.id && sym.isField && sym.getter.exists then
401+
// Memoization field of getter entered after erasure, see run/i17069 for an example
402+
sym.getter.denot.info.resultType
400403
else owner.denot.thisType.memberInfo(sym)
401404
getGenericSignatureHelper(sym, owner, memberTpe).orNull
402405
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
class Foo:
3+
val generic: List[String] = ???
4+
5+
@main def Test =
6+
val tpe = classOf[Foo].getDeclaredField("generic").getGenericType()
7+
assert(tpe.getTypeName == "scala.collection.immutable.List<java.lang.String>")
8+
9+
val tpe2 = classOf[Foo].getDeclaredMethod("generic").getGenericReturnType()
10+
assert(tpe2.getTypeName == "scala.collection.immutable.List<java.lang.String>")

0 commit comments

Comments
 (0)