Harden tpd.Apply/TypeApply in case of errors (#16887)

Harden tpd.Apply/TypeApply in case of errors to accept non-sensical terms as functions. Fixes #16861
scala · Feb 16, 2023 · 9b8db9f · 9b8db9f
2 parents 2421437 + d6ee51e
commit 9b8db9f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala
@@ -47,12 +47,18 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
       Apply(expr, args)
     case _: RefTree | _: GenericApply | _: Inlined | _: Hole =>
       ta.assignType(untpd.Apply(fn, args), fn, args)
+    case _ =>
+      assert(ctx.reporter.errorsReported)
+      ta.assignType(untpd.Apply(fn, args), fn, args)
 
   def TypeApply(fn: Tree, args: List[Tree])(using Context): TypeApply = fn match
     case Block(Nil, expr) =>
       TypeApply(expr, args)
     case _: RefTree | _: GenericApply =>
       ta.assignType(untpd.TypeApply(fn, args), fn, args)
+    case _ =>
+      assert(ctx.reporter.errorsReported)
+      ta.assignType(untpd.TypeApply(fn, args), fn, args)
 
   def Literal(const: Constant)(using Context): Literal =
     ta.assignType(untpd.Literal(const))

diff --git a/tests/neg/i16861.scala b/tests/neg/i16861.scala
@@ -0,0 +1,2 @@
+given foo[T]: Any = summon[bar] // error
+def bar: Nothing = ???
diff --git a/tests/neg/i16861a.scala b/tests/neg/i16861a.scala
@@ -0,0 +1,4 @@
+import scala.quoted.*
+trait Foo
+object Foo:
+  inline given foo[T <: Foo]: T = summon[Type.of[T]] // error
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		given foo[T]: Any = summon[bar] // error
		def bar: Nothing = ???