Skip to content

Commit 1b14b58

Browse files
committed
Rename -Xlink-optimise to -Xlink
1 parent dfb822a commit 1b14b58

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class ScalaSettings extends Settings.SettingGroup {
116116
val YoptPhases = PhasesSetting("-Yopt-phases", "Restrict the optimisation phases to execute under -optimise.")
117117
val YoptFuel = IntSetting("-Yopt-fuel", "Maximum number of optimisations performed under -optimise.", -1)
118118
val optimise = BooleanSetting("-optimise", "Generates faster bytecode by applying local optimisations to the .program") withAbbreviation "-optimize"
119-
val XlinkOptimise = BooleanSetting("-Xlink-optimise", "Recompile library code with the application.").withAbbreviation("-Xlink-optimize")
119+
val Xlink = BooleanSetting("-Xlink", "Recompile library code with the application.")
120120

121121
/** Dottydoc specific settings */
122122
val siteRoot = StringSetting(

compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ class ClassfileLoader(val classfile: AbstractFile) extends SymbolLoader {
326326
val (classRoot, moduleRoot) = rootDenots(root.asClass)
327327
val classfileParser = new ClassfileParser(classfile, classRoot, moduleRoot)(ctx)
328328
val result = classfileParser.run()
329-
if (ctx.settings.YretainTrees.value || ctx.settings.XlinkOptimise.value) {
329+
if (ctx.settings.YretainTrees.value || ctx.settings.Xlink.value) {
330330
result match {
331331
case Some(unpickler: tasty.DottyUnpickler) =>
332332
classRoot.symbol.asClass.unpickler = unpickler

compiler/src/dotty/tools/dotc/core/Symbols.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ object Symbols {
604604

605605
/** If this is either:
606606
* - a top-level class and `-Yretain-trees` is set
607-
* - a top-level class loaded from TASTY and `-Xlink-optimise` is set
607+
* - a top-level class loaded from TASTY and `-Xlink` is set
608608
* then return the TypeDef tree (possibly wrapped inside PackageDefs) for this class, otherwise EmptyTree.
609609
* This will force the info of the class.
610610
*/

compiler/src/dotty/tools/dotc/transform/LinkAll.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class LinkAll extends Phase {
3434
}
3535
}
3636

37-
if (ctx.settings.XlinkOptimise.value) allUnits(Set.empty, units.toSet, Set.empty)
37+
if (ctx.settings.Xlink.value) allUnits(Set.empty, units.toSet, Set.empty)
3838
else units
3939
}
4040

@@ -67,7 +67,7 @@ class LinkAll extends Phase {
6767
object LinkAll {
6868

6969
private[LinkAll] def loadCompilationUnit(clsd: ClassDenotation)(implicit ctx: Context): Option[CompilationUnit] = {
70-
assert(ctx.settings.XlinkOptimise.value)
70+
assert(ctx.settings.Xlink.value)
7171
val tree = clsd.symbol.asClass.tree
7272
if (tree.isEmpty) None
7373
else {

compiler/test/dotty/tools/dotc/LinkOptimiseTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class LinkOptimiseTests extends ParallelTesting {
4040

4141
// Setup class paths
4242
def mkLinkClassFlags(libPath: String) =
43-
TestFlags(mkClassPath(libPath :: Jars.dottyTestDeps), mkClassPath(Jars.dottyTestDeps), basicDefaultOptions :+ "-Xlink-optimise")
43+
TestFlags(mkClassPath(libPath :: Jars.dottyTestDeps), mkClassPath(Jars.dottyTestDeps), basicDefaultOptions :+ "-Xlink")
4444
val strawmanClassPath = mkLinkClassFlags(defaultOutputDir + "strawmanLibrary/main/")
4545
val customLibClassFlags = mkLinkClassFlags(defaultOutputDir + "linkCustomLib/custom-lib")
4646

0 commit comments

Comments
 (0)