Skip to content

Commit e483d23

Browse files
committed
Rename compiler flag
1 parent 67658c8 commit e483d23

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ class ScalaSettings extends Settings.SettingGroup with CommonScalaSettings {
227227
val Yinstrument: Setting[Boolean] = BooleanSetting("-Yinstrument", "Add instrumentation code that counts allocations and closure creations.")
228228
val YinstrumentDefs: Setting[Boolean] = BooleanSetting("-Yinstrument-defs", "Add instrumentation code that counts method calls; needs -Yinstrument to be set, too.")
229229

230-
val YinlineBlackboxWhileTyping: Setting[Boolean] = BooleanSetting("-Yinline-blackbox-while-typing", "")
230+
val YforceInlineWhileTyping: Setting[Boolean] = BooleanSetting("-Yforce-inline-while-typing", "")
231231

232232
/** Dottydoc specific settings that are not used in scaladoc */
233233
val docSnapshot: Setting[Boolean] = BooleanSetting("-doc-snapshot", "Generate a documentation snapshot for the current Dotty version")

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class Inlining extends MacroTransform {
4040
override def allowsImplicitSearch: Boolean = true
4141

4242
override def run(using Context): Unit =
43-
// if (!ctx.settings.YinlineBlackboxWhileTyping.value) // phase not needed?
4443
try super.run
4544
catch case _: CompilationUnit.SuspendException => ()
4645

compiler/src/dotty/tools/dotc/typer/Inliner.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
13491349
!tree.tpe.widenTermRefExpr.isInstanceOf[MethodOrPoly] &&
13501350
Inliner.isInlineable(tree) &&
13511351
StagingContext.level == 0 &&
1352-
(ctx.isAfterTyper || tree.symbol.is(Transparent) || ctx.mode.is(Mode.ForceInline) || ctx.settings.YinlineBlackboxWhileTyping.value)
1352+
(ctx.isAfterTyper || tree.symbol.is(Transparent) || ctx.mode.is(Mode.ForceInline) || ctx.settings.YforceInlineWhileTyping.value)
13531353
then Inliner.inlineCall(tree)
13541354
else tree
13551355
}

compiler/src/dotty/tools/dotc/typer/Typer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3410,7 +3410,7 @@ class Typer extends Namer
34103410
Inliner.isInlineable(tree) &&
34113411
!suppressInline &&
34123412
StagingContext.level == 0 &&
3413-
(tree.symbol.is(Transparent) || ctx.settings.YinlineBlackboxWhileTyping.value)
3413+
(tree.symbol.is(Transparent) || ctx.settings.YforceInlineWhileTyping.value)
34143414
then
34153415
tree.tpe <:< wildApprox(pt)
34163416
val errorCount = ctx.reporter.errorCount

0 commit comments

Comments
 (0)