From 688ed4f168d2bd40acf478f637d27f6e03c1a7d2 Mon Sep 17 00:00:00 2001
From: Matt Bovel <matthieu@bovel.net>
Date: Wed, 27 Nov 2024 23:01:26 +0000
Subject: [PATCH] Do not lift annotation arguments (bis)

---
 .../dotty/tools/dotc/typer/Applications.scala |  2 ++
 .../dependent-annot-default-args.check        | 23 +++++++++++++++++++
 .../dependent-annot-default-args.scala        | 10 ++++++++
 3 files changed, 35 insertions(+)

diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
index 41e48f7595dc..ff6c71f57355 100644
--- a/compiler/src/dotty/tools/dotc/typer/Applications.scala
+++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -963,6 +963,8 @@ trait Applications extends Compatibility {
                 case (arg: NamedArg, _) => arg
                 case (arg, name)        => NamedArg(name, arg)
               }
+          else if isAnnotConstr(methRef.symbol) then
+            typedArgs
           else if !sameSeq(args, orderedArgs) && !typedArgs.forall(isSafeArg) then
             // need to lift arguments to maintain evaluation order in the
             // presence of argument reorderings.
diff --git a/tests/printing/dependent-annot-default-args.check b/tests/printing/dependent-annot-default-args.check
index 44c1fe31e2d1..f457d5d62edb 100644
--- a/tests/printing/dependent-annot-default-args.check
+++ b/tests/printing/dependent-annot-default-args.check
@@ -8,16 +8,39 @@ package <empty> {
   final module class annot() extends AnyRef() { this: annot.type =>
     def $lessinit$greater$default$2: Any @uncheckedVariance = 42
   }
+  class annot2(x: Any, y: Array[Any]) extends annotation.Annotation() {
+    private[this] val x: Any
+    private[this] val y: Array[Any]
+  }
+  final lazy module val annot2: annot2 = new annot2()
+  final module class annot2() extends AnyRef() { this: annot2.type =>
+    def $lessinit$greater$default$1: Any @uncheckedVariance = -1
+    def $lessinit$greater$default$2: Array[Any] @uncheckedVariance =
+      Array.apply[Any](["Hello" : Any]*)(scala.reflect.ClassTag.Any)
+  }
   final lazy module val dependent-annot-default-args$package:
     dependent-annot-default-args$package =
     new dependent-annot-default-args$package()
   final module class dependent-annot-default-args$package() extends Object() {
     this: dependent-annot-default-args$package.type =>
     def f(x: Int): Int @annot(x) = x
+    def f2(x: Int):
+      Int @annot2(
+        y = Array.apply[Any](["Hello",x : Any]*)(scala.reflect.ClassTag.Any))
+     = x
     def test: Unit =
       {
         val y: Int = ???
         val z: Int @annot(y) = f(y)
+        val z2:
+          Int @annot2(
+            y = Array.apply[Any](["Hello",y : Any]*)(scala.reflect.ClassTag.Any)
+            )
+         = f2(y)
+        @annot(44) val z3: Int = 45
+        @annot2(
+          y = Array.apply[Any](["Hello",y : Any]*)(scala.reflect.ClassTag.Any))
+          val z4: Int = 45
         ()
       }
   }
diff --git a/tests/printing/dependent-annot-default-args.scala b/tests/printing/dependent-annot-default-args.scala
index 7ddce711fedc..11fc9ef52cc9 100644
--- a/tests/printing/dependent-annot-default-args.scala
+++ b/tests/printing/dependent-annot-default-args.scala
@@ -1,5 +1,15 @@
 class annot(x: Any, y: Any = 42) extends annotation.Annotation
+class annot2(x: Any = -1, y: Array[Any] = Array("Hello")) extends annotation.Annotation
+
 def f(x: Int): Int @annot(x) = x
+def f2(x: Int): Int @annot2(y = Array("Hello", x)) = x
+
 def test =
   val y: Int = ???
+
   val z = f(y)
+  val z2 = f2(y)
+
+  @annot(44) val z3 = 45
+  @annot2(y = Array("Hello", y)) val z4 = 45
+