File tree Expand file tree Collapse file tree 3 files changed +4
-2
lines changed
compiler/src/dotty/tools/dotc Expand file tree Collapse file tree 3 files changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -314,7 +314,7 @@ class SpaceEngine(implicit ctx: Context) extends SpaceLogic {
314314 // Precondition: !isSubType(tp1, tp2) && !isSubType(tp2, tp1).
315315 if (! ctx.explicitNulls && (tp1.isNullType || tp2.isNullType)) {
316316 // Since projections of types don't include null, intersection with null is empty.
317- return Empty
317+ Empty
318318 }
319319 else {
320320 val res = ctx.typeComparer.provablyDisjoint(tp1, tp2)
Original file line number Diff line number Diff line change @@ -2832,7 +2832,8 @@ class Typer extends Namer
28322832 tree.tpe <:< wildApprox(pt)
28332833 val errorCount = ctx.reporter.errorCount
28342834 val inlined = Inliner .inlineCall(tree)
2835- if (errorCount == ctx.reporter.errorCount) readaptSimplified(inlined) else inlined
2835+ if ((inlined ne tree) && errorCount == ctx.reporter.errorCount) readaptSimplified(inlined)
2836+ else inlined
28362837 }
28372838 else if (tree.symbol.isScala2Macro &&
28382839 // raw and s are eliminated by the StringInterpolatorOpt phase
Original file line number Diff line number Diff line change 1+ def f : Int = implicitly : Int // error
You can’t perform that action at this time.
0 commit comments