Patch from paulp to tidy up MixLiterals.getDefa...

Patch from paulp to tidy up MixLiterals.getDefaultRows.

1 files changed, 3 insertions, 12 deletions

diff --git a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
index 4def968e7b..c3c6f15edc 100644
--- a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
+++ b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
@@ -303,19 +303,10 @@ trait ParallelMatching  {
     protected override def haveDefault: Boolean = !defaultIndexSet.isEmpty
 
     override def getDefaultRows: List[Row] = {
-      if (theDefaultRows ne null)
-        return theDefaultRows
+      if (theDefaultRows eq null)
+        theDefaultRows = defaultIndexSet.filter(defaultIndexSet(_)).toList.reverseMap(grabRow)
 
-      var ix = defaultIndexSet.capacity;
-      var res:List[Row] = Nil
-      while((ix >= 0) && !defaultIndexSet(ix)) { ix = ix - 1 }
-      while(ix >= 0) {
-        res = grabRow(ix) :: res
-        ix = ix - 1
-        while((ix >= 0) && !defaultIndexSet(ix)) { ix = ix - 1 }
-      }
-      theDefaultRows = res
-      res
+      theDefaultRows
     }
 
     var varMap: List[(Int,List[Symbol])] = Nil