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

3 files changed, 66 insertions, 0 deletions

diff --git a/test/files/run/t9567.scala b/test/files/run/t9567.scala
new file mode 100644
index 0000000000..69896b8650
--- /dev/null
+++ b/test/files/run/t9567.scala
@@ -0,0 +1,18 @@
+object Test {
+  def testMethodLocalCaseClass {
+    case class MethodLocalWide(
+                                f01: Int, f02: Int, f03: Int, f04: Int, f05: Int, f06: Int, f07: Int, f08: Int, f09: Int, f10: Int,
+                                f11: Int, f12: Int, f13: Int, f14: Int, f15: Int, f16: Int, f17: Int, f18: Int, f19: Int, f20: Int,
+                                f21: Int, f22: Int, f23: Int)
+
+    val instance = MethodLocalWide(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    val result = instance match {
+      case MethodLocalWide(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) => true
+      case _ => false
+    }
+    assert(result)
+  }
+  def main(args: Array[String]) {
+    testMethodLocalCaseClass
+  }
+}
diff --git a/test/files/run/t9567b.scala b/test/files/run/t9567b.scala
new file mode 100644
index 0000000000..88cef0a60e
--- /dev/null
+++ b/test/files/run/t9567b.scala
@@ -0,0 +1,19 @@
+object Test {
+  def testMethodLocalCaseClass {
+    object MethodLocalWide
+    case class MethodLocalWide(
+                                f01: Int, f02: Int, f03: Int, f04: Int, f05: Int, f06: Int, f07: Int, f08: Int, f09: Int, f10: Int,
+                                f11: Int, f12: Int, f13: Int, f14: Int, f15: Int, f16: Int, f17: Int, f18: Int, f19: Int, f20: Int,
+                                f21: Int, f22: Int, f23: Int)
+
+    val instance = MethodLocalWide(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    val result = instance match {
+      case MethodLocalWide(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) => true
+      case _ => false
+    }
+    assert(result)
+  }
+  def main(args: Array[String]) {
+    testMethodLocalCaseClass
+  }
+}
diff --git a/test/files/run/t9567c.scala b/test/files/run/t9567c.scala
new file mode 100644
index 0000000000..560bea8821
--- /dev/null
+++ b/test/files/run/t9567c.scala
@@ -0,0 +1,29 @@
+case class CaseSequenceTopLevel(as: Int*)
+
+object Test {
+   def main(args: Array[String]): Unit = {
+
+    val buffer1 = collection.mutable.Buffer(0, 0)
+    CaseSequenceTopLevel(buffer1: _*) match {
+      case CaseSequenceTopLevel(_, i) =>
+        buffer1(1) = 1
+        assert(i == 0, i) // fails in 2.11.7 -optimize
+    }
+
+    case class CaseSequence(as: Int*)
+    val buffer2 = collection.mutable.Buffer(0, 0)
+    CaseSequence(buffer2: _*) match {
+      case CaseSequence(_, i) =>
+        buffer2(1) = 1
+        assert(i == 0, i)
+    }
+
+    case class CaseSequenceWithVar(var x: Any, as: Int*)
+    val buffer3 = collection.mutable.Buffer(0, 0)
+    CaseSequenceWithVar("", buffer3: _*) match {
+      case CaseSequenceWithVar(_, _, i) => // crashes in 2.11.7
+        buffer2(1) = 1
+        assert(i == 0, i)
+    }
+  }
+}