fixed problem in fix to bug783 that causes buil...

fixed problem in fix to bug783 that causes build to fail.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index e2e100b831..cd02cf0e3e 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -336,7 +336,7 @@ trait Typers requires Analyzer {
     }
 
     /** Post-process an identifier or selection node, performing the following:
-     *  (1) Check that non-function pattern expressions and case-factories are stable
+     *  (1) Check that non-function pattern expressions are stable
      *  (2) Check that packages and static modules are not used as values
      *  (3) Turn tree type into stable type if possible and required by context.
      */
@@ -345,8 +345,7 @@ trait Typers requires Analyzer {
         inferExprAlternative(tree, pt)
       val sym = tree.symbol
       if (tree.tpe.isError) tree
-      else if (sym.isCaseFactory ||
-               (mode & (PATTERNmode | FUNmode)) == PATTERNmode && tree.isTerm) { // (1)
+      else if ((mode & (PATTERNmode | FUNmode)) == PATTERNmode && tree.isTerm) { // (1)
         checkStable(tree)
       } else if ((mode & (EXPRmode | QUALmode)) == EXPRmode && !sym.isValue) { // (2)
         errorTree(tree, ""+sym+" is not a value")
@@ -1511,7 +1510,9 @@ trait Typers requires Analyzer {
             case Select(_, _) => copy.Select(tree, qual, name)
             case SelectFromTypeTree(_, _) => copy.SelectFromTypeTree(tree, qual, name)
           }
-          stabilize(checkAccessible(tree1, sym, qual.tpe, qual), qual.tpe, mode, pt)
+          val result = stabilize(checkAccessible(tree1, sym, qual.tpe, qual), qual.tpe, mode, pt)
+          if (sym.isCaseFactory) checkStable(qual)
+          result
         }
       }