Teach genLoadIf that a () else branch is the same as no else branch.

This avoids generating dead code gotos.
lampepfl · Aug 28, 2018 · 239bd89 · 239bd89
1 parent 011d5c3
commit 239bd89
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala
@@ -202,7 +202,10 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
       val success = new asm.Label
       val failure = new asm.Label
 
-      val hasElse = !elsep.isEmpty
+      val hasElse = !elsep.isEmpty && (elsep match {
+        case Literal(value) if value.tag == UnitTag => false
+	case _ => true
+      })
       val postIf  = if (hasElse) new asm.Label else failure
 
       genCond(condp, success, failure, targetIfNoJump = success)