Merge branch 'backport/phase-change' into topic/pickle-jar

retronym · retronym · commit d839e7cc4ade · 2018-09-25T17:04:43.000+10:00
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
@@ -470,19 +470,11 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
     val global: Global.this.type = Global.this
   } with Analyzer
 
-  // phaseName = "patmat"
-  object patmat extends {
-    val global: Global.this.type = Global.this
-    val runsAfter = List("typer")
-    val runsRightAfter = None
-    // patmat doesn't need to be right after typer, as long as we run before superaccessors
-    // (sbt does need to run right after typer, so don't conflict)
-  } with PatternMatching
-
   // phaseName = "superaccessors"
   object superAccessors extends {
     val global: Global.this.type = Global.this
-    val runsAfter = List("patmat")
+    val runsAfter = List("typer")
+    // sbt needs to run right after typer, so don't conflict
     val runsRightAfter = None
   } with SuperAccessors
 
@@ -507,10 +499,20 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
     val runsRightAfter = None
   } with RefChecks
 
+  // phaseName = "patmat"
+  object patmat extends {
+    val global: Global.this.type = Global.this
+    // patmat does not need to run before the superaccessors phase, because
+    // patmat never emits `this.x` where `x` is a ParamAccessor.
+    // (However, patmat does need to run before outer accessors generation).
+    val runsAfter = List("refchecks")
+    val runsRightAfter = None
+  } with PatternMatching
+
   // phaseName = "uncurry"
   override object uncurry extends {
     val global: Global.this.type = Global.this
-    val runsAfter = List("refchecks")
+    val runsAfter = List("patmat")
     val runsRightAfter = None
   } with UnCurry
 
@@ -653,8 +655,8 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
       analyzer.namerFactory   -> "resolve names, attach symbols to named trees",
       analyzer.packageObjects -> "load package objects",
       analyzer.typerFactory   -> "the meat and potatoes: type the trees",
-      patmat                  -> "translate match expressions",
       superAccessors          -> "add super accessors in traits and nested classes",
+      patmat                  -> "translate match expressions",
       extensionMethods        -> "add extension methods for inline classes",
       pickler                 -> "serialize symbol tables",
       refChecks               -> "reference/override checking, translate nested objects",
diff --git a/src/compiler/scala/tools/nsc/Reporting.scala b/src/compiler/scala/tools/nsc/Reporting.scala
@@ -26,16 +26,16 @@ trait Reporting extends scala.reflect.internal.Reporting { self: ast.Positions w
   protected def PerRunReporting = new PerRunReporting
   class PerRunReporting extends PerRunReportingBase {
     /** Collects for certain classes of warnings during this run. */
-    private class ConditionalWarning(what: String, doReport: () => Boolean, setting: Settings#Setting) {
+    private class ConditionalWarning(what: String, doReport: Boolean, setting: Settings#Setting) {
       def this(what: String, booleanSetting: Settings#BooleanSetting) {
-        this(what, () => booleanSetting, booleanSetting)
+        this(what, booleanSetting.value, booleanSetting)
       }
       val warnings = mutable.LinkedHashMap[Position, (String, String)]()
       def warn(pos: Position, msg: String, since: String = "") =
-        if (doReport()) reporter.warning(pos, msg)
+        if (doReport) reporter.warning(pos, msg)
         else if (!(warnings contains pos)) warnings += ((pos, (msg, since)))
       def summarize() =
-        if (warnings.nonEmpty && (setting.isDefault || doReport())) {
+        if (warnings.nonEmpty && (setting.isDefault || doReport)) {
           val sinceAndAmount = mutable.TreeMap[String, Int]()
           warnings.valuesIterator.foreach { case (_, since) =>
             val value = sinceAndAmount.get(since)
@@ -65,7 +65,7 @@ trait Reporting extends scala.reflect.internal.Reporting { self: ast.Positions w
     private val _deprecationWarnings    = new ConditionalWarning("deprecation", settings.deprecation)
     private val _uncheckedWarnings      = new ConditionalWarning("unchecked", settings.unchecked)
     private val _featureWarnings        = new ConditionalWarning("feature", settings.feature)
-    private val _inlinerWarnings        = new ConditionalWarning("inliner", () => !settings.optWarningsSummaryOnly, settings.optWarnings)
+    private val _inlinerWarnings        = new ConditionalWarning("inliner", !settings.optWarningsSummaryOnly, settings.optWarnings)
     private val _allConditionalWarnings = List(_deprecationWarnings, _uncheckedWarnings, _featureWarnings, _inlinerWarnings)
 
     // TODO: remove in favor of the overload that takes a Symbol, give that argument a default (NoSymbol)
diff --git a/test/files/neg/t6446-additional.check b/test/files/neg/t6446-additional.check
@@ -4,11 +4,11 @@
          namer   2  resolve names, attach symbols to named trees
 packageobjects   3  load package objects
          typer   4  the meat and potatoes: type the trees
-        patmat   5  translate match expressions
-superaccessors   6  add super accessors in traits and nested classes
-    extmethods   7  add extension methods for inline classes
-       pickler   8  serialize symbol tables
-     refchecks   9  reference/override checking, translate nested objects
+superaccessors   5  add super accessors in traits and nested classes
+    extmethods   6  add extension methods for inline classes
+       pickler   7  serialize symbol tables
+     refchecks   8  reference/override checking, translate nested objects
+        patmat   9  translate match expressions
        uncurry  10  uncurry, translate function values to anonymous classes
         fields  11  synthesize accessors and fields, add bitmaps for lazy vals
      tailcalls  12  replace tail calls by jumps
diff --git a/test/files/neg/t6446-missing.check b/test/files/neg/t6446-missing.check
@@ -5,11 +5,11 @@ Error: unable to load class: t6446.Ploogin
          namer   2  resolve names, attach symbols to named trees
 packageobjects   3  load package objects
          typer   4  the meat and potatoes: type the trees
-        patmat   5  translate match expressions
-superaccessors   6  add super accessors in traits and nested classes
-    extmethods   7  add extension methods for inline classes
-       pickler   8  serialize symbol tables
-     refchecks   9  reference/override checking, translate nested objects
+superaccessors   5  add super accessors in traits and nested classes
+    extmethods   6  add extension methods for inline classes
+       pickler   7  serialize symbol tables
+     refchecks   8  reference/override checking, translate nested objects
+        patmat   9  translate match expressions
        uncurry  10  uncurry, translate function values to anonymous classes
         fields  11  synthesize accessors and fields, add bitmaps for lazy vals
      tailcalls  12  replace tail calls by jumps
diff --git a/test/files/neg/t6446-show-phases.check b/test/files/neg/t6446-show-phases.check
@@ -4,11 +4,11 @@
          namer   2  resolve names, attach symbols to named trees
 packageobjects   3  load package objects
          typer   4  the meat and potatoes: type the trees
-        patmat   5  translate match expressions
-superaccessors   6  add super accessors in traits and nested classes
-    extmethods   7  add extension methods for inline classes
-       pickler   8  serialize symbol tables
-     refchecks   9  reference/override checking, translate nested objects
+superaccessors   5  add super accessors in traits and nested classes
+    extmethods   6  add extension methods for inline classes
+       pickler   7  serialize symbol tables
+     refchecks   8  reference/override checking, translate nested objects
+        patmat   9  translate match expressions
        uncurry  10  uncurry, translate function values to anonymous classes
         fields  11  synthesize accessors and fields, add bitmaps for lazy vals
      tailcalls  12  replace tail calls by jumps
diff --git a/test/files/neg/t7494-no-options.check b/test/files/neg/t7494-no-options.check
@@ -5,11 +5,11 @@ error: Error: ploogin takes no options
          namer   2  resolve names, attach symbols to named trees
 packageobjects   3  load package objects
          typer   4  the meat and potatoes: type the trees
-        patmat   5  translate match expressions
-superaccessors   6  add super accessors in traits and nested classes
-    extmethods   7  add extension methods for inline classes
-       pickler   8  serialize symbol tables
-     refchecks   9  reference/override checking, translate nested objects
+superaccessors   5  add super accessors in traits and nested classes
+    extmethods   6  add extension methods for inline classes
+       pickler   7  serialize symbol tables
+     refchecks   8  reference/override checking, translate nested objects
+        patmat   9  translate match expressions
        uncurry  10  uncurry, translate function values to anonymous classes
         fields  11  synthesize accessors and fields, add bitmaps for lazy vals
      tailcalls  12  replace tail calls by jumps
diff --git a/test/files/run/programmatic-main.check b/test/files/run/programmatic-main.check
@@ -4,11 +4,11 @@
          namer   2  resolve names, attach symbols to named trees
 packageobjects   3  load package objects
          typer   4  the meat and potatoes: type the trees
-        patmat   5  translate match expressions
-superaccessors   6  add super accessors in traits and nested classes
-    extmethods   7  add extension methods for inline classes
-       pickler   8  serialize symbol tables
-     refchecks   9  reference/override checking, translate nested objects
+superaccessors   5  add super accessors in traits and nested classes
+    extmethods   6  add extension methods for inline classes
+       pickler   7  serialize symbol tables
+     refchecks   8  reference/override checking, translate nested objects
+        patmat   9  translate match expressions
        uncurry  10  uncurry, translate function values to anonymous classes
         fields  11  synthesize accessors and fields, add bitmaps for lazy vals
      tailcalls  12  replace tail calls by jumps
diff --git a/test/files/run/t1434.check b/test/files/run/t1434.check
@@ -0,0 +1,3 @@
+t1434.scala:7: warning: comparing values of types Null and Null using `!=' will always yield false
+    case a: A[_] if(a.op != null) => "with op"
+                         ^
diff --git a/test/files/run/t6288.check b/test/files/run/t6288.check
@@ -5,7 +5,7 @@
       [106][106][106]Case3.super.<init>();
       [13]()
     };
-    [21]def unapply([29]z: [32]<type: [32]scala.Any>): [21]Option[Int] = [56][52][52]scala.Some.apply[[52]Int]([57]-1);
+    [21]def unapply([29]z: [32]<type: [32]scala.Any>): [21]Option[Int] = [56][52][52]new [52]Some[Int]([57]-1);
     [64]{
       [64]case <synthetic> val x1: [64]String = [64]"";
       [64]case5()[84]{

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+t1434.scala:7: warning: comparing values of types Null and Null using `!=' will always yield false
	`2`	`+ case a: A[_] if(a.op != null) => "with op"`
	`3`	`+ ^`