From 115eede127ad96f65b5aa3943e7a2334d75c7d6b Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Tue, 24 Jul 2012 10:13:22 +0200 Subject: SI-5897 don't check sensicality in match the pattern matching analysis should be more precise anyway (don't warn twice) --- test/files/pos/t5897.flags | 1 + test/files/pos/t5897.scala | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 test/files/pos/t5897.flags create mode 100644 test/files/pos/t5897.scala (limited to 'test') diff --git a/test/files/pos/t5897.flags b/test/files/pos/t5897.flags new file mode 100644 index 0000000000..e8fb65d50c --- /dev/null +++ b/test/files/pos/t5897.flags @@ -0,0 +1 @@ +-Xfatal-warnings \ No newline at end of file diff --git a/test/files/pos/t5897.scala b/test/files/pos/t5897.scala new file mode 100644 index 0000000000..2e9751afe0 --- /dev/null +++ b/test/files/pos/t5897.scala @@ -0,0 +1,6 @@ +// no warning here +// (strangely, if there's an unreachable code warning *anywhere in this compilation unit*, +// the non-sensical warning goes away under -Xfatal-warnings) +class Test { + () match { case () => } +} -- cgit v1.2.3 From 82dea8af9612ed26ebb01375f369d0c6033662ba Mon Sep 17 00:00:00 2001 From: Adriaan Moors 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 +++++- test/files/pos/t5930.flags | 1 + test/files/pos/t5930.scala | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 test/files/pos/t5930.flags create mode 100644 test/files/pos/t5930.scala (limited to 'test') 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 -- cgit v1.2.3