Merge commit 'bf599bc' into merge/2.11.x-to-2.12.x-20160203

 Conflicts:
	src/compiler/scala/tools/nsc/backend/opt/ConstantOptimization.scala
	src/compiler/scala/tools/nsc/transform/Constructors.scala
	src/compiler/scala/tools/nsc/typechecker/Contexts.scala
	src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala
	src/scaladoc/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js

1 files changed, 15 insertions, 3 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/patmat/MatchTranslation.scala b/src/compiler/scala/tools/nsc/transform/patmat/MatchTranslation.scala
index 96a20ea631..e12b8548a8 100644
--- a/src/compiler/scala/tools/nsc/transform/patmat/MatchTranslation.scala
+++ b/src/compiler/scala/tools/nsc/transform/patmat/MatchTranslation.scala
@@ -503,14 +503,26 @@ trait MatchTranslation {
        */
       def treeMaker(binder: Symbol, binderKnownNonNull: Boolean, pos: Position): TreeMaker = {
         val paramAccessors = binder.constrParamAccessors
+        val numParams = paramAccessors.length
+        def paramAccessorAt(subPatIndex: Int) = paramAccessors(math.min(subPatIndex, numParams - 1))
         // binders corresponding to mutable fields should be stored (SI-5158, SI-6070)
         // make an exception for classes under the scala package as they should be well-behaved,
         // to optimize matching on List
+        val hasRepeated = paramAccessors.lastOption match {
+          case Some(x) => definitions.isRepeated(x)
+          case _ => false
+        }
         val mutableBinders = (
           if (!binder.info.typeSymbol.hasTransOwner(ScalaPackageClass) &&
-              (paramAccessors exists (_.isMutable)))
-            subPatBinders.zipWithIndex.collect{ case (binder, idx) if paramAccessors(idx).isMutable => binder }
-          else Nil
+              (paramAccessors exists (x => x.isMutable || definitions.isRepeated(x)))) {
+
+            subPatBinders.zipWithIndex.flatMap {
+              case (binder, idx) =>
+                val param = paramAccessorAt(idx)
+                if (param.isMutable || (definitions.isRepeated(param) && !aligner.isStar)) binder :: Nil
+                else Nil
+            }
+          } else Nil
         )
 
         // checks binder ne null before chaining to the next extractor