Merge pull request #8057 from rssh/fix-inlined-apply-allow

nicolasstucki · web-flow · commit 385d698e111e · 2020-01-23T12:07:25.000+01:00
Fix #8029
diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala
@@ -42,7 +42,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
     Super(qual, if (mixName.isEmpty) untpd.EmptyTypeIdent else untpd.Ident(mixName), inConstrCall, mixinClass)
 
   def Apply(fn: Tree, args: List[Tree])(implicit ctx: Context): Apply = {
-    assert(fn.isInstanceOf[RefTree] || fn.isInstanceOf[GenericApply[_]])
+    assert(fn.isInstanceOf[RefTree] || fn.isInstanceOf[GenericApply[_]] || fn.isInstanceOf[Inlined])
     ta.assignType(untpd.Apply(fn, args), fn, args)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {`
`42`	`42`	`Super(qual, if (mixName.isEmpty) untpd.EmptyTypeIdent else untpd.Ident(mixName), inConstrCall, mixinClass)`
`43`	`43`
`44`	`44`	`def Apply(fn: Tree, args: List[Tree])(implicit ctx: Context): Apply = {`
`45`		`- assert(fn.isInstanceOf[RefTree] \|\| fn.isInstanceOf[GenericApply[_]])`
	`45`	`+ assert(fn.isInstanceOf[RefTree] \|\| fn.isInstanceOf[GenericApply[_]] \|\| fn.isInstanceOf[Inlined])`
`46`	`46`	`ta.assignType(untpd.Apply(fn, args), fn, args)`
`47`	`47`	`}`
`48`	`48`