Fix rebase breakage

odersky · odersky · commit f2f082defecd · 2020-05-09T20:11:56.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -3083,7 +3083,7 @@ class Typer extends Namer
         checkEqualityEvidence(tree, pt)
         tree
       }
-      else if (methPart(tree).symbol.isAllOf(Inline | Deferred) && !ctx.inInlineMethod) then
+      else if (methPart(tree).symbol.isAllOf(Inline | Deferred) && !Inliner.inInlineMethod) then
         errorTree(tree, i"Deferred inline ${methPart(tree).symbol.showLocated} cannot be invoked")
       else if (Inliner.isInlineable(tree) &&
                !ctx.settings.YnoInline.value &&

Original file line number	Diff line number	Diff line change
`@@ -3083,7 +3083,7 @@ class Typer extends Namer`
`3083`	`3083`	`checkEqualityEvidence(tree, pt)`
`3084`	`3084`	`tree`
`3085`	`3085`	`}`
`3086`		`- else if (methPart(tree).symbol.isAllOf(Inline \| Deferred) && !ctx.inInlineMethod) then`
	`3086`	`+ else if (methPart(tree).symbol.isAllOf(Inline \| Deferred) && !Inliner.inInlineMethod) then`
`3087`	`3087`	`errorTree(tree, i"Deferred inline ${methPart(tree).symbol.showLocated} cannot be invoked")`
`3088`	`3088`	`else if (Inliner.isInlineable(tree) &&`
`3089`	`3089`	`!ctx.settings.YnoInline.value &&`