diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-10-24 10:42:30 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-10-24 10:42:30 -0700 |
| commit | 05681d4def04f290728e673b7856a57b872c8019 (patch) | |
| tree | f9a5a4ed762586a5a0234d04c779b79fcaf8acb4 /src/compiler | |
| parent | daa86942900ecfa2e48dfbb31aa50fe5d56ee937 (diff) | |
| parent | 50c8b39ec4e795b6de7b8ebeb6e20bf5c4b7f9e0 (diff) | |
| download | scala-05681d4def04f290728e673b7856a57b872c8019.tar.gz scala-05681d4def04f290728e673b7856a57b872c8019.tar.bz2 scala-05681d4def04f290728e673b7856a57b872c8019.zip | |
Merge pull request #3072 from retronym/backport/7519
[nomaster] SI-7519 Less brutal attribute resetting in adapt fallback
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index e27f540a7d..48e7e3a38c 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -876,8 +876,9 @@ trait Typers extends Modes with Adaptations with Tags { case SilentResultValue(result) => result case _ => - debuglog("fallback on implicits: " + tree + "/" + resetAllAttrs(original)) - val tree1 = typed(resetAllAttrs(original), mode, WildcardType) + val resetTree = resetLocalAttrs(original) + debuglog(s"fallback on implicits: ${tree}/$resetTree") + val tree1 = typed(resetTree, mode, WildcardType) // Q: `typed` already calls `pluginsTyped` and `adapt`. the only difference here is that // we pass `EmptyTree` as the `original`. intended? added in 2009 (53d98e7d42) by martin. tree1.tpe = pluginsTyped(tree1.tpe, this, tree1, mode, pt) |