Warn when combining settings for the old optimizer with -YGenBCode

lrytz · lrytz · commit cd878232b574 · 2015-07-03T20:17:45.000+02:00
Remove some unnecessary flags files
 - neg/t4425.flags
 - run/blame_eye_triple_eee-double.flags
 - run/blame_eye_triple_eee-float.flags

Force tests that use -optimize to GenASM
 - neg/sealed-final-neg.flags
 - pos/inline-access-levels.flags
 - pos/inliner2.flags
 - pos/sealed-final.flags
 - pos/t3420.flags
 - pos/t8410.flags
 - run/constant-optimization.flags
 - run/dead-code-elimination.flags
 - run/elidable-opt.flags
 - run/finalvar.flags
 - run/icode-reader-dead-code.scala
 - run/optimizer-array-load.flags
 - run/synchronized.flags
 - run/t3509.flags
 - run/t3569.flags
 - run/t4285.flags
 - run/t4935.flags
 - run/t5789.scala
 - run/t6188.flags
 - run/t7459b-optimize.flags
 - run/t7582.flags
 - run/t7582b.flags
 - run/t8601.flags
 - run/t8601b.flags
 - run/t8601c.flags
 - run/t8601d.flags
 - run/t8601e.flags
 - run/t9003.flags

Move some tests to the new optimizer
 - run/classfile-format-51.scala
 - run/classfile-format-52.scala
 - run/run-bug4840.flags
 - run/t2106.flags
 - run/t6102.flags
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
@@ -1373,7 +1373,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
       unitbuf += unit
       compiledFiles += unit.source.file.path
     }
-    private def checkDeprecatedSettings(unit: CompilationUnit) {
+    private def warnDeprecatedAndConflictingSettings(unit: CompilationUnit) {
       // issue warnings for any usage of deprecated settings
       settings.userSetSettings filter (_.isDeprecated) foreach { s =>
         currentRun.reporting.deprecationWarning(NoPosition, s.name + " is deprecated: " + s.deprecationMessage.get)
@@ -1383,6 +1383,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
         currentRun.reporting.deprecationWarning(NoPosition, settings.target.name + ":" + settings.target.value + " is deprecated and has no effect, setting to " + supportedTarget)
         settings.target.value = supportedTarget
       }
+      settings.conflictWarning.foreach(reporter.warning(NoPosition, _))
     }
 
     /* An iterator returning all the units being compiled in this run */
@@ -1473,7 +1474,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
     def compileSources(sources: List[SourceFile]) = if (!reporter.hasErrors) {
 
       def checkDeprecations() = {
-        checkDeprecatedSettings(newCompilationUnit(""))
+        warnDeprecatedAndConflictingSettings(newCompilationUnit(""))
         reporting.summarizeErrors()
       }
 
@@ -1495,7 +1496,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
       val startTime = currentTime
 
       reporter.reset()
-      checkDeprecatedSettings(unitbuf.head)
+      warnDeprecatedAndConflictingSettings(unitbuf.head)
       globalPhase = fromPhase
 
       while (globalPhase.hasNext && !reporter.hasErrors) {
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
@@ -388,6 +388,23 @@ trait ScalaSettings extends AbsScalaSettings
     val Normal = "normal"
     val Discard = "discard"
   }
+
+  def conflictWarning: Option[String] = {
+    def oldOptimiseFlagsInGenBCode: Option[String] = {
+      val optFlags: List[Setting] = if (optimise.value) List(optimise) else optimiseSettings.filter(_.value)
+      if (isBCodeActive && optFlags.nonEmpty) {
+        val msg = s"""Compiler settings for the 2.11 optimizer (${optFlags.map(_.name).mkString(", ")}) are incompatible with -Ybackend:GenBCode (which is the default in 2.12).
+                     |The optimizer settings are ignored. See -Yopt:help for enabling the new optimizer in 2.12.""".stripMargin
+        Some(msg)
+      } else
+        None
+    }
+
+    List(oldOptimiseFlagsInGenBCode /*, moreToCome */).flatten match {
+      case Nil => None
+      case warnings => Some("Conflicting compiler settings were detected. Some settings will be ignored.\n" + warnings.mkString("\n"))
+    }
+  }
 }
 
 object ClassPathRepresentationType {
diff --git a/test/files/neg/incompatibleSettings.check b/test/files/neg/incompatibleSettings.check
@@ -0,0 +1,6 @@
+warning: Conflicting compiler settings were detected. Some settings will be ignored.
+Compiler settings for the 2.11 optimizer (-optimise) are incompatible with -Ybackend:GenBCode (which is the default in 2.12).
+The optimizer settings are ignored. See -Yopt:help for enabling the new optimizer in 2.12.
+error: No warnings can be incurred under -Xfatal-warnings.
+one warning found
+one error found
diff --git a/test/files/neg/incompatibleSettings.flags b/test/files/neg/incompatibleSettings.flags
@@ -0,0 +1 @@
+-optimise -Ybackend:GenBCode -Xfatal-warnings
diff --git a/test/files/neg/incompatibleSettings.scala b/test/files/neg/incompatibleSettings.scala
@@ -0,0 +1 @@
+class C
diff --git a/test/files/neg/sealed-final-neg.flags b/test/files/neg/sealed-final-neg.flags
@@ -1 +1 @@
--Xfatal-warnings -Yinline-warnings -optimise
+-Xfatal-warnings -Ybackend:GenASM -Yinline-warnings -optimise
diff --git a/test/files/neg/t4425.flags b/test/files/neg/t4425.flags
diff --git a/test/files/pos/inline-access-levels.flags b/test/files/pos/inline-access-levels.flags
@@ -1 +1 @@
--optimise -Xfatal-warnings -Yinline-warnings
+-optimise -Ybackend:GenASM -Xfatal-warnings -Yinline-warnings
diff --git a/test/files/pos/inliner2.flags b/test/files/pos/inliner2.flags
@@ -1 +1 @@
--optimise -Xfatal-warnings
+-optimise -Ybackend:GenASM -Xfatal-warnings
diff --git a/test/files/pos/sealed-final.flags b/test/files/pos/sealed-final.flags
@@ -1 +1 @@
--Xfatal-warnings -Yinline-warnings -optimise
+-Xfatal-warnings -Yinline-warnings -Ybackend:GenASM -optimise
diff --git a/test/files/pos/t3420.flags b/test/files/pos/t3420.flags
@@ -1 +1 @@
--optimise -Xfatal-warnings
+-optimise -Ybackend:GenASM -Xfatal-warnings
diff --git a/test/files/pos/t8410.flags b/test/files/pos/t8410.flags
@@ -1 +1 @@
--optimise -Xfatal-warnings -deprecation:false -Yinline-warnings:false
+-optimise -Ybackend:GenASM -Xfatal-warnings -deprecation:false -Yinline-warnings:false
diff --git a/test/files/run/blame_eye_triple_eee-double.flags b/test/files/run/blame_eye_triple_eee-double.flags
diff --git a/test/files/run/blame_eye_triple_eee-float.flags b/test/files/run/blame_eye_triple_eee-float.flags
diff --git a/test/files/run/classfile-format-51.scala b/test/files/run/classfile-format-51.scala
@@ -16,7 +16,7 @@ import Opcodes._
 // verify. So the test includes a version check that short-circuites the whole test
 // on JDK 6
 object Test extends DirectTest {
-  override def extraSettings: String = "-optimise -usejavacp -d " + testOutput.path + " -cp " + testOutput.path
+  override def extraSettings: String = "-Yopt:l:classpath -usejavacp -d " + testOutput.path + " -cp " + testOutput.path
 
   def generateClass() {
     val invokerClassName =  "DynamicInvoker"
diff --git a/test/files/run/classfile-format-52.scala b/test/files/run/classfile-format-52.scala
@@ -13,7 +13,7 @@ import Opcodes._
 // By its nature the test can only work on JDK 8+ because under JDK 7- the
 // interface won't verify.
 object Test extends DirectTest {
-  override def extraSettings: String = "-optimise -usejavacp -d " + testOutput.path + " -cp " + testOutput.path
+  override def extraSettings: String = "-Yopt:l:classpath -usejavacp -d " + testOutput.path + " -cp " + testOutput.path
 
   def generateInterface() {
     val interfaceName =  "HasDefaultMethod"
diff --git a/test/files/run/constant-optimization.flags b/test/files/run/constant-optimization.flags
@@ -1 +1 @@
--optimise
+-optimise -Ybackend:GenASM
diff --git a/test/files/run/dead-code-elimination.flags b/test/files/run/dead-code-elimination.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/run/elidable-opt.flags b/test/files/run/elidable-opt.flags
@@ -1 +1 @@
--optimise -Xelide-below 900
+-optimise -Ybackend:GenASM -Xelide-below 900
diff --git a/test/files/run/elidable-opt.scala b/test/files/run/elidable-opt.scala
@@ -1,3 +1,6 @@
+/*
+ * filter: inliner warnings; re-run with
+ */
 import annotation._
 import elidable._
 
diff --git a/test/files/run/finalvar.flags b/test/files/run/finalvar.flags
@@ -1 +1 @@
--Yoverride-vars -Yinline
+-Yoverride-vars -Yinline -Ybackend:GenASM
diff --git a/test/files/run/icode-reader-dead-code.scala b/test/files/run/icode-reader-dead-code.scala
@@ -36,7 +36,7 @@ object Test extends DirectTest {
 
     // If inlining fails, the compiler will issue an inliner warning that is not present in the
     // check file
-    compileString(newCompiler("-usejavacp", "-optimise"))(bCode)
+    compileString(newCompiler("-usejavacp", "-optimise", "-Ybackend:GenASM"))(bCode)
   }
 
   def readClass(file: String) = {
diff --git a/test/files/run/optimizer-array-load.flags b/test/files/run/optimizer-array-load.flags
@@ -1 +1 @@
--optimise
+-optimise -Ybackend:GenASM
diff --git a/test/files/run/run-bug4840.flags b/test/files/run/run-bug4840.flags
diff --git a/test/files/run/synchronized.flags b/test/files/run/synchronized.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/run/t2106.check b/test/files/run/t2106.check
@@ -1,13 +1,5 @@
-#partest !-Ybackend:GenASM
 t2106.scala:7: warning: A::foo()Ljava/lang/Object; is annotated @inline but could not be inlined:
 The callee A::foo()Ljava/lang/Object; contains the instruction INVOKEVIRTUAL java/lang/Object.clone ()Ljava/lang/Object;
 that would cause an IllegalAccessError when inlined into class Test$.
   def main(args: Array[String]): Unit = x.foo
                                           ^
-#partest -Ybackend:GenASM
-t2106.scala:7: warning: Could not inline required method foo because access level required by callee not matched by caller.
-  def main(args: Array[String]): Unit = x.foo
-                                          ^
-t2106.scala:7: warning: At the end of the day, could not inline @inline-marked method foo
-  def main(args: Array[String]): Unit = x.foo
-                                          ^
diff --git a/test/files/run/t2106.flags b/test/files/run/t2106.flags
@@ -1 +1 @@
--optimise -Yinline-warnings -Yopt:l:classpath
+-Yinline-warnings -Yopt:l:classpath
diff --git a/test/files/run/t3509.flags b/test/files/run/t3509.flags
@@ -1 +1 @@
--Yinline
+-Yinline -Ybackend:GenASM
diff --git a/test/files/run/t3569.flags b/test/files/run/t3569.flags
@@ -1 +1 @@
--Yinline
+-Yinline -Ybackend:GenASM
diff --git a/test/files/run/t4285.flags b/test/files/run/t4285.flags
@@ -1 +1 @@
--optimise
+-optimise -Ybackend:GenASM
diff --git a/test/files/run/t4935.flags b/test/files/run/t4935.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/run/t5789.scala b/test/files/run/t5789.scala
@@ -5,7 +5,7 @@ import scala.tools.partest.ReplTest
 
 
 object Test extends ReplTest {
-  override def extraSettings = "-Yinline"
+  override def extraSettings = "-Yinline -Ybackend:GenASM"
   def code = """
     val n = 2
     () => n
diff --git a/test/files/run/t6102.check b/test/files/run/t6102.check
@@ -1,37 +1 @@
-[running phase parser on t6102.scala]
-[running phase namer on t6102.scala]
-[running phase packageobjects on t6102.scala]
-[running phase typer on t6102.scala]
-[running phase patmat on t6102.scala]
-[running phase superaccessors on t6102.scala]
-[running phase extmethods on t6102.scala]
-[running phase pickler on t6102.scala]
-[running phase refchecks on t6102.scala]
-[running phase uncurry on t6102.scala]
-[running phase tailcalls on t6102.scala]
-[running phase specialize on t6102.scala]
-[running phase explicitouter on t6102.scala]
-[running phase erasure on t6102.scala]
-[running phase posterasure on t6102.scala]
-[running phase lazyvals on t6102.scala]
-[running phase lambdalift on t6102.scala]
-[running phase constructors on t6102.scala]
-[running phase flatten on t6102.scala]
-[running phase mixin on t6102.scala]
-[running phase cleanup on t6102.scala]
-[running phase delambdafy on t6102.scala]
-[running phase icode on t6102.scala]
-#partest -optimise
-[running phase inliner on t6102.scala]
-[running phase inlinehandlers on t6102.scala]
-[running phase closelim on t6102.scala]
-[running phase constopt on t6102.scala]
-#partest
-[running phase dce on t6102.scala]
-#partest -Ybackend:GenASM
-[running phase jvm on icode]
-#partest !-Ybackend:GenASM
-[running phase jvm on t6102.scala]
-[running phase jvm on t6102.scala]
-#partest
 hello
diff --git a/test/files/run/t6102.flags b/test/files/run/t6102.flags
@@ -1 +1 @@
--Ydead-code -Ydebug -Xfatal-warnings
+-Yopt:l:classpath -Xfatal-warnings
diff --git a/test/files/run/t6188.flags b/test/files/run/t6188.flags
@@ -1 +1 @@
- -optimize 
+-optimize -Ybackend:GenASM
diff --git a/test/files/run/t7459b-optimize.flags b/test/files/run/t7459b-optimize.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/run/t7582.flags b/test/files/run/t7582.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/run/t7582b.flags b/test/files/run/t7582b.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/run/t8601.flags b/test/files/run/t8601.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/run/t8601b.flags b/test/files/run/t8601b.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/run/t8601c.flags b/test/files/run/t8601c.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/run/t8601d.flags b/test/files/run/t8601d.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/run/t8601e.flags b/test/files/run/t8601e.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM
diff --git a/test/files/run/t9003.flags b/test/files/run/t9003.flags
@@ -1 +1 @@
--optimize
+-optimize -Ybackend:GenASM

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+-optimise -Ybackend:GenBCode -Xfatal-warnings`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--Xfatal-warnings -Yinline-warnings -optimise`
	`1`	`+-Xfatal-warnings -Ybackend:GenASM -Yinline-warnings -optimise`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--optimise -Xfatal-warnings -Yinline-warnings`
	`1`	`+-optimise -Ybackend:GenASM -Xfatal-warnings -Yinline-warnings`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--optimise -Xfatal-warnings`
	`1`	`+-optimise -Ybackend:GenASM -Xfatal-warnings`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--Xfatal-warnings -Yinline-warnings -optimise`
	`1`	`+-Xfatal-warnings -Yinline-warnings -Ybackend:GenASM -optimise`