diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-11-03 14:37:55 -0800 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-11-03 14:37:55 -0800 |
commit | 4a6882e7729ab010848fe0744c55f096164e1853 (patch) | |
tree | cd76750c39ca2cfdfd113ccb2f592e74bb0b1f0e /src | |
parent | 50a5cc2249297b9dd2dcfffcce7f0c6669ad460b (diff) | |
parent | 251c2b9313728bbac5e47ee096b65d1183624650 (diff) | |
download | scala-4a6882e7729ab010848fe0744c55f096164e1853.tar.gz scala-4a6882e7729ab010848fe0744c55f096164e1853.tar.bz2 scala-4a6882e7729ab010848fe0744c55f096164e1853.zip |
Merge pull request #3088 from retronym/ticket/7944
SI-7944 FOUND: stray undetermined type params in vicinity of implicits
Diffstat (limited to 'src')
-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) |