Merge pull request #11746 from dotty-staging/fix-#11688

Do not allow calls to inline methods directly in macro splice

compiler/src/dotty/tools/dotc/transform/Splicer.scala

@@ -161,7 +161,7 @@ object Splicer {
         case SeqLiteral(elems, _) =>
           elems.foreach(checkIfValidArgument)
 
-        case tree: Ident if tree.symbol.is(Inline) || summon[Env].contains(tree.symbol) =>
+        case tree: Ident if summon[Env].contains(tree.symbol) =>
           // OK
 
         case _ =>
@@ -186,6 +186,9 @@ object Splicer {
         case Typed(expr, _) =>
           checkIfValidStaticCall(expr)
 
+        case Apply(Select(Apply(fn, quoted :: Nil), nme.apply), _) if fn.symbol == defn.QuotedRuntime_exprQuote =>
+          // OK, canceled and warning emitted
+
         case Call(fn, args)
             if (fn.symbol.isConstructor && fn.symbol.owner.owner.is(Package)) ||
                fn.symbol.is(Module) || fn.symbol.isStatic ||

compiler/src/dotty/tools/dotc/typer/PrepareInlineable.scala

@@ -287,10 +287,10 @@ object PrepareInlineable {
             """Malformed macro.
               |
               |Expected the splice ${...} to be at the top of the RHS:
-              |  inline def foo(inline x: X, ..., y: Y): Int = ${impl(x, ... '{y}})
+              |  inline def foo(inline x: X, ..., y: Y): Int = ${ impl('x, ... 'y) }
               |
               | * The contents of the splice must call a static method
-              | * All arguments must be quoted or inline
+              | * All arguments must be quoted
             """.stripMargin, inlined.srcPos)
       }
       checkMacro(body)

tests/neg-macros/i11688.scala

@@ -0,0 +1,6 @@
+import scala.quoted._
+
+def myMacro(a: Int)(using Quotes) = Expr(a)
+def baz = 42
+inline def bar = baz
+inline def foo = ${myMacro(bar)} // error

tests/neg-macros/i4493-b.scala

@@ -3,6 +3,6 @@ class Index[K]
 object Index {
   inline def succ[K](x: K): Unit = ${
     implicit val t: Type[K] = Type.of[K] // error
-    '{new Index[K]} // error
+    '{new Index[K]}
   }
 }

tests/neg-macros/i4493.scala

@@ -3,6 +3,6 @@ class Index[K]
 object Index {
   inline def succ[K]: Unit = ${
     implicit val t: Type[K] = Type.of[K] // error
-    '{new Index[K]} // error
+    '{new Index[K]}
   }
 }

tests/pos-macros/i4431.scala

@@ -0,0 +1,6 @@
+import scala.quoted.*
+
+object Macros {
+  inline def h(f: => Int => String): String = ${'{f(42)}}
+  val a = h(_.toString)
+}

tests/neg-macros/i4493-c.scala → tests/pos-macros/i4493-c.scala

@@ -1,6 +1,6 @@
 class Index[K]
 object Index {
   inline def succ[K]: Unit = ${
-    '{new Index[K]} // error
+    '{new Index[K]}
   }
 }

tests/run-macros/i4492/quoted_1.scala

@@ -0,0 +1,6 @@
+
+trait Index
+
+object Index {
+  inline def succ(prev: Index): Unit = ${ '{println("Ok")} }
+}

tests/neg-macros/i4492/quoted_2.scala → tests/run-macros/i4492/quoted_2.scala

@@ -1,6 +1,6 @@
 
 object Test {
   def main(args: Array[String]): Unit = {
-    Index.succ(null) // error
+    Index.succ(null)
   }
 }