Skip to content

Fix #3348: use a new typeState in inferView #3354

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

Merged
merged 2 commits into from
Oct 23, 2017
Merged

Fix #3348: use a new typeState in inferView #3354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
271aaf0
Fix #3348: use a new typeState in inferView
liufengyun Oct 20, 2017
dfa8593
add test case for #3348
liufengyun Oct 20, 2017
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
7 changes: 5 additions & 2 deletions compiler/src/dotty/tools/dotc/typer/Typer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2224,9 +2224,11 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
if (isFullyDefined(wtp, force = ForceDegree.all) &&
ctx.typerState.constraint.ne(prevConstraint)) adapt(tree, pt)
else err.typeMismatch(tree, pt, failure)
if (ctx.mode.is(Mode.ImplicitsEnabled))
inferView(tree, pt) match {
if (ctx.mode.is(Mode.ImplicitsEnabled)) {
val nestedCtx = ctx.fresh.setNewTyperState()
inferView(tree, pt)(nestedCtx) match {
case SearchSuccess(inferred, _, _, _) =>
nestedCtx.typerState.commit()
adapt(inferred, pt)(ctx.retractMode(Mode.ImplicitsEnabled))
case failure: SearchFailure =>
if (pt.isInstanceOf[ProtoType] && !failure.isInstanceOf[AmbiguousImplicits])
Expand All @@ -2236,6 +2238,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
tree
else recover(failure)
}
}
else recover(NoImplicitMatches)
}

Expand Down
10 changes: 10 additions & 0 deletions tests/neg/i3348.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
class Test {
import Test.test
"Hello".toto // error
}

object Test {
def test = {
implicitly[collection.generic.CanBuildFrom[List[Int], Int, List[Int]]]
}
}