Merge pull request #10103 from dotty-staging/disallow-interpreation-of-arbitrary-calls-in-paramteres

Disallow interpretation of arbitrary calls in parameters

Author: nicolasstucki

community-build/community-projects/utest

@@ -146,18 +146,12 @@ object Splicer {
         case Apply(Select(Apply(fn, quoted :: Nil), nme.apply), _) if fn.symbol == defn.InternalQuoted_exprQuote =>
           // OK
 
-        case TypeApply(fn, quoted :: Nil) if fn.symbol == defn.QuotedTypeModule_apply =>
+        case Apply(Select(TypeApply(fn, List(quoted)), nme.apply), _)if fn.symbol == defn.QuotedTypeModule_apply =>
           // OK
 
         case Literal(Constant(value)) =>
           // OK
 
-        case Call(fn, args)
-            if (fn.symbol.isConstructor && fn.symbol.owner.owner.is(Package)) ||
-               fn.symbol.is(Module) || fn.symbol.isStatic ||
-               (fn.qualifier.symbol.is(Module) && fn.qualifier.symbol.isStatic) =>
-          args.foreach(_.foreach(checkIfValidArgument))
-
         case NamedArg(_, arg) =>
           checkIfValidArgument(arg)
 

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

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

tests/neg-macros/i4492/quoted_1.scala

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

tests/run-macros/i4492/quoted_2.scala renamed to tests/neg-macros/i4492/quoted_2.scala

@@ -1,7 +1,8 @@
+import scala.quoted._
 class Index[K]
 object Index {
   inline def succ[K](x: K): Unit = ${
-    implicit val t: quoted.Type[K] = Type[K] // error
-    '{new Index[K]}
+    implicit val t: Type[K] = Type[K] // error
+    '{new Index[K]} // error
   }
 }

tests/neg-macros/i4493-b.scala

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

tests/pos-macros/i4493-c.scala renamed to tests/neg-macros/i4493-c.scala

@@ -1,7 +1,8 @@
+import scala.quoted._
 class Index[K]
 object Index {
   inline def succ[K]: Unit = ${
-    implicit val t: quoted.Type[K] = Type[K] // error
-    '{new Index[K]}
+    implicit val t: Type[K] = Type[K] // error
+    '{new Index[K]} // error
   }
 }

tests/neg-macros/i4493.scala

@@ -0,0 +1,9 @@
+import scala.quoted._
+
+object scalatest {
+  inline def assert2(condition: => Boolean): Unit =
+    ${ assertImpl('condition, Expr("")) } // error
+
+  def assertImpl(condition: Expr[Boolean], clue: Expr[Any])(using QuoteContext): Expr[Unit] =
+    '{}
+}

tests/neg-macros/i5547.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
 object Macro {
-  inline def ff[T](x: T): T = ${ impl('x)(Type[T], summon[QuoteContext]) }
+  inline def ff[T](x: T): T = ${ impl('x) }
   def impl[T](x: Expr[T])(implicit t: Type[T], qctx: QuoteContext): Expr[T] = '{ $x: $t }
 }

tests/pos-macros/i4023c/Macro_1.scala

@@ -2,10 +2,7 @@ import scala.quoted._
 
 object scalatest {
   inline def assert1(condition: => Boolean): Unit =
-   ${assertImpl('condition, '{""})}
-
-  inline def assert2(condition: => Boolean): Unit =
-    ${ assertImpl('condition, Expr("")) }
+    ${assertImpl('condition, '{""})}
 
   def assertImpl(condition: Expr[Boolean], clue: Expr[Any])(using QuoteContext): Expr[Unit] =
     '{}

tests/pos-macros/i5547.scala

@@ -4,11 +4,20 @@ import scala.quoted.unsafe._
 
 object Macros {
 
-  inline def liftString(inline a: DSL): String = ${impl(StringNum, 'a)}
+  inline def liftString(inline a: DSL): String = ${implStringNum('a)}
 
-  inline def liftCompute(inline a: DSL): Int = ${impl(ComputeNum, 'a)}
+  private def implStringNum(a: Expr[DSL])(using qctx: QuoteContext): Expr[String] =
+    impl(StringNum, a)
 
-  inline def liftAST(inline a: DSL): ASTNum = ${impl(ASTNum, 'a)}
+  inline def liftCompute(inline a: DSL): Int = ${implComputeNum('a)}
+
+  private def implComputeNum(a: Expr[DSL])(using qctx: QuoteContext): Expr[Int] =
+    impl(ComputeNum, a)
+
+  inline def liftAST(inline a: DSL): ASTNum = ${implASTNum('a)}
+
+  private def implASTNum(a: Expr[DSL])(using qctx: QuoteContext): Expr[ASTNum] =
+    impl(ASTNum, a)
 
   private def impl[T: Type](sym: Symantics[T], a: Expr[DSL])(using qctx: QuoteContext): Expr[T] = {