diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-24 10:36:56 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-24 15:28:15 +0200 |
| commit | 82dea8af9612ed26ebb01375f369d0c6033662ba (patch) | |
| tree | 20ce280bb9d275190256d66b40c41b13fd43c9c4 | |
| parent | 115eede127ad96f65b5aa3943e7a2334d75c7d6b (diff) | |
| download | scala-82dea8af9612ed26ebb01375f369d0c6033662ba.tar.gz scala-82dea8af9612ed26ebb01375f369d0c6033662ba.tar.bz2 scala-82dea8af9612ed26ebb01375f369d0c6033662ba.zip | |
SI-5930 don't warn about dead code in jump to case
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala | 6 | ||||
| -rw-r--r-- | test/files/pos/t5930.flags | 1 | ||||
| -rw-r--r-- | test/files/pos/t5930.scala | 4 |
3 files changed, 10 insertions, 1 deletions
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) = { diff --git a/test/files/pos/t5930.flags b/test/files/pos/t5930.flags new file mode 100644 index 0000000000..c7d406c649 --- /dev/null +++ b/test/files/pos/t5930.flags @@ -0,0 +1 @@ +-Ywarn-dead-code -Xfatal-warnings
\ No newline at end of file diff --git a/test/files/pos/t5930.scala b/test/files/pos/t5930.scala new file mode 100644 index 0000000000..de9d62cfe8 --- /dev/null +++ b/test/files/pos/t5930.scala @@ -0,0 +1,4 @@ +// should not warn about dead code (`matchEnd(throw new MatchError)`) + class Test { + 0 match { case x: Int => } +}
\ No newline at end of file |