Skip to content

Fix #1463: no type cast in singelton equality test #2988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala
Original file line number Diff line number Diff line change
Expand Up @@ -308,12 +308,12 @@ object PatternMatcher {
if (scrutinee.info.isNotNull || nonNull(scrutinee)) unappPlan
else TestPlan(NonNullTest, scrutinee, tree.pos, unappPlan, onFailure)
case Bind(name, body) =>
val body1 = patternPlan(scrutinee, body, onSuccess, onFailure)
if (name == nme.WILDCARD) body1
if (name == nme.WILDCARD) patternPlan(scrutinee, body, onSuccess, onFailure)
else {
// The type of `name` may refer to val in `body`, therefore should come after `body`
val bound = tree.symbol.asTerm
initializer(bound) = ref(scrutinee)
LetPlan(bound, body1)
patternPlan(scrutinee, body, LetPlan(bound, onSuccess), onFailure)
}
case Alternative(alts) =>
labelAbstract(onSuccess) { ons =>
Expand Down Expand Up @@ -839,7 +839,12 @@ object PatternMatcher {
else
If(emitCondition(plan).withPos(plan.pos), emit(plan.onSuccess), emit(plan.onFailure))
case LetPlan(sym, body) =>
seq(ValDef(sym, initializer(sym).ensureConforms(sym.info)) :: Nil, emit(body))
(sym.info, initializer(sym)) match {
case (tmref: TermRef, _: RefTree) if tmref.isStable => // check #1463, no type cast needed
seq(ValDef(sym, ref(tmref)) :: Nil, emit(body))
case (_, init) =>
seq(ValDef(sym, init.ensureConforms(sym.info)) :: Nil, emit(body))
}
case LabelledPlan(label, body, params) =>
label.info = MethodType.fromSymbols(params, resultType)
val labelDef = DefDef(label, Nil, params :: Nil, resultType, emit(labelled(label)))
Expand Down
26 changes: 26 additions & 0 deletions tests/run/i1463.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
object Test {
case object Bob { override def equals(other: Any) = true }

class Bob2 {
override def equals(other: Any) = true
}
val Bob2 = new Bob2

def f0(x: Any) = x match { case Bob2 => Bob2 } // class cast exception at runtime, dotc only
def f1(x: Any) = x match { case Bob => Bob } // class cast exception at runtime, dotc only
def f2(x: Any): Bob.type = x match { case x @ Bob => x } // class cast exception at runtime, dotc and javac.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should not typecheck because x in the right hand side should have type Any, not Bob.type, as explained in my comment: #1463 (comment)
This matches the behavior of scalac with -Xfuture.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @smarter , I see both approaches may cause some confusion to programmers. We need a spec here, are you happy with what's in -Xfuture in 2.11 and 2.12, @odersky ?


def main(args: Array[String]): Unit = {
assert(f0(Bob2) eq Bob2)
assert(f0(0) eq Bob2) // only dotty fails here
assert(f0(Nil) eq Bob2)

assert(f1(Bob) eq Bob)
assert(f1(0) eq Bob) // only dotty fails here
assert(f1(Nil) eq Bob)

assert(f2(Bob) eq Bob)
assert(f2(0) eq Bob) // both dotty and scalac fail here
assert(f2(Nil) eq Bob)
}
}