diff options
| author | Martin Odersky <odersky@gmail.com> | 2017-02-25 18:28:12 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2017-02-27 15:45:48 +0100 |
| commit | 1aa4b56c4813117f3be3a725c404c242eccefe10 (patch) | |
| tree | 2fd534f987da9f0ac6410ccc3b752e1766546bf6 /compiler/src/dotty/tools/dotc | |
| parent | d0162aed64def280af8aa812514d101c1563fc28 (diff) | |
| download | dotty-1aa4b56c4813117f3be3a725c404c242eccefe10.tar.gz dotty-1aa4b56c4813117f3be3a725c404c242eccefe10.tar.bz2 dotty-1aa4b56c4813117f3be3a725c404c242eccefe10.zip | |
Don't chain implicit conversions
When inferring a view, we are not allowed to use another
implicit conversion to adapt its result. Fixing this revealed
another problem where we have to re-enable implicit conversions
when pre-typing arguments in overloading resolution.
Diffstat (limited to 'compiler/src/dotty/tools/dotc')
| -rw-r--r-- | compiler/src/dotty/tools/dotc/typer/Applications.scala | 2 | ||||
| -rw-r--r-- | compiler/src/dotty/tools/dotc/typer/Implicits.scala | 1 | ||||
| -rw-r--r-- | compiler/src/dotty/tools/dotc/typer/Typer.scala | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala index de017961a..870198027 100644 --- a/compiler/src/dotty/tools/dotc/typer/Applications.scala +++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala @@ -1375,7 +1375,7 @@ trait Applications extends Compatibility { self: Typer with Dynamic => else WildcardType) val commonFormal = defn.FunctionOf(commonParamTypes, WildcardType) overload.println(i"pretype arg $arg with expected type $commonFormal") - pt.typedArg(arg, commonFormal) + pt.typedArg(arg, commonFormal)(ctx.addMode(Mode.ImplicitsEnabled)) } } } diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index d5afae90c..759cc62e9 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -496,6 +496,7 @@ trait Implicits { self: Typer => || (to isRef defn.UnitClass) || (from.tpe isRef defn.NothingClass) || (from.tpe isRef defn.NullClass) + || !(ctx.mode is Mode.ImplicitsEnabled) || (from.tpe eq NoPrefix)) NoImplicitMatches else try inferImplicit(to.stripTypeVar.widenExpr, from, from.pos) diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 33e320ce5..57e3c1b88 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -2023,7 +2023,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit // try an implicit conversion inferView(tree, pt) match { case SearchSuccess(inferred, _, _, _) => - adapt(inferred, pt) + adapt(inferred, pt)(ctx.retractMode(Mode.ImplicitsEnabled)) case failure: SearchFailure => if (pt.isInstanceOf[ProtoType] && !failure.isInstanceOf[AmbiguousImplicits]) tree else err.typeMismatch(tree, pt, failure) |