scala · anatoliykmetyuk · Jan 8, 2020 · Jan 6, 2020 · dwijnand · Mar 7, 2024
diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -166,6 +166,7 @@ class ScalaSettings extends Settings.SettingGroup {
   // Extremely experimental language features
   val YnoKindPolymorphism: Setting[Boolean] = BooleanSetting("-Yno-kind-polymorphism", "Enable kind polymorphism (see https://dotty.epfl.ch/docs/reference/kind-polymorphism.html). Potentially unsound.")
   val YexplicitNulls: Setting[Boolean] = BooleanSetting("-Yexplicit-nulls", "Make reference types non-nullable. Nullable types can be expressed with unions: e.g. String|Null.")
+  val YerasedTerms: Setting[Boolean] = BooleanSetting("-Yerased-terms", "Allows the use of erased terms.")
 
   /** Area-specific debug output */
   val YexplainLowlevel: Setting[Boolean] = BooleanSetting("-Yexplain-lowlevel", "When explaining type errors, show types at a lower level.")

diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -221,6 +221,7 @@ class Definitions {
   @tu lazy val ScalaXmlPackageClass: Symbol = ctx.getPackageClassIfDefined("scala.xml")
 
   @tu lazy val CompiletimePackageObject: Symbol = ctx.requiredModule("scala.compiletime.package")
+    @tu lazy val Compiletime_erasedValue  : Symbol = CompiletimePackageObject.requiredMethod("erasedValue")
     @tu lazy val Compiletime_error        : Symbol = CompiletimePackageObject.requiredMethod(nme.error)
     @tu lazy val Compiletime_constValue   : Symbol = CompiletimePackageObject.requiredMethod("constValue")
     @tu lazy val Compiletime_constValueOpt: Symbol = CompiletimePackageObject.requiredMethod("constValueOpt")

diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala
@@ -457,7 +457,8 @@ object Checking {
         sym.setFlag(Private) // break the overriding relationship by making sym Private
       }
     if (sym.is(Erased))
-      checkApplicable(Erased, !sym.isOneOf(MutableOrLazy))
+      if ctx.settings.YerasedTerms.value || sym == defn.Compiletime_erasedValue then checkApplicable(Erased, !sym.isOneOf(MutableOrLazy))
+      else fail("cannot use `erased` without " + ctx.settings.YerasedTerms.name)
   }
 
   /** Check the type signature of the symbol `M` defined by `tree` does not refer

diff --git a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala b/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala
@@ -118,6 +118,7 @@ class BootstrappedOnlyCompilationTests extends ParallelTesting {
     aggregateTests(
       compileFilesInDir("tests/run-macros", defaultOptions),
       compileFilesInDir("tests/run-custom-args/Yretain-trees", defaultOptions and "-Yretain-trees"),
+      compileFilesInDir("tests/run-custom-args/run-macros-erased", defaultOptions and "-Yerased-terms"),
     )
   }.checkRuns()
 

diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -47,6 +47,7 @@ class CompilationTests extends ParallelTesting {
       compileFilesInDir("tests/pos-special/isInstanceOf", allowDeepSubtypes.and("-Xfatal-warnings")),
       compileFilesInDir("tests/new", defaultOptions),
       compileFilesInDir("tests/pos-scala2", scala2CompatMode),
+      compileFilesInDir("tests/pos-custom-args/erased", defaultOptions.and("-Yerased-terms")),
       compileFilesInDir("tests/pos", defaultOptions),
       compileFilesInDir("tests/pos-deep-subtype", allowDeepSubtypes),
       compileFile(
@@ -114,6 +115,7 @@ class CompilationTests extends ParallelTesting {
       compileFilesInDir("tests/neg-no-kind-polymorphism", defaultOptions and "-Yno-kind-polymorphism"),
       compileFilesInDir("tests/neg-custom-args/deprecation", defaultOptions.and("-Xfatal-warnings", "-deprecation")),
       compileFilesInDir("tests/neg-custom-args/fatal-warnings", defaultOptions.and("-Xfatal-warnings")),
+      compileFilesInDir("tests/neg-custom-args/erased", defaultOptions.and("-Yerased-terms")),
       compileFilesInDir("tests/neg-custom-args/allow-double-bindings", allowDoubleBindings),
       compileFilesInDir("tests/neg-custom-args/explicit-nulls", defaultOptions.and("-Yexplicit-nulls")),
       compileDir("tests/neg-custom-args/impl-conv", defaultOptions.and("-Xfatal-warnings", "-feature")),
@@ -165,6 +167,7 @@ class CompilationTests extends ParallelTesting {
       compileFile("tests/run-custom-args/i5256.scala", allowDeepSubtypes),
       compileFile("tests/run-custom-args/fors.scala", defaultOptions and "-strict"),
       compileFile("tests/run-custom-args/no-useless-forwarders.scala", defaultOptions and "-Xmixin-force-forwarders:false"),
+      compileFilesInDir("tests/run-custom-args/erased", defaultOptions.and("-Yerased-terms")),
       compileFilesInDir("tests/run-deep-subtype", allowDeepSubtypes),
       compileFilesInDir("tests/run", defaultOptions)
     ).checkRuns()

diff --git a/compiler/test/dotty/tools/repl/ReplTest.scala b/compiler/test/dotty/tools/repl/ReplTest.scala
@@ -21,7 +21,9 @@ class ReplTest(withStaging: Boolean = false, out: ByteArrayOutputStream = new By
       TestConfiguration.withStagingClasspath
     else
       TestConfiguration.basicClasspath,
-    "-color:never"),
+    "-color:never",
+    "-Yerased-terms",
+  ),
   new PrintStream(out)
 ) with MessageRendering {
   /** Get the stored output from `out`, resetting the buffer */

diff --git a/tests/neg/erased-1.scala → tests/neg-custom-args/erased/erased-1.scala b/tests/neg/erased-1.scala → tests/neg-custom-args/erased/erased-1.scala
diff --git a/tests/neg/erased-2.scala → tests/neg-custom-args/erased/erased-2.scala b/tests/neg/erased-2.scala → tests/neg-custom-args/erased/erased-2.scala
diff --git a/tests/neg/erased-24.scala → tests/neg-custom-args/erased/erased-24.scala b/tests/neg/erased-24.scala → tests/neg-custom-args/erased/erased-24.scala
diff --git a/tests/neg/erased-3.scala → tests/neg-custom-args/erased/erased-3.scala b/tests/neg/erased-3.scala → tests/neg-custom-args/erased/erased-3.scala
diff --git a/tests/neg/erased-4.scala → tests/neg-custom-args/erased/erased-4.scala b/tests/neg/erased-4.scala → tests/neg-custom-args/erased/erased-4.scala
diff --git a/tests/neg/erased-5.scala → tests/neg-custom-args/erased/erased-5.scala b/tests/neg/erased-5.scala → tests/neg-custom-args/erased/erased-5.scala
diff --git a/tests/neg/erased-6.scala → tests/neg-custom-args/erased/erased-6.scala b/tests/neg/erased-6.scala → tests/neg-custom-args/erased/erased-6.scala
diff --git a/tests/neg/erased-args-lifted.scala → ...stom-args/erased/erased-args-lifted.scala b/tests/neg/erased-args-lifted.scala → ...stom-args/erased/erased-args-lifted.scala
diff --git a/tests/neg/erased-assign.scala → ...eg-custom-args/erased/erased-assign.scala b/tests/neg/erased-assign.scala → ...eg-custom-args/erased/erased-assign.scala
diff --git a/tests/neg/erased-case-class.scala → ...ustom-args/erased/erased-case-class.scala b/tests/neg/erased-case-class.scala → ...ustom-args/erased/erased-case-class.scala
diff --git a/tests/neg/erased-class.scala → ...neg-custom-args/erased/erased-class.scala b/tests/neg/erased-class.scala → ...neg-custom-args/erased/erased-class.scala
diff --git a/tests/neg/erased-def-rhs.scala → ...g-custom-args/erased/erased-def-rhs.scala b/tests/neg/erased-def-rhs.scala → ...g-custom-args/erased/erased-def-rhs.scala
diff --git a/tests/neg/erased-if-else.scala → ...g-custom-args/erased/erased-if-else.scala b/tests/neg/erased-if-else.scala → ...g-custom-args/erased/erased-if-else.scala
diff --git a/tests/neg/erased-implicit.scala → ...-custom-args/erased/erased-implicit.scala b/tests/neg/erased-implicit.scala → ...-custom-args/erased/erased-implicit.scala
diff --git a/tests/neg/erased-lazy-val.scala → ...-custom-args/erased/erased-lazy-val.scala b/tests/neg/erased-lazy-val.scala → ...-custom-args/erased/erased-lazy-val.scala
diff --git a/...-machine-state-encoding-with-inline.scala → ...-machine-state-encoding-with-inline.scala b/...-machine-state-encoding-with-inline.scala → ...-machine-state-encoding-with-inline.scala
diff --git a/tests/neg/erased-match.scala → ...neg-custom-args/erased/erased-match.scala b/tests/neg/erased-match.scala → ...neg-custom-args/erased/erased-match.scala
diff --git a/tests/neg/erased-object.scala → ...eg-custom-args/erased/erased-object.scala b/tests/neg/erased-object.scala → ...eg-custom-args/erased/erased-object.scala
diff --git a/tests/neg/erased-path.scala → .../neg-custom-args/erased/erased-path.scala b/tests/neg/erased-path.scala → .../neg-custom-args/erased/erased-path.scala
diff --git a/tests/neg/erased-pathdep-1.scala → ...custom-args/erased/erased-pathdep-1.scala b/tests/neg/erased-pathdep-1.scala → ...custom-args/erased/erased-pathdep-1.scala
diff --git a/tests/neg/erased-pathdep-2.scala → ...custom-args/erased/erased-pathdep-2.scala b/tests/neg/erased-pathdep-2.scala → ...custom-args/erased/erased-pathdep-2.scala
diff --git a/tests/neg/erased-return.scala → ...eg-custom-args/erased/erased-return.scala b/tests/neg/erased-return.scala → ...eg-custom-args/erased/erased-return.scala
diff --git a/tests/neg/erased-singleton.scala → ...custom-args/erased/erased-singleton.scala b/tests/neg/erased-singleton.scala → ...custom-args/erased/erased-singleton.scala
diff --git a/tests/neg/erased-trait.scala → ...neg-custom-args/erased/erased-trait.scala b/tests/neg/erased-trait.scala → ...neg-custom-args/erased/erased-trait.scala
diff --git a/tests/neg/erased-try.scala → ...s/neg-custom-args/erased/erased-try.scala b/tests/neg/erased-try.scala → ...s/neg-custom-args/erased/erased-try.scala
diff --git a/tests/neg/erased-type.scala → .../neg-custom-args/erased/erased-type.scala b/tests/neg/erased-type.scala → .../neg-custom-args/erased/erased-type.scala
diff --git a/tests/neg/erased-val-rhs.scala → ...g-custom-args/erased/erased-val-rhs.scala b/tests/neg/erased-val-rhs.scala → ...g-custom-args/erased/erased-val-rhs.scala
diff --git a/tests/neg/erased-value-class.scala → ...stom-args/erased/erased-value-class.scala b/tests/neg/erased-value-class.scala → ...stom-args/erased/erased-value-class.scala
diff --git a/tests/neg/erased-var.scala → ...s/neg-custom-args/erased/erased-var.scala b/tests/neg/erased-var.scala → ...s/neg-custom-args/erased/erased-var.scala
diff --git a/tests/neg/i4060.scala → tests/neg-custom-args/i4060.scala b/tests/neg/i4060.scala → tests/neg-custom-args/i4060.scala
diff --git a/tests/neg/inline-position/A_1.scala → ...neg-custom-args/inline-position/A_1.scala b/tests/neg/inline-position/A_1.scala → ...neg-custom-args/inline-position/A_1.scala
diff --git a/tests/neg/inline-position/B_2.scala → ...neg-custom-args/inline-position/B_2.scala b/tests/neg/inline-position/B_2.scala → ...neg-custom-args/inline-position/B_2.scala
diff --git a/tests/neg/nested-rewrites.scala → tests/neg-custom-args/nested-rewrites.scala b/tests/neg/nested-rewrites.scala → tests/neg-custom-args/nested-rewrites.scala
diff --git a/tests/neg/typeclass-derivation2.scala → ...g-custom-args/typeclass-derivation2.scala b/tests/neg/typeclass-derivation2.scala → ...g-custom-args/typeclass-derivation2.scala
diff --git a/tests/neg/typelevel-noeta.scala → tests/neg-custom-args/typelevel-noeta.scala b/tests/neg/typelevel-noeta.scala → tests/neg-custom-args/typelevel-noeta.scala
diff --git a/tests/pos/erased-args-lifted.scala → ...stom-args/erased/erased-args-lifted.scala b/tests/pos/erased-args-lifted.scala → ...stom-args/erased/erased-args-lifted.scala
diff --git a/tests/pos/erased-asInstanceOf.scala → ...tom-args/erased/erased-asInstanceOf.scala b/tests/pos/erased-asInstanceOf.scala → ...tom-args/erased/erased-asInstanceOf.scala
diff --git a/tests/pos/erased-deep-context.scala → ...tom-args/erased/erased-deep-context.scala b/tests/pos/erased-deep-context.scala → ...tom-args/erased/erased-deep-context.scala
diff --git a/tests/pos/erased-extension-method.scala → ...args/erased/erased-extension-method.scala b/tests/pos/erased-extension-method.scala → ...args/erased/erased-extension-method.scala
diff --git a/tests/pos/erased-lub-2.scala → ...pos-custom-args/erased/erased-lub-2.scala b/tests/pos/erased-lub-2.scala → ...pos-custom-args/erased/erased-lub-2.scala
diff --git a/tests/pos/erased-lub.scala → ...s/pos-custom-args/erased/erased-lub.scala b/tests/pos/erased-lub.scala → ...s/pos-custom-args/erased/erased-lub.scala
diff --git a/tests/pos/erased-typedef.scala → ...s-custom-args/erased/erased-typedef.scala b/tests/pos/erased-typedef.scala → ...s-custom-args/erased/erased-typedef.scala
diff --git a/tests/pos/i7868.scala → tests/pos-custom-args/erased/i7868.scala b/tests/pos/i7868.scala → tests/pos-custom-args/erased/i7868.scala
diff --git a/tests/pos/i7878.scala → tests/pos-custom-args/erased/i7878.scala b/tests/pos/i7878.scala → tests/pos-custom-args/erased/i7878.scala
diff --git a/tests/pos/i4125.scala → tests/pos-custom-args/i4125.scala b/tests/pos/i4125.scala → tests/pos-custom-args/i4125.scala
diff --git a/tests/pos/i4509.scala → tests/pos-custom-args/i4509.scala b/tests/pos/i4509.scala → tests/pos-custom-args/i4509.scala
diff --git a/tests/pos/i5938.scala → tests/pos-custom-args/i5938.scala b/tests/pos/i5938.scala → tests/pos-custom-args/i5938.scala
diff --git a/tests/pos/i6009a.scala → tests/pos-custom-args/i6009a.scala b/tests/pos/i6009a.scala → tests/pos-custom-args/i6009a.scala
diff --git a/tests/pos/i6009b.scala → tests/pos-custom-args/i6009b.scala b/tests/pos/i6009b.scala → tests/pos-custom-args/i6009b.scala
diff --git a/tests/pos/i6009c.scala → tests/pos-custom-args/i6009c.scala b/tests/pos/i6009c.scala → tests/pos-custom-args/i6009c.scala
diff --git a/tests/pos/i6419.scala → tests/pos-custom-args/i6419.scala b/tests/pos/i6419.scala → tests/pos-custom-args/i6419.scala
diff --git a/tests/pos/i7741.scala → tests/pos-custom-args/i7741.scala b/tests/pos/i7741.scala → tests/pos-custom-args/i7741.scala
diff --git a/tests/pos/inline-match-gadt.scala → ...s/pos-custom-args/inline-match-gadt.scala b/tests/pos/inline-match-gadt.scala → ...s/pos-custom-args/inline-match-gadt.scala
diff --git a/tests/pos/matchtype.scala → tests/pos-custom-args/matchtype.scala b/tests/pos/matchtype.scala → tests/pos-custom-args/matchtype.scala
diff --git a/tests/pos/phantom-Eq.scala → tests/pos-custom-args/phantom-Eq.scala b/tests/pos/phantom-Eq.scala → tests/pos-custom-args/phantom-Eq.scala
diff --git a/tests/pos/phantom-Eq2/Phantom-Eq_1.scala → ...ustom-args/phantom-Eq2/Phantom-Eq_1.scala b/tests/pos/phantom-Eq2/Phantom-Eq_1.scala → ...ustom-args/phantom-Eq2/Phantom-Eq_1.scala
diff --git a/tests/pos/phantom-Eq2/Phantom-Eq_2.scala → ...ustom-args/phantom-Eq2/Phantom-Eq_2.scala b/tests/pos/phantom-Eq2/Phantom-Eq_2.scala → ...ustom-args/phantom-Eq2/Phantom-Eq_2.scala
diff --git a/tests/pos/phantom-Evidence.scala → tests/pos-custom-args/phantom-Evidence.scala b/tests/pos/phantom-Evidence.scala → tests/pos-custom-args/phantom-Evidence.scala
diff --git a/tests/run/companion-loading.scala → ...s/run-custom-args/companion-loading.scala b/tests/run/companion-loading.scala → ...s/run-custom-args/companion-loading.scala
diff --git a/tests/run/erased-1.check → tests/run-custom-args/erased/erased-1.check b/tests/run/erased-1.check → tests/run-custom-args/erased/erased-1.check
diff --git a/tests/run/erased-1.scala → tests/run-custom-args/erased/erased-1.scala b/tests/run/erased-1.scala → tests/run-custom-args/erased/erased-1.scala
diff --git a/tests/run/erased-10.check → tests/run-custom-args/erased/erased-10.check b/tests/run/erased-10.check → tests/run-custom-args/erased/erased-10.check
diff --git a/tests/run/erased-10.scala → tests/run-custom-args/erased/erased-10.scala b/tests/run/erased-10.scala → tests/run-custom-args/erased/erased-10.scala
diff --git a/tests/run/erased-11.check → tests/run-custom-args/erased/erased-11.check b/tests/run/erased-11.check → tests/run-custom-args/erased/erased-11.check
diff --git a/tests/run/erased-11.scala → tests/run-custom-args/erased/erased-11.scala b/tests/run/erased-11.scala → tests/run-custom-args/erased/erased-11.scala
diff --git a/tests/run/erased-12.check → tests/run-custom-args/erased/erased-12.check b/tests/run/erased-12.check → tests/run-custom-args/erased/erased-12.check
diff --git a/tests/run/erased-12.scala → tests/run-custom-args/erased/erased-12.scala b/tests/run/erased-12.scala → tests/run-custom-args/erased/erased-12.scala
diff --git a/tests/run/erased-13.check → tests/run-custom-args/erased/erased-13.check b/tests/run/erased-13.check → tests/run-custom-args/erased/erased-13.check
diff --git a/tests/run/erased-13.scala → tests/run-custom-args/erased/erased-13.scala b/tests/run/erased-13.scala → tests/run-custom-args/erased/erased-13.scala
diff --git a/tests/run/erased-14.check → tests/run-custom-args/erased/erased-14.check b/tests/run/erased-14.check → tests/run-custom-args/erased/erased-14.check
diff --git a/tests/run/erased-14.scala → tests/run-custom-args/erased/erased-14.scala b/tests/run/erased-14.scala → tests/run-custom-args/erased/erased-14.scala
diff --git a/tests/run/erased-15.check → tests/run-custom-args/erased/erased-15.check b/tests/run/erased-15.check → tests/run-custom-args/erased/erased-15.check
diff --git a/tests/run/erased-15.scala → tests/run-custom-args/erased/erased-15.scala b/tests/run/erased-15.scala → tests/run-custom-args/erased/erased-15.scala
diff --git a/tests/run/erased-16.check → tests/run-custom-args/erased/erased-16.check b/tests/run/erased-16.check → tests/run-custom-args/erased/erased-16.check
diff --git a/tests/run/erased-16.scala → tests/run-custom-args/erased/erased-16.scala b/tests/run/erased-16.scala → tests/run-custom-args/erased/erased-16.scala
diff --git a/tests/run/erased-17.check → tests/run-custom-args/erased/erased-17.check b/tests/run/erased-17.check → tests/run-custom-args/erased/erased-17.check
diff --git a/tests/run/erased-17.scala → tests/run-custom-args/erased/erased-17.scala b/tests/run/erased-17.scala → tests/run-custom-args/erased/erased-17.scala
diff --git a/tests/run/erased-18.check → tests/run-custom-args/erased/erased-18.check b/tests/run/erased-18.check → tests/run-custom-args/erased/erased-18.check
diff --git a/tests/run/erased-18.scala → tests/run-custom-args/erased/erased-18.scala b/tests/run/erased-18.scala → tests/run-custom-args/erased/erased-18.scala
diff --git a/tests/run/erased-19.check → tests/run-custom-args/erased/erased-19.check b/tests/run/erased-19.check → tests/run-custom-args/erased/erased-19.check
diff --git a/tests/run/erased-19.scala → tests/run-custom-args/erased/erased-19.scala b/tests/run/erased-19.scala → tests/run-custom-args/erased/erased-19.scala
diff --git a/tests/run/erased-2.check → tests/run-custom-args/erased/erased-2.check b/tests/run/erased-2.check → tests/run-custom-args/erased/erased-2.check
diff --git a/tests/run/erased-2.scala → tests/run-custom-args/erased/erased-2.scala b/tests/run/erased-2.scala → tests/run-custom-args/erased/erased-2.scala
diff --git a/tests/run/erased-20.check → tests/run-custom-args/erased/erased-20.check b/tests/run/erased-20.check → tests/run-custom-args/erased/erased-20.check
diff --git a/tests/run/erased-20.scala → tests/run-custom-args/erased/erased-20.scala b/tests/run/erased-20.scala → tests/run-custom-args/erased/erased-20.scala
diff --git a/tests/run/erased-21.check → tests/run-custom-args/erased/erased-21.check b/tests/run/erased-21.check → tests/run-custom-args/erased/erased-21.check
diff --git a/tests/run/erased-21.scala → tests/run-custom-args/erased/erased-21.scala b/tests/run/erased-21.scala → tests/run-custom-args/erased/erased-21.scala
diff --git a/tests/run/erased-22.check → tests/run-custom-args/erased/erased-22.check b/tests/run/erased-22.check → tests/run-custom-args/erased/erased-22.check
diff --git a/tests/run/erased-22.scala → tests/run-custom-args/erased/erased-22.scala b/tests/run/erased-22.scala → tests/run-custom-args/erased/erased-22.scala
diff --git a/tests/run/erased-23.check → tests/run-custom-args/erased/erased-23.check b/tests/run/erased-23.check → tests/run-custom-args/erased/erased-23.check
diff --git a/tests/run/erased-23.scala → tests/run-custom-args/erased/erased-23.scala b/tests/run/erased-23.scala → tests/run-custom-args/erased/erased-23.scala
diff --git a/tests/run/erased-25.check → tests/run-custom-args/erased/erased-25.check b/tests/run/erased-25.check → tests/run-custom-args/erased/erased-25.check
diff --git a/tests/run/erased-25.scala → tests/run-custom-args/erased/erased-25.scala b/tests/run/erased-25.scala → tests/run-custom-args/erased/erased-25.scala
diff --git a/tests/run/erased-26.check → tests/run-custom-args/erased/erased-26.check b/tests/run/erased-26.check → tests/run-custom-args/erased/erased-26.check
diff --git a/tests/run/erased-26.scala → tests/run-custom-args/erased/erased-26.scala b/tests/run/erased-26.scala → tests/run-custom-args/erased/erased-26.scala
diff --git a/tests/run/erased-27.check → tests/run-custom-args/erased/erased-27.check b/tests/run/erased-27.check → tests/run-custom-args/erased/erased-27.check
diff --git a/tests/run/erased-27.scala → tests/run-custom-args/erased/erased-27.scala b/tests/run/erased-27.scala → tests/run-custom-args/erased/erased-27.scala
diff --git a/tests/run/erased-28.check → tests/run-custom-args/erased/erased-28.check b/tests/run/erased-28.check → tests/run-custom-args/erased/erased-28.check
diff --git a/tests/run/erased-28.scala → tests/run-custom-args/erased/erased-28.scala b/tests/run/erased-28.scala → tests/run-custom-args/erased/erased-28.scala
diff --git a/tests/run/erased-3.check → tests/run-custom-args/erased/erased-3.check b/tests/run/erased-3.check → tests/run-custom-args/erased/erased-3.check
diff --git a/tests/run/erased-3.scala → tests/run-custom-args/erased/erased-3.scala b/tests/run/erased-3.scala → tests/run-custom-args/erased/erased-3.scala
diff --git a/tests/run/erased-4.check → tests/run-custom-args/erased/erased-4.check b/tests/run/erased-4.check → tests/run-custom-args/erased/erased-4.check
diff --git a/tests/run/erased-4.scala → tests/run-custom-args/erased/erased-4.scala b/tests/run/erased-4.scala → tests/run-custom-args/erased/erased-4.scala
diff --git a/tests/run/erased-5.check → tests/run-custom-args/erased/erased-5.check b/tests/run/erased-5.check → tests/run-custom-args/erased/erased-5.check
diff --git a/tests/run/erased-5.scala → tests/run-custom-args/erased/erased-5.scala b/tests/run/erased-5.scala → tests/run-custom-args/erased/erased-5.scala
diff --git a/tests/run/erased-6.check → tests/run-custom-args/erased/erased-6.check b/tests/run/erased-6.check → tests/run-custom-args/erased/erased-6.check
diff --git a/tests/run/erased-6.scala → tests/run-custom-args/erased/erased-6.scala b/tests/run/erased-6.scala → tests/run-custom-args/erased/erased-6.scala
diff --git a/tests/run/erased-7.check → tests/run-custom-args/erased/erased-7.check b/tests/run/erased-7.check → tests/run-custom-args/erased/erased-7.check
diff --git a/tests/run/erased-7.scala → tests/run-custom-args/erased/erased-7.scala b/tests/run/erased-7.scala → tests/run-custom-args/erased/erased-7.scala
diff --git a/tests/run/erased-8.check → tests/run-custom-args/erased/erased-8.check b/tests/run/erased-8.check → tests/run-custom-args/erased/erased-8.check
diff --git a/tests/run/erased-8.scala → tests/run-custom-args/erased/erased-8.scala b/tests/run/erased-8.scala → tests/run-custom-args/erased/erased-8.scala
diff --git a/tests/run/erased-9.check → tests/run-custom-args/erased/erased-9.check b/tests/run/erased-9.check → tests/run-custom-args/erased/erased-9.check
diff --git a/tests/run/erased-9.scala → tests/run-custom-args/erased/erased-9.scala b/tests/run/erased-9.scala → tests/run-custom-args/erased/erased-9.scala
diff --git a/tests/run/erased-frameless.check → ...custom-args/erased/erased-frameless.check b/tests/run/erased-frameless.check → ...custom-args/erased/erased-frameless.check
diff --git a/tests/run/erased-frameless.scala → ...custom-args/erased/erased-frameless.scala b/tests/run/erased-frameless.scala → ...custom-args/erased/erased-frameless.scala
diff --git a/tests/run/erased-machine-state.check → ...om-args/erased/erased-machine-state.check b/tests/run/erased-machine-state.check → ...om-args/erased/erased-machine-state.check
diff --git a/tests/run/erased-machine-state.scala → ...om-args/erased/erased-machine-state.scala b/tests/run/erased-machine-state.scala → ...om-args/erased/erased-machine-state.scala
diff --git a/tests/run/erased-poly-ref.check → ...-custom-args/erased/erased-poly-ref.check b/tests/run/erased-poly-ref.check → ...-custom-args/erased/erased-poly-ref.check
diff --git a/tests/run/erased-poly-ref.scala → ...-custom-args/erased/erased-poly-ref.scala b/tests/run/erased-poly-ref.scala → ...-custom-args/erased/erased-poly-ref.scala
diff --git a/tests/run/erased-select-prefix.check → ...om-args/erased/erased-select-prefix.check b/tests/run/erased-select-prefix.check → ...om-args/erased/erased-select-prefix.check
diff --git a/tests/run/erased-select-prefix.scala → ...om-args/erased/erased-select-prefix.scala b/tests/run/erased-select-prefix.scala → ...om-args/erased/erased-select-prefix.scala
diff --git a/tests/run/erased-value-class.check → ...stom-args/erased/erased-value-class.check b/tests/run/erased-value-class.check → ...stom-args/erased/erased-value-class.check
diff --git a/tests/run/erased-value-class.scala → ...stom-args/erased/erased-value-class.scala b/tests/run/erased-value-class.scala → ...stom-args/erased/erased-value-class.scala
diff --git a/tests/generic-java-signatures/erased.check → ...ased/generic-java-signatures-erased.check b/tests/generic-java-signatures/erased.check → ...ased/generic-java-signatures-erased.check
diff --git a/tests/generic-java-signatures/erased.scala → ...ased/generic-java-signatures-erased.scala b/tests/generic-java-signatures/erased.scala → ...ased/generic-java-signatures-erased.scala
diff --git a/tests/run/generic-tuples.scala → tests/run-custom-args/generic-tuples.scala b/tests/run/generic-tuples.scala → tests/run-custom-args/generic-tuples.scala
diff --git a/tests/run/lambda-serialization-others.scala → ...om-args/lambda-serialization-others.scala b/tests/run/lambda-serialization-others.scala → ...om-args/lambda-serialization-others.scala
diff --git a/tests/run/phantom-OnHList.scala → tests/run-custom-args/phantom-OnHList.scala b/tests/run/phantom-OnHList.scala → tests/run-custom-args/phantom-OnHList.scala
diff --git a/tests/run-macros/erased-arg-macro/1.scala → ...gs/run-macros-erased/macro-erased/1.scala b/tests/run-macros/erased-arg-macro/1.scala → ...gs/run-macros-erased/macro-erased/1.scala
diff --git a/tests/run-macros/erased-arg-macro/2.scala → ...gs/run-macros-erased/macro-erased/2.scala b/tests/run-macros/erased-arg-macro/2.scala → ...gs/run-macros-erased/macro-erased/2.scala
diff --git a/tests/run/toplevel-stale/A_1.scala → .../run-custom-args/toplevel-stale/A_1.scala b/tests/run/toplevel-stale/A_1.scala → .../run-custom-args/toplevel-stale/A_1.scala
diff --git a/tests/run/toplevel-stale/B_2.scala → .../run-custom-args/toplevel-stale/B_2.scala b/tests/run/toplevel-stale/B_2.scala → .../run-custom-args/toplevel-stale/B_2.scala
diff --git a/tests/run/toplevel-stale/Test_3.scala → ...n-custom-args/toplevel-stale/Test_3.scala b/tests/run/toplevel-stale/Test_3.scala → ...n-custom-args/toplevel-stale/Test_3.scala
diff --git a/tests/run/typeclass-derivation2.scala → ...n-custom-args/typeclass-derivation2.scala b/tests/run/typeclass-derivation2.scala → ...n-custom-args/typeclass-derivation2.scala
diff --git a/tests/run/typeclass-derivation2c.scala → ...-custom-args/typeclass-derivation2c.scala b/tests/run/typeclass-derivation2c.scala → ...-custom-args/typeclass-derivation2c.scala
diff --git a/tests/run/typelevel-defaultValue.scala → ...-custom-args/typelevel-defaultValue.scala b/tests/run/typelevel-defaultValue.scala → ...-custom-args/typelevel-defaultValue.scala