Fix rebase breakage

odersky · odersky · commit 9e2255c947be · 2020-05-07T16:44:19.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -3081,7 +3081,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
`@@ -3081,7 +3081,7 @@ class Typer extends Namer`
`3081`	`3081`	`checkEqualityEvidence(tree, pt)`
`3082`	`3082`	`tree`
`3083`	`3083`	`}`
`3084`		`- else if (methPart(tree).symbol.isAllOf(Inline \| Deferred) && !ctx.inInlineMethod) then`
	`3084`	`+ else if (methPart(tree).symbol.isAllOf(Inline \| Deferred) && !Inliner.inInlineMethod) then`
`3085`	`3085`	`errorTree(tree, i"Deferred inline ${methPart(tree).symbol.showLocated} cannot be invoked")`
`3086`	`3086`	`else if (Inliner.isInlineable(tree) &&`
`3087`	`3087`	`!ctx.settings.YnoInline.value &&`