Merge branch 'master' into execution-context

Conflicts:
	src/library/scala/package.scala

1 files changed, 14 insertions, 0 deletions

diff --git a/test/files/run/t5415.scala b/test/files/run/t5415.scala
new file mode 100644
index 0000000000..3db356da86
--- /dev/null
+++ b/test/files/run/t5415.scala
@@ -0,0 +1,14 @@
+import scala.tools.nsc.reporters._
+import scala.tools.nsc.Settings
+import scala.reflect.runtime.Mirror.ToolBox
+
+object Test extends App{
+  case class Queryable2[T]() { def filter(predicate: T => Boolean) = ??? }
+  trait CoffeesTable{ def sales : Int }
+  val q = Queryable2[CoffeesTable]()
+  val code = scala.reflect.Code.lift{q.filter(_.sales > 5)}
+
+  val reporter = new ConsoleReporter(new Settings)
+  val toolbox = new ToolBox(reporter)
+  val ttree = toolbox.typeCheck(code.tree)
+}