-Xfundep-materialization => -Yfundep-materialization

To quote gkossakowski:

  Thinking about it more, could we hide this behind 'Y' flag instead?
  We have lesser obligation to keep around Y flags and this is something
  we should remove from 2.11/2.12.

4 files changed, 6 insertions, 6 deletions

diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
index 3a6d183c32..56fc4d7594 100644
--- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
@@ -111,7 +111,6 @@ trait ScalaSettings extends AbsScalaSettings
   val XnoPatmatAnalysis = BooleanSetting ("-Xno-patmat-analysis", "Don't perform exhaustivity/unreachability analysis. Also, ignore @switch annotation.")
   val XfullLubs     = BooleanSetting    ("-Xfull-lubs", "Retains pre 2.10 behavior of less aggressive truncation of least upper bounds.")
   val Xdivergence211 = BooleanSetting   ("-Xdivergence211", "Turn on the 2.11 behavior of implicit divergence not terminating recursive implicit searches (SI-7291).")
-  val XfundepMaterialization = BooleanSetting("-Xfundep-materialization", "Turn on the 2.11 behavior of macro expansion being able to influence type inference in implicit searches")
 
   /** Compatibility stubs for options whose value name did
    *  not previously match the option name.
@@ -180,6 +179,7 @@ trait ScalaSettings extends AbsScalaSettings
   val YvirtClasses    = false // too embryonic to even expose as a -Y //BooleanSetting    ("-Yvirtual-classes", "Support virtual classes")
 
   val exposeEmptyPackage = BooleanSetting("-Yexpose-empty-package", "Internal only: expose the empty package.").internalOnly()
+  val YfundepMaterialization = BooleanSetting("-Yfundep-materialization", "Turn on the 2.11 behavior of macro expansion being able to influence type inference in implicit searches")
 
   def stop = stopAfter
 
diff --git a/src/compiler/scala/tools/nsc/typechecker/Macros.scala b/src/compiler/scala/tools/nsc/typechecker/Macros.scala
index f0770e84c4..c0844ec8fc 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Macros.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Macros.scala
@@ -713,7 +713,7 @@ trait Macros extends scala.tools.reflect.FastTrack with Traces {
 
             var expectedTpe = expandee.tpe
             if (isNullaryInvocation(expandee)) expectedTpe = expectedTpe.finalResultType
-            if (settings.XfundepMaterialization.value) {
+            if (settings.YfundepMaterialization.value) {
               // approximation is necessary for whitebox macros to guide type inference
               // read more in the comments for onDelayed below
               val undetparams = expectedTpe collect { case tp if tp.typeSymbol.isTypeParameter => tp.typeSymbol }
@@ -785,7 +785,7 @@ trait Macros extends scala.tools.reflect.FastTrack with Traces {
           // but is enabled by default in Scala 2.11.
           val shouldInstantiate = typer.context.undetparams.nonEmpty && !inPolyMode(mode)
           if (shouldInstantiate) {
-            if (settings.XfundepMaterialization.value) {
+            if (settings.YfundepMaterialization.value) {
               forced += delayed
               typer.infer.inferExprInstance(delayed, typer.context.extractUndetparams(), pt, keepNothings = false)
               macroExpand(typer, delayed, mode, pt)
@@ -912,7 +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
+    // !settings.YfundepMaterialization.value implies forced.isEmpty
     if (forced(expandee)) scala.collection.mutable.Set[Int]()
     else delayed.getOrElse(expandee, {
       val calculated = scala.collection.mutable.Set[Symbol]()
diff --git a/test/files/run/t5923a-fundep.flags b/test/files/run/t5923a-fundep.flags
index c8b4511960..384b48d1b0 100644
--- a/test/files/run/t5923a-fundep.flags
+++ b/test/files/run/t5923a-fundep.flags
@@ -1 +1 @@
--Xfundep-materialization
\ No newline at end of file
+-Yfundep-materialization
\ No newline at end of file
diff --git a/test/files/run/t5923c.flags b/test/files/run/t5923c.flags
index c8b4511960..384b48d1b0 100644
--- a/test/files/run/t5923c.flags
+++ b/test/files/run/t5923c.flags
@@ -1 +1 @@
--Xfundep-materialization
\ No newline at end of file
+-Yfundep-materialization
\ No newline at end of file