diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-03-31 13:35:42 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-04-01 08:35:32 +0200 |
| commit | a40ee59d4455c2bb45168844f50e9d15120bd7d8 (patch) | |
| tree | 75e8828aad3afbd1483234605d11ab992c4aa084 /src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | |
| parent | 09f5752b871a2e870dfc1bb57fda203515d26651 (diff) | |
| download | scala-a40ee59d4455c2bb45168844f50e9d15120bd7d8.tar.gz scala-a40ee59d4455c2bb45168844f50e9d15120bd7d8.tar.bz2 scala-a40ee59d4455c2bb45168844f50e9d15120bd7d8.zip | |
Don't force the GenASM backend when passing -optimize
This behavior is confusing and also problematic for writing partest
tests: CI passes -optimize, which negates the -Ybackend:GenBCode entry
in a flags file.
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings/ScalaSettings.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index 9d7cf8cfaa..03fd0976e5 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -361,12 +361,7 @@ trait ScalaSettings extends AbsScalaSettings /** Test whether this is scaladoc we're looking at */ def isScaladoc = false - /** - * Helper utilities for use by checkConflictingSettings() - */ - def isBCodeActive = !isICodeAskedFor - def isBCodeAskedFor = (Ybackend.value != "GenASM") - def isICodeAskedFor = ((Ybackend.value == "GenASM") || optimiseSettings.exists(_.value) || writeICode.isSetByUser) + def isBCodeActive = Ybackend.value == "GenBCode" object MacroExpand { val None = "none" |