Commit e9a54e5

authored

Revert "fix: do not transform Ident to This in PostTyper anymore" (#24059)

Reverts #23899 Related to #23875, #23999

2 parents 7864ebb + 01eab3b commit e9a54e5Copy full SHA for e9a54e5

File tree

+12

-2

lines changed

compiler/src/dotty/tools/dotc/transform
- PatternMatcher.scala
- PostTyper.scala

+12

-2

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,13 @@ object PatternMatcher {`
`482`	`482`	`onSuccess`
`483`	`483`	`)`
`484`	`484`	`}`
`485`		`- case WildcardPattern() =>`
	`485`	+ // When match against a `this.type` (say case a: this.type => ???),
	`486`	+ // the typer will transform the pattern to a `Bind(..., Typed(Ident(a), ThisType(...)))`,
	`487`	+ // then post typer will change all the `Ident` with a `ThisType` to a `This`.
	`488`	+ // Therefore, after pattern matching, we will have the following tree `Bind(..., Typed(This(...), ThisType(...)))`.
	`489`	+ // We handle now here the case were the pattern was transformed to a `This`, relying on the fact that the logic for
	`490`	+ // `Typed` above will create the correct type test.
	`491`	`+ case WildcardPattern() \| This(_) =>`
`486`	`492`	`onSuccess`
`487`	`493`	`case SeqLiteral(pats, _) =>`
`488`	`494`	`matchElemsPlan(scrutinee, pats, exact = true, onSuccess)`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,11 @@ class PostTyper extends MacroTransform with InfoTransformer { thisPhase =>`
`391`	`391`	`checkNotPackage(tree)`
`392`	`392`	`else`
`393`	`393`	`registerNeedsInlining(tree)`
`394`		`- checkUsableAsValue(tree)`
	`394`	`+ val tree1 = checkUsableAsValue(tree)`
	`395`	`+ tree1.tpe match {`
	`396`	`+ case tpe: ThisType => This(tpe.cls).withSpan(tree.span)`
	`397`	`+ case _ => tree1`
	`398`	`+ }`
`395`	`399`	`case tree @ Select(qual, name) =>`
`396`	`400`	`registerNeedsInlining(tree)`
`397`	`401`	`if name.isTypeName then`

Comments

(0)