diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala index 18254dad2a59..1519a9f8e1ef 100644 --- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -117,7 +117,7 @@ class ScalaSettings extends Settings.SettingGroup { val YoptPhases = PhasesSetting("-Yopt-phases", "Restrict the optimisation phases to execute under -optimise.") val YoptFuel = IntSetting("-Yopt-fuel", "Maximum number of optimisations performed under -optimise.", -1) val optimise = BooleanSetting("-optimise", "Generates faster bytecode by applying local optimisations to the .program") withAbbreviation "-optimize" - val XlinkOptimise = BooleanSetting("-Xlink-optimise", "Recompile library code with the application.").withAbbreviation("-Xlink-optimize") + val Xlink = BooleanSetting("-Xlink", "Recompile library code with the application.") /** Dottydoc specific settings */ val siteRoot = StringSetting( diff --git a/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala index 89b9c03aa55d..5bb2324372fc 100644 --- a/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala +++ b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala @@ -337,7 +337,7 @@ class ClassfileLoader(val classfile: AbstractFile) extends SymbolLoader { } private def mayLoadTreesFromTasty(implicit ctx: Context): Boolean = - ctx.settings.YretainTrees.value || ctx.settings.XlinkOptimise.value || ctx.settings.fromTasty.value + ctx.settings.YretainTrees.value || ctx.settings.Xlink.value || ctx.settings.fromTasty.value } class SourcefileLoader(val srcfile: AbstractFile) extends SymbolLoader { diff --git a/compiler/src/dotty/tools/dotc/transform/LinkAll.scala b/compiler/src/dotty/tools/dotc/transform/LinkAll.scala index fe3270cebf44..a1e2dc408755 100644 --- a/compiler/src/dotty/tools/dotc/transform/LinkAll.scala +++ b/compiler/src/dotty/tools/dotc/transform/LinkAll.scala @@ -34,7 +34,7 @@ class LinkAll extends Phase { } } - if (ctx.settings.XlinkOptimise.value) allUnits(Set.empty, units.toSet, Set.empty) + if (ctx.settings.Xlink.value) allUnits(Set.empty, units.toSet, Set.empty) else units } @@ -67,7 +67,7 @@ class LinkAll extends Phase { object LinkAll { private[LinkAll] def loadCompilationUnit(clsd: ClassDenotation)(implicit ctx: Context): Option[CompilationUnit] = { - assert(ctx.settings.XlinkOptimise.value) + assert(ctx.settings.Xlink.value) val tree = clsd.symbol.asClass.tree if (tree.isEmpty) None else { diff --git a/compiler/test/dotty/tools/dotc/LinkTests.scala b/compiler/test/dotty/tools/dotc/LinkTests.scala index d2c613341b6a..614b956a0a71 100644 --- a/compiler/test/dotty/tools/dotc/LinkTests.scala +++ b/compiler/test/dotty/tools/dotc/LinkTests.scala @@ -44,7 +44,7 @@ class LinkTests extends ParallelTesting { // Setup class paths def mkLinkClassFlags(libPath: String) = - TestFlags(mkClassPath(libPath :: Jars.dottyTestDeps), mkClassPath(Jars.dottyTestDeps), basicDefaultOptions :+ "-Xlink-optimise") + TestFlags(mkClassPath(libPath :: Jars.dottyTestDeps), mkClassPath(Jars.dottyTestDeps), basicDefaultOptions :+ "-Xlink") val strawmanClassPath = mkLinkClassFlags(defaultOutputDir + strawmanLibGroup + "/main/") val customLibClassFlags = mkLinkClassFlags(defaultOutputDir + linkCustomLibGroup + "/custom-lib")