Skip to content

Commit 5c36cb8

Browse files
authored
Revert "Fix #3348: use a new typeState in inferView"
1 parent e1365d9 commit 5c36cb8

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

compiler/src/dotty/tools/dotc/typer/Typer.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2224,11 +2224,9 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
22242224
if (isFullyDefined(wtp, force = ForceDegree.all) &&
22252225
ctx.typerState.constraint.ne(prevConstraint)) adapt(tree, pt)
22262226
else err.typeMismatch(tree, pt, failure)
2227-
if (ctx.mode.is(Mode.ImplicitsEnabled)) {
2228-
val nestedCtx = ctx.fresh.setNewTyperState()
2229-
inferView(tree, pt)(nestedCtx) match {
2227+
if (ctx.mode.is(Mode.ImplicitsEnabled))
2228+
inferView(tree, pt) match {
22302229
case SearchSuccess(inferred, _, _, _) =>
2231-
nestedCtx.typerState.commit()
22322230
adapt(inferred, pt)(ctx.retractMode(Mode.ImplicitsEnabled))
22332231
case failure: SearchFailure =>
22342232
if (pt.isInstanceOf[ProtoType] && !failure.isInstanceOf[AmbiguousImplicits])
@@ -2238,7 +2236,6 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
22382236
tree
22392237
else recover(failure)
22402238
}
2241-
}
22422239
else recover(NoImplicitMatches)
22432240
}
22442241

tests/neg/i3348.scala

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)