summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2014-07-03 13:16:08 +0200
committerEugene Burmako <xeno.by@gmail.com>2014-07-03 13:16:08 +0200
commit364c8e9fde9212d9c7cf543ffe73206b2b00c67d (patch)
treeb41d5af7a598e5a330eb42fea83e1730735cdbe3
parent0c5dd9e02f03143372237018c55e12a07c13f8c1 (diff)
downloadscala-364c8e9fde9212d9c7cf543ffe73206b2b00c67d.tar.gz
scala-364c8e9fde9212d9c7cf543ffe73206b2b00c67d.tar.bz2
scala-364c8e9fde9212d9c7cf543ffe73206b2b00c67d.zip
pull request feedback
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Macros.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Macros.scala b/src/compiler/scala/tools/nsc/typechecker/Macros.scala
index 6801dc068c..f0770e84c4 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Macros.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Macros.scala
@@ -912,6 +912,7 @@ trait Macros extends scala.tools.reflect.FastTrack with Traces {
private val delayed = perRunCaches.newWeakMap[Tree, scala.collection.mutable.Set[Int]]
private def isDelayed(expandee: Tree) = delayed contains expandee
private def calculateUndetparams(expandee: Tree): scala.collection.mutable.Set[Int] =
+ // !settings.XfundepMaterialization.value implies forced.isEmpty
if (forced(expandee)) scala.collection.mutable.Set[Int]()
else delayed.getOrElse(expandee, {
val calculated = scala.collection.mutable.Set[Symbol]()