diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-10-30 18:42:56 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-10-31 09:24:02 +0100 |
commit | 251c2b9313728bbac5e47ee096b65d1183624650 (patch) | |
tree | f8f45da7d1632e04604d80808decf6e6df601f12 /src/compiler | |
parent | c38235fd44f1ccb280e31a2f34f58deb59c5b2ee (diff) | |
download | scala-251c2b9313728bbac5e47ee096b65d1183624650.tar.gz scala-251c2b9313728bbac5e47ee096b65d1183624650.tar.bz2 scala-251c2b9313728bbac5e47ee096b65d1183624650.zip |
SI-7944 FOUND: stray undetermined type params in vicinity of implicits
Implicit search created a nested Context into which the results of
its typechecking, namely, errors and undetermined type parameters
(roughly: those inferred as Nothing) are stashed.
The code the drives the process was checking for errors, but
discarded those undetermined type parameters.
This commit copies them from the child context to the parent,
which lets `Typer#adapt` to get to:
else if (hasUndetsInMonoMode) { // (9)
assert(!context.inTypeConstructorAllowed, context) //@M
instantiatePossiblyExpectingUnit(tree, mode, pt)
}
Our lost TypeVar has found its way home! The reward for which
is being instantiated, based on another type inference session
adapting the expression's type to the expected type.
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 987a3d2202..1e89e79cdd 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -78,7 +78,11 @@ trait Implicits { }) debuglog("update buffer: " + implicitSearchContext.reportBuffer.errors) } - context.undetparams = context.undetparams filterNot result.subst.from.contains + // SI-7944 undetermined type parameters that result from inference within typedImplicit land in + // `implicitSearchContext.undetparams`, *not* in `context.undetparams` + // Here, we copy them up to parent context (analogously to the way the errors are copied above), + // and then filter out any which *were* inferred and are part of the substitutor in the implicit search result. + context.undetparams = ((context.undetparams ++ implicitSearchContext.undetparams) filterNot result.subst.from.contains).distinct if (Statistics.canEnable) Statistics.stopTimer(implicitNanos, start) if (Statistics.canEnable) Statistics.stopCounter(rawTypeImpl, rawTypeStart) |