Skip to content
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.

Sign up for GitHub

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

Avoid erasure/preErasure issues around Any in transformIsInstanceOf #21647

Merged
merged 3 commits into from
Nov 2, 2024
Merged

Avoid erasure/preErasure issues around Any in transformIsInstanceOf #21647

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d02d4b8
Avoid erasure/preErasure issues around Any in transformIsInstanceOf
dwijnand Sep 25, 2024
7b721f0
Simplify transformIsInstanceOf check
dwijnand Oct 30, 2024
49d876a
Add extra isInstanceOf test cases
dwijnand Nov 2, 2024
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
6 changes: 5 additions & 1 deletion compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,11 @@ object TypeTestsCasts {
report.error(em"$untestable cannot be used in runtime type tests", tree.srcPos)
constant(expr, Literal(Constant(false)))
case _ =>
val erasedTestType = erasure(testType)
val erasedTestType =
if testType.isAny && expr.tpe.isPrimitiveValueType then
defn.AnyValType
Copy link
Member

Choose a reason for hiding this comment

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

Isn't that going to trigger with the same issue with any other type that erases to Object? Like ... AnyVal itself?

There's supposed to already be logic in transformIsInstanceOf to avoid a type test when expr.tpe <:< testType:

scala3/compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala

Lines 259 to 261 in 9961e70

if (expr.tpe <:< testType) && inMatch then
if expr.tpe.isNotNull then constant(expr, Literal(Constant(true)))
else expr.testNotNull

The problem is that it tests on erased types, instead of the original types. Addressing that at the root should be more robust, shouldn't it?

else
erasure(testType)
transformIsInstanceOf(expr, erasedTestType, erasedTestType, flagUnrelated)
}

Expand Down
2 changes: 2 additions & 0 deletions tests/pos/i21544.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class Test():
def m1(xs: List[Boolean]) = for (x: Any) <- xs yield x
Loading