File tree Expand file tree Collapse file tree 3 files changed +5
-4
lines changed
compiler/src/dotty/tools/dotc Expand file tree Collapse file tree 3 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -2220,7 +2220,8 @@ import transform.SymUtils._
2220
2220
// does in classes, i.e. followed the linearization of the trait itself.
2221
2221
val staticSuperCall = {
2222
2222
val staticSuper = accMixin.asClass.info.parents.reverse
2223
- .find(_.nonPrivateMember(memberName).matchingDenotation(accMixin.thisType, acc.info).exists)
2223
+ .find(_.nonPrivateMember(memberName)
2224
+ .matchingDenotation(accMixin.thisType, acc.info, EmptyTermName ).exists) // !!! TODO: Adapt to @targetName
2224
2225
val staticSuperName = staticSuper match {
2225
2226
case Some (parent) =>
2226
2227
parent.classSymbol.name.show
Original file line number Diff line number Diff line change @@ -938,7 +938,7 @@ object Erasure {
938
938
val origName = retainer.name.asTermName.exclude(BodyRetainerName )
939
939
val inlineMeth = atPhase(typerPhase) {
940
940
retainer.owner.info.decl(origName)
941
- .matchingDenotation(retainer.owner.thisType, stat.symbol.info)
941
+ .matchingDenotation(retainer.owner.thisType, stat.symbol.info, origName) // !!! do something baout @targetName
942
942
.symbol
943
943
}
944
944
(inlineMeth, stat)
Original file line number Diff line number Diff line change @@ -95,7 +95,7 @@ object ResolveSuper {
95
95
while (bcs.nonEmpty && sym == NoSymbol ) {
96
96
val other = bcs.head.info.nonPrivateDecl(memberName)
97
97
.filterWithPredicate(denot => mix.isEmpty || denot.symbol.owner.name == mix)
98
- .matchingDenotation(base.thisType, base.thisType.memberInfo(acc))
98
+ .matchingDenotation(base.thisType, base.thisType.memberInfo(acc), memberName) // !!! TODO: rebind with targetName
99
99
report.debuglog(i " rebindsuper ${bcs.head} $other deferred = ${other.symbol.is(Deferred )}" )
100
100
if other.exists && ! other.symbol.is(Deferred ) then
101
101
sym = other.symbol
@@ -108,7 +108,7 @@ object ResolveSuper {
108
108
109
109
bcs = bcs.tail
110
110
}
111
- assert(sym.exists)
111
+ assert(sym.exists, i " cannot rebind $acc , ${acc.erasedName} $memberName " )
112
112
sym
113
113
}
114
114
}
You can’t perform that action at this time.
0 commit comments