Skip to content

Commit 1f993b7

Browse files
committed
Refine initial SafeNulls setting
1 parent 4a9edc5 commit 1f993b7

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

compiler/src/dotty/tools/dotc/Run.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import printing.XprintMode
2424
import parsing.Parsers.Parser
2525
import parsing.JavaParsers.JavaParser
2626
import typer.ImplicitRunInfo
27+
import config.Feature
28+
import StdNames.nme
2729

2830
import java.io.{BufferedWriter, OutputStreamWriter}
2931
import java.nio.charset.StandardCharsets
@@ -76,7 +78,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
7678
.setTyper(new Typer)
7779
.addMode(Mode.ImplicitsEnabled)
7880
.setTyperState(ctx.typerState.fresh(ctx.reporter))
79-
if ctx.settings.YexplicitNulls.value then
81+
if ctx.settings.YexplicitNulls.value && !Feature.enabledBySetting(nme.unsafeNulls) then
8082
start = start.addMode(Mode.SafeNulls)
8183
ctx.initialize()(using start) // re-initialize the base context with start
8284
start.setRun(this)

0 commit comments

Comments
 (0)