Skip to content

Commit 4d45087

Browse files
authored
Check @TargetNAME when subtyping Refined Types (#19081)
Closes #18922
2 parents c88c0fe + ea509f4 commit 4d45087

File tree

5 files changed

+30
-4
lines changed

5 files changed

+30
-4
lines changed

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -2084,9 +2084,10 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
20842084
ExprType(info1.resType)
20852085
case info1 => info1
20862086

2087-
isSubInfo(info1, info2, m.symbol.info.orElse(info1))
2088-
|| matchAbstractTypeMember(m.info)
2089-
|| (tp1.isStable && m.symbol.isStableMember && isSubType(TermRef(tp1, m.symbol), tp2.refinedInfo))
2087+
m.symbol.hasTargetName(m.symbol.name) && (
2088+
isSubInfo(info1, info2, m.symbol.info.orElse(info1))
2089+
|| matchAbstractTypeMember(m.info)
2090+
|| (tp1.isStable && m.symbol.isStableMember && isSubType(TermRef(tp1, m.symbol), tp2.refinedInfo)))
20902091
end qualifies
20912092

20922093
tp1.member(name).hasAltWithInline(qualifies)

tests/neg/i18922.check

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-- [E007] Type Mismatch Error: tests/neg/i18922.scala:11:27 ------------------------------------------------------------
2+
11 |def test = doClose(Resource()) // error
3+
| ^^^^^^^^^^
4+
| Found: Resource
5+
| Required: Object{def close(): Unit}
6+
|
7+
| longer explanation available when compiling with `-explain`

tests/neg/i18922.scala

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import scala.annotation.targetName
2+
3+
def doClose(closable: { def close(): Unit }): Unit =
4+
import reflect.Selectable.reflectiveSelectable
5+
closable.close()
6+
7+
class Resource:
8+
@targetName("foo")
9+
def close(): Unit = ???
10+
11+
def test = doClose(Resource()) // error

tests/neg/targetName-refine.check

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-- [E007] Type Mismatch Error: tests/neg/targetName-refine.scala:7:27 --------------------------------------------------
2+
7 |val x: T { def f: Int } = C() // error
3+
| ^^^
4+
| Found: C
5+
| Required: T{def f: Int}
6+
|
7+
| longer explanation available when compiling with `-explain`

tests/pos/targetName-refine.scala renamed to tests/neg/targetName-refine.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ trait T:
44
class C extends T:
55
@targetName("f2") def f: Int = 1
66

7-
val x: T { def f: Int } = C()
7+
val x: T { def f: Int } = C() // error
88

0 commit comments

Comments
 (0)