Type If and Match in statement position as Unit

This is an alternative fix for scala#5750

Author: allanrenucci

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -728,17 +728,11 @@ class Typer extends Namer
   def typedIf(tree: untpd.If, pt: Type)(implicit ctx: Context): Tree = track("typedIf") {
     if (tree.isInline) checkInInlineContext("inline if", tree.posd)
     val cond1 = typed(tree.cond, defn.BooleanType)
-
-    if (tree.elsep.isEmpty) {
-      val thenp1 = typed(tree.thenp, defn.UnitType)
-      val elsep1 = tpd.unitLiteral.withSpan(tree.span.endPos)
-      cpy.If(tree)(cond1, thenp1, elsep1).withType(defn.UnitType)
-    }
-    else {
-      val thenp1 :: elsep1 :: Nil = harmonic(harmonize, pt)(
-        (tree.thenp :: tree.elsep :: Nil).map(typed(_, pt.notApplied)))
-      assignType(cpy.If(tree)(cond1, thenp1, elsep1), thenp1, elsep1)
+    val thenp1 :: elsep1 :: Nil = harmonic(harmonize, pt) {
+      val elsep = tree.elsep.orElse(untpd.unitLiteral.withSpan(tree.span.endPos))
+      (tree.thenp :: elsep :: Nil).map(typed(_, pt.notApplied))
     }
+    assignType(cpy.If(tree)(cond1, thenp1, elsep1), thenp1, elsep1)
   }
 
   /** Decompose function prototype into a list of parameter prototypes and a result prototype
@@ -2089,7 +2083,15 @@ class Typer extends Namer
       case Thicket(stats) :: rest =>
         traverse(stats ++ rest)
       case stat :: rest =>
-        val stat1 = typed(stat)(ctx.exprContext(stat, exprOwner))
+        val pt = stat match {
+          case _: untpd.If | _: untpd.Match =>
+            // Typing `if` and `match` statement with `Unit` as expected
+            // type produces more efficient code (see #5750).
+            defn.UnitType
+          case _ =>
+            WildcardType
+        }
+        val stat1 = typed(stat, pt)(ctx.exprContext(stat, exprOwner))
         checkStatementPurity(stat1)(stat, exprOwner)
         buf += stat1
         traverse(rest)

compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala

@@ -627,9 +627,12 @@ class TestBCode extends DottyBytecodeTest {
   @Test def i5750 = {
     val source =
       """class Test {
-        |  def foo: String = ""
+        |  def foo(): String = ""
         |  def test(cond: Boolean): Int = {
-        |    if (cond) foo
+        |    if (cond) foo()
+        |    if (cond) () else foo()
+        |    if (cond) foo() else ()
+        |    cond match { case true => foo(); case _ => () }
         |    1
         |  }
         |}

tests/pos-special/isInstanceOf/3324d.scala

@@ -2,7 +2,7 @@ class Test {
   val x: Any = ???
 
   x match {
-    case _: List[Int @unchecked] => 5
-    case _: Option[Int] @unchecked => 5
+    case _: List[Int @unchecked] => ()
+    case _: Option[Int] @unchecked => ()
   }
 }