Skip to content

Make singleton typecase patterns and type checks consistent #7027

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

Merged
merged 3 commits into from
Dec 12, 2019
Merged
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
15 changes: 13 additions & 2 deletions compiler/src/dotty/tools/dotc/transform/FirstTransform.scala
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,16 @@ class FirstTransform extends MiniPhase with InfoTransformer { thisPhase =>
}

override def transformIdent(tree: Ident)(implicit ctx: Context): Tree =
if (tree.isType) toTypeTree(tree) else constToLiteral(tree)
if (tree.isType) {
toTypeTree(tree)
} else if (tree.name != nme.WILDCARD) {
// We constant-fold all idents except wildcards.
// AFAIK, constant-foldable wildcard idents can only occur in patterns, for instance as `case _: "a"`.
// Constant-folding that would result in `case "a": "a"`, which changes the meaning of the pattern.
// Note that we _do_ want to constant-fold idents in patterns that _aren't_ wildcards -
// for example, @switch annotation needs to see inlined literals and not indirect references.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@smarter I think this comment is at the precise level of detail that we want. I don't think going into the subtle differences of Bind/Ident nodes in patterns makes sense - if we did that consequently in the whole compiler, then more than half of the documentation would be permanently outdated.

constToLiteral(tree)
} else tree

override def transformSelect(tree: Select)(implicit ctx: Context): Tree =
if (tree.isType) toTypeTree(tree) else constToLiteral(tree)
Expand All @@ -156,7 +165,9 @@ class FirstTransform extends MiniPhase with InfoTransformer { thisPhase =>
constToLiteral(foldCondition(tree))

override def transformTyped(tree: Typed)(implicit ctx: Context): Tree =
constToLiteral(tree)
// Singleton type cases (such as `case _: "a"`) are constant-foldable.
// We avoid constant-folding those as doing so would change the meaning of the pattern (see transformIdent).
if (!ctx.mode.is(Mode.Pattern)) constToLiteral(tree) else tree

override def transformBlock(tree: Block)(implicit ctx: Context): Tree =
constToLiteral(tree)
Expand Down
3 changes: 3 additions & 0 deletions tests/run/i6996.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
an `a`
false
not `a`
14 changes: 14 additions & 0 deletions tests/run/i6996.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
object Test {

def isAType(arg: String): Unit = arg match {
case _ : "a" => println("an `a`")
case _ => println("not `a`")
}

def main(args: Array[String]): Unit = {
isAType("a")
println(new String("a").isInstanceOf["a"])
Copy link
Member

Choose a reason for hiding this comment

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

I argue in #6996 that this should return true.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Regardless of the result of that discussion, I think we can merge this PR. It's unlikely that we want FirstTransform to accidentally mangle some patterns.

isAType(new String("a"))
}

}