diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-06-09 12:22:01 -0700 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-06-09 12:22:01 -0700 |
| commit | 1844e2def6a66c01cf16841416ad351ae64cb951 (patch) | |
| tree | c720bbeac04f8e9063e668a89a8efda1d60ed015 /src/compiler | |
| parent | d01cc65a298924156b6d98af94d9bcbb334d69b6 (diff) | |
| parent | 32b5d50d6635320f448c92c27bc6df3acbb04451 (diff) | |
| download | scala-1844e2def6a66c01cf16841416ad351ae64cb951.tar.gz scala-1844e2def6a66c01cf16841416ad351ae64cb951.tar.bz2 scala-1844e2def6a66c01cf16841416ad351ae64cb951.zip | |
Merge pull request #2596 from retronym/ticket/7519
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 ec6b78f2de..cfe576efe6 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -831,8 +831,9 @@ trait Typers extends Adaptations with Tags { else tpr.typed(withImplicitArgs, mode, pt) } orElse { _ => - debuglog("fallback on implicits: " + tree + "/" + resetAllAttrs(original)) - val tree1 = typed(resetAllAttrs(original), mode) + val resetTree = resetLocalAttrs(original) + debuglog(s"fallback on implicits: ${tree}/$resetTree") + val tree1 = typed(resetTree, mode) // 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 setType pluginsTyped(tree1.tpe, this, tree1, mode, pt) |