@@ -1179,29 +1179,53 @@ class TreeUnpickler(reader: TastyReader,
1179
1179
val levels = readNat()
1180
1180
readTerm().outerSelect(levels, SkolemType (readType()))
1181
1181
case SELECTin =>
1182
+ // ================================================================================
1183
+ // Test Report
1184
+ // ================================================================================
1185
+
1186
+ // 3 suites passed, 1 failed, 4 total
1187
+ // tests/pos/avoid.scala failed
1188
+ // tests/pos/i5418.scala failed
1189
+ // tests/pos/i5980.scala failed
1190
+ val srcnme = " ???"
1182
1191
var symname = readName()
1183
1192
var precisesig = readName() match
1184
1193
case SignedName (_, sig, _) => sig
1185
1194
case _ => Signature .NotAMethod
1186
1195
val qual = readTerm()
1187
1196
val qualType = qual.tpe.widenIfUnstable
1188
1197
val space = if currentAddr == end then qualType else readType()
1189
- def selectAmbiguous (name : Name , pre : Type , denot : Denotation ) =
1190
- makeSelect(qual, name, denot.asSeenFrom(pre))
1191
1198
def select (name : Name , sig : Signature , target : Name ) =
1199
+ def accessibleDenot (qualType : Type , name : Name , sig : Signature , target : Name ) = {
1200
+ val pre = ctx.typeAssigner.maybeSkolemizePrefix(qualType, name)
1201
+ val d1 = qualType.findMember(name, pre)
1202
+ if ! d1.isOverloaded && ! d1.atSignature(sig, target).symbol.exists then
1203
+ // TODO: workaround for refined types
1204
+ d1
1205
+ else
1206
+ val d = space.decl(name).atSignature(sig, target)
1207
+ if ! d.symbol.exists then d
1208
+ else if d.symbol.isAccessibleFrom(pre) then d.asSeenFrom(pre)
1209
+ else space.nonPrivateDecl(name).atSignature(sig, target).asSeenFrom(pre)
1210
+ }
1192
1211
makeSelect(qual, name, accessibleDenot(qualType, name, sig, target))
1193
1212
val res = symname match
1194
1213
case SignedName (name, sig, target) =>
1195
1214
val pre = ctx.typeAssigner.maybeSkolemizePrefix(qualType, name)
1196
1215
assert(precisesig != Signature .NotAMethod )
1197
1216
val isAmbiguous = pre.nonPrivateMember(name).match
1198
1217
case d : MultiDenotation =>
1199
- d.atSignature(precisesig , target).isInstanceOf [MultiDenotation ]
1218
+ d.atSignature(sig , target).isInstanceOf [MultiDenotation ]
1200
1219
case _ => false
1201
1220
if isAmbiguous then
1221
+ if ctx.source.name.startsWith(srcnme) then
1222
+ val diff = if sig != precisesig then i " $sig => $precisesig" else i " $sig"
1223
+ report.error(i " $qual . $name differs ambiguously: [ $diff] " )
1202
1224
makeSelect(qual, name, space.decl(name).atSignature(sig, target).asSeenFrom(pre))
1203
1225
else
1204
- select(name, precisesig, target)
1226
+ if ctx.source.name.startsWith(srcnme) && sig != precisesig then
1227
+ report.error(i " $qual . $name differs: [ $sig => $precisesig] " )
1228
+ select(name, sig, target)
1205
1229
case name =>
1206
1230
select(name, Signature .NotAMethod , EmptyTermName )
1207
1231
res
0 commit comments