.

Author: lihaoyi

.github/workflows/stdlib.yaml

@@ -436,8 +436,6 @@ jobs:
   test-scala3-compiler-bootstrapped:
     runs-on: ubuntu-latest
     needs: [scala3-compiler-bootstrapped, tasty-core-bootstrapped, scala-library-bootstrapped, scala3-staging, scala3-tasty-inspector]
-    env:
-      DOTTY_DISABLE_REPL_BYTECODE_INSTRUMENTATION: true
     steps:
       - name: Git Checkout
         uses: actions/checkout@v5
@@ -552,8 +550,6 @@ jobs:
   scripted-tests:
     runs-on: ubuntu-latest
     needs: [scala3-compiler-bootstrapped, tasty-core-bootstrapped, scala3-staging, scala3-tasty-inspector, scala-library-sjs, scaladoc]
-    env:
-      DOTTY_DISABLE_REPL_BYTECODE_INSTRUMENTATION: true
     steps:
       - name: Git Checkout
         uses: actions/checkout@v5

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

@@ -65,16 +65,7 @@ object TestConfiguration {
 
   val commonOptions = Array("-indent") ++ checkOptions ++ noCheckOptions ++ yCheckOptions ++ silenceOptions
   val noYcheckCommonOptions = Array("-indent") ++ checkOptions ++ noCheckOptions
-
-  // Conditionally add -Xrepl-disable-bytecode-instrumentation when running in CI environments
-  // that have classloader issues with the new bytecode instrumentation
-  private val replBytecodeInstrumentationFlag =
-    if sys.env.isDefinedAt("DOTTY_DISABLE_REPL_BYTECODE_INSTRUMENTATION") then
-      Array("-Xrepl-disable-bytecode-instrumentation")
-    else
-      Array.empty[String]
-
-  val defaultOptions = TestFlags(basicClasspath, commonOptions ++ replBytecodeInstrumentationFlag) `and` "-Yno-stdlib-patches"
+  val defaultOptions = TestFlags(basicClasspath, commonOptions) `and` "-Yno-stdlib-patches"
   val noYcheckOptions = TestFlags(basicClasspath, noYcheckCommonOptions)
   val bestEffortBaselineOptions = TestFlags(basicClasspath, noCheckOptions)
   val unindentOptions = TestFlags(basicClasspath, Array("-no-indent") ++ checkOptions ++ noCheckOptions ++ yCheckOptions)