Merge branch '2.10.x' into topic/merge-v2.10.2-RC1-35-ga54d86b-to-master

Conflicts:
	src/partest/scala/tools/partest/DirectTest.scala

1 files changed, 16 insertions, 0 deletions

diff --git a/test/files/pos/t7505.scala b/test/files/pos/t7505.scala
new file mode 100644
index 0000000000..3e1e6ab8b4
--- /dev/null
+++ b/test/files/pos/t7505.scala
@@ -0,0 +1,16 @@
+import scala.language.reflectiveCalls
+
+case class ContextProperty(value: Any) {
+  type HasToInt = { def toInt:Int }
+
+  def toInt: Int = value match {
+    case n: HasToInt => n.toInt
+  }
+}
+
+// was:
+// error:7: error during expansion of this match (this is a scalac bug).
+// The underlying error was: type mismatch;
+//  found   : Boolean(true)
+//  required: AnyRef
+//   def toInt: Int = value match {
\ No newline at end of file