From 82dea8af9612ed26ebb01375f369d0c6033662ba Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@epfl.ch>
Date: Tue, 24 Jul 2012 10:36:56 +0200
Subject: SI-5930 don't warn about dead code in jump to case

---
 src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala b/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala
index 38c2c5f719..74c51ece9f 100644
--- a/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala
@@ -401,7 +401,11 @@ trait TypeDiagnostics {
 
     object checkDead {
       private var expr: Symbol = NoSymbol
-      private def exprOK = expr != Object_synchronized
+
+      private def exprOK =
+        (expr != Object_synchronized) &&
+        !(expr.isLabel && treeInfo.isSynthCaseSymbol(expr)) // it's okay to jump to matchEnd (or another case) with an argument of type nothing
+
       private def treeOK(tree: Tree) = tree.tpe != null && tree.tpe.typeSymbol == NothingClass
 
       def updateExpr(fn: Tree) = {
-- 
cgit v1.2.3