Run dead code elimination by default in GenBCode

lrytz · lrytz · commit 213e5463345a · 2014-12-16T16:08:59.000+01:00
This was disabled by mistake. Settings are still a challenge. This fixes the bcode-delambdafy-method build (https://scala-webapps.epfl.ch/jenkins/view/2.11.x/job/scala-nightly-genbcode-2.11.x/)
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/opt/LocalOpt.scala b/src/compiler/scala/tools/nsc/backend/jvm/opt/LocalOpt.scala
@@ -55,7 +55,7 @@ class LocalOpt(settings: ScalaSettings) {
    * @return      `true` if unreachable code was elminated in some method, `false` otherwise.
    */
   def methodOptimizations(clazz: ClassNode): Boolean = {
-    settings.Yopt.value.nonEmpty && clazz.methods.asScala.foldLeft(false) {
+    !settings.YoptNone && clazz.methods.asScala.foldLeft(false) {
       case (changed, method) => methodOptimizations(method, clazz.name) || changed
     }
   }
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
@@ -242,6 +242,7 @@ trait ScalaSettings extends AbsScalaSettings
     descr = "Enable optimizations",
     domain = YoptChoices)
 
+  def YoptNone                    = Yopt.isSetByUser && Yopt.value.isEmpty
   def YoptUnreachableCode         = !Yopt.isSetByUser || Yopt.contains(YoptChoices.unreachableCode)
   def YoptSimplifyJumps           = Yopt.contains(YoptChoices.simplifyJumps)
   def YoptRecurseUnreachableJumps = Yopt.contains(YoptChoices.recurseUnreachableJumps)

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class LocalOpt(settings: ScalaSettings) {`
`55`	`55`	* @return `true` if unreachable code was elminated in some method, `false` otherwise.
`56`	`56`	`*/`
`57`	`57`	`def methodOptimizations(clazz: ClassNode): Boolean = {`
`58`		`- settings.Yopt.value.nonEmpty && clazz.methods.asScala.foldLeft(false) {`
	`58`	`+ !settings.YoptNone && clazz.methods.asScala.foldLeft(false) {`
`59`	`59`	`case (changed, method) => methodOptimizations(method, clazz.name) \|\| changed`
`60`	`60`	`}`
`61`	`61`	`}`