Remove the -rewrite option for typechecks methods in Quotes

dotty-staging · Sep 10, 2024 · 3025bfb · 3025bfb
1 parent 5e83606
commit 3025bfb
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/compiler/src/dotty/tools/dotc/config/Settings.scala b/compiler/src/dotty/tools/dotc/config/Settings.scala
@@ -47,6 +47,10 @@ object Settings:
         values(idx) = x
         changed.add(idx)
         this
+
+    def reinitializedCopy(): SettingsState =
+      SettingsState(values.toSeq, changed.toSet)
+
   end SettingsState
 
   case class ArgsSummary(

diff --git a/compiler/src/dotty/tools/dotc/inlines/Inlines.scala b/compiler/src/dotty/tools/dotc/inlines/Inlines.scala
@@ -342,10 +342,13 @@ object Inlines:
         if Inlines.isInlineable(codeArg1.symbol) then stripTyped(Inlines.inlineCall(codeArg1))
         else codeArg1
 
+      // We should not be rewriting tested strings
+      val noRewriteSettings = ctx.settings.rewrite.updateIn(ctx.settingsState.reinitializedCopy(), None)
+
       ConstFold(underlyingCodeArg).tpe.widenTermRefExpr match {
         case ConstantType(Constant(code: String)) =>
           val source2 = SourceFile.virtual("tasty-reflect", code)
-          inContext(ctx.fresh.setNewTyperState().setTyper(new Typer(ctx.nestingLevel + 1)).setSource(source2)) {
+          inContext(ctx.fresh.setSettings(noRewriteSettings).setNewTyperState().setTyper(new Typer(ctx.nestingLevel + 1)).setSource(source2)) {
             val tree2 = new Parser(source2).block()
             if ctx.reporter.allErrors.nonEmpty then
               ctx.reporter.allErrors.map((ErrorKind.Parser, _))

diff --git a/compiler/test/dotc/pos-test-pickling.blacklist b/compiler/test/dotc/pos-test-pickling.blacklist
@@ -135,3 +135,6 @@ parsercombinators-new-syntax.scala
 hylolib-deferred-given
 hylolib-cb
 hylolib
+
+# typecheckErrors method unpickling
+i21415.scala
diff --git a/compiler/test/dotc/run-test-pickling.blacklist b/compiler/test/dotc/run-test-pickling.blacklist
@@ -27,7 +27,6 @@ tuple-zip.scala
 tuples1.scala
 tuples1a.scala
 tuples1b.scala
-typeCheckErrors.scala
 typeclass-derivation-doc-example.scala
 typeclass-derivation1.scala
 typeclass-derivation2.scala
@@ -47,3 +46,6 @@ trait-static-forwarder
 i17255
 named-tuples-strawman-2.scala
 
+# typecheckErrors method unpickling
+typeCheckErrors.scala
+
diff --git a/tests/pos/i21415.scala b/tests/pos/i21415.scala
@@ -0,0 +1,8 @@
+//> using options -rewrite -source:3.4-migration
+import scala.compiletime.testing.typeCheckErrors
+
+def foo(arg: Int): Unit = ???
+
+@main def Test =
+  typeCheckErrors("Seq.empty[Int].foreach(foo.apply _)")
+  typeCheckErrors("Seq.empty[Int].foreach(foo.apply _)")