Skip to content

Commit c924a64

Browse files
committed
Merge pull request scala#4211 from lrytz/bcode-build
Run dead code elimination by default in GenBCode
2 parents 421c599 + 213e546 commit c924a64

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/compiler/scala/tools/nsc/backend/jvm/opt/LocalOpt.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class LocalOpt(settings: ScalaSettings) {
5555
* @return `true` if unreachable code was elminated in some method, `false` otherwise.
5656
*/
5757
def methodOptimizations(clazz: ClassNode): Boolean = {
58-
settings.Yopt.value.nonEmpty && clazz.methods.asScala.foldLeft(false) {
58+
!settings.YoptNone && clazz.methods.asScala.foldLeft(false) {
5959
case (changed, method) => methodOptimizations(method, clazz.name) || changed
6060
}
6161
}

src/compiler/scala/tools/nsc/settings/ScalaSettings.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ trait ScalaSettings extends AbsScalaSettings
242242
descr = "Enable optimizations",
243243
domain = YoptChoices)
244244

245+
def YoptNone = Yopt.isSetByUser && Yopt.value.isEmpty
245246
def YoptUnreachableCode = !Yopt.isSetByUser || Yopt.contains(YoptChoices.unreachableCode)
246247
def YoptSimplifyJumps = Yopt.contains(YoptChoices.simplifyJumps)
247248
def YoptRecurseUnreachableJumps = Yopt.contains(YoptChoices.recurseUnreachableJumps)

0 commit comments

Comments
 (0)