Skip to content

Commit cca541f

Browse files
committed
Fix -Ycheck options
Instead of restoreScopes, use elimStaticThis, which is the new end of the group.
1 parent 292beac commit cca541f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

compiler/test/dotc/tests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ class tests extends CompilerTest {
6969
}
7070

7171
implicit val defaultOptions: List[String] = noCheckOptions ++ {
72-
if (dotty.Properties.isRunByDrone) List("-Ycheck:tailrec,resolveSuper,erasure,mixin,getClass,restoreScopes,labelDef") // should be Ycheck:all, but #725
73-
else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef,simplify")
72+
if (dotty.Properties.isRunByDrone) List("-Ycheck:tailrec,resolveSuper,erasure,mixin,getClass,elimStaticThis,labelDef") // should be Ycheck:all, but #725
73+
else List("-Ycheck:tailrec,resolveSuper,mixin,elimStaticThis,labelDef,simplify")
7474
} ++ checkOptions ++ classPath
7575

7676
val testPickling = List("-Xprint-types", "-Ytest-pickler", "-Ystop-after:pickler", "-Yprintpos")

compiler/test/dotty/tools/vulpix/TestConfiguration.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ object TestConfiguration {
4242
} mkString(":")
4343
}
4444

45-
val yCheckOptions = Array("-Ycheck:tailrec,resolveSuper,erasure,mixin,getClass,restoreScopes,labelDef")
45+
val yCheckOptions = Array("-Ycheck:tailrec,resolveSuper,erasure,mixin,getClass,elimStaticThis,labelDef")
4646

4747
val basicDefaultOptions = checkOptions ++ noCheckOptions ++ yCheckOptions
4848
val defaultUnoptimised = TestFlags(classPath, basicDefaultOptions)

0 commit comments

Comments
 (0)