diff options
| author | Paul Phillips <paulp@improving.org> | 2009-09-25 19:17:20 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2009-09-25 19:17:20 +0000 |
| commit | 0c50ba867782ce737b99f1f108103b7ba53a1a50 (patch) | |
| tree | 99692218926be876b4b6e5b4adcb3bd3c194d324 /src | |
| parent | 4a727f3b01d0fa27ef51f7dba472116e021e3445 (diff) | |
| download | scala-0c50ba867782ce737b99f1f108103b7ba53a1a50.tar.gz scala-0c50ba867782ce737b99f1f108103b7ba53a1a50.tar.bz2 scala-0c50ba867782ce737b99f1f108103b7ba53a1a50.zip | |
Reverted r18215 at martin's request.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/matching/ParallelMatching.scala | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala index 3278e4508b..941777c030 100644 --- a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala +++ b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala @@ -1239,10 +1239,7 @@ trait ParallelMatching extends ast.TreeDSL { case v @ Constant(null) if isAnyRef(scrutTree.tpe) => scrutTree ANY_EQ NULL case v => scrutTree ANY_== Literal(v) } - case _: SingletonType if useEqTest => - // See ticket #1503 for why both these checks are necessary. - (REF(tpe.termSymbol) ANY_== scrutTree) AND (scrutTree IS tpe.widen) - + case _: SingletonType if useEqTest => REF(tpe.termSymbol) ANY_== scrutTree case _ if scrutTree.tpe <:< tpe && isAnyRef(tpe) => scrutTree OBJ_!= NULL case _ => scrutTree IS tpe }) |