Skip to content

Commit ab62df0

Browse files
committed
Revert "Workaround #4819: Avoid creating incorrect JointRefDenotations"
This partially reverts 4e695fb which is no longer needed after this PR (#5622), because we no longer try to merge in a single denotation a PolyType and a MethodType.
1 parent 6c31e64 commit ab62df0

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

compiler/src/dotty/tools/dotc/core/Denotations.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,6 @@ object Denotations {
494494
* boundary of sym1. For protected access, we count the enclosing
495495
* package as access boundary.
496496
* 5. sym1 is a method but sym2 is not.
497-
* 6. sym1 is a non-polymorphic method but sym2 is a polymorphic method.
498-
* (to be consistent with infoMeet, see #4819)
499497
* The aim of these criteria is to give some disambiguation on access which
500498
* - does not depend on textual order or other arbitrary choices
501499
* - minimizes raising of doubleDef errors
@@ -510,7 +508,6 @@ object Denotations {
510508
accessBoundary(sym2).isProperlyContainedIn(accessBoundary(sym1)) ||
511509
sym2.is(Bridge) && !sym1.is(Bridge) ||
512510
sym1.is(Method) && !sym2.is(Method)) ||
513-
sym1.info.isInstanceOf[MethodType] && sym2.info.isInstanceOf[PolyType] ||
514511
sym1.info.isErroneous)
515512

516513
/** Sym preference provided types also override */

0 commit comments

Comments
 (0)