8 files changed, 51 insertions, 6 deletions
diff --git a/test/files/neg/names-defaults-neg.check b/test/files/neg/names-defaults-neg.check
index 8a6aafd67a..875bc2ade0 100644
--- a/test/files/neg/names-defaults-neg.check
+++ b/test/files/neg/names-defaults-neg.check
@@ -130,7 +130,7 @@ names-defaults-neg.scala:102: error: unknown parameter name: m
 names-defaults-neg.scala:135: error: reference to var2 is ambiguous; it is both a method parameter and a variable in scope.
   delay(var2 = 40)
              ^
-names-defaults-neg.scala:138: error: missing parameter type for expanded function ((x$1) => a = x$1)
+names-defaults-neg.scala:138: error: missing parameter type for expanded function ((x$1: <error>) => a = x$1)
   val taf2: Int => Unit = testAnnFun(a = _, b = get("+"))
                                          ^
 names-defaults-neg.scala:138: error: not found: value a
@@ -142,10 +142,10 @@ names-defaults-neg.scala:138: error: not found: value get
 names-defaults-neg.scala:139: error: parameter 'a' is already specified at parameter position 1
   val taf3 = testAnnFun(b = _: String, a = get(8))
                                          ^
-names-defaults-neg.scala:140: error: missing parameter type for expanded function ((x$3) => testAnnFun(x$3, ((x$4) => b = x$4)))
+names-defaults-neg.scala:140: error: missing parameter type for expanded function ((x$3: <error>) => testAnnFun(x$3, ((x$4) => b = x$4)))
   val taf4: (Int, String) => Unit = testAnnFun(_, b = _)
                                                ^
-names-defaults-neg.scala:140: error: missing parameter type for expanded function ((x$4) => b = x$4)
+names-defaults-neg.scala:140: error: missing parameter type for expanded function ((x$4: <error>) => b = x$4)
   val taf4: (Int, String) => Unit = testAnnFun(_, b = _)
                                                       ^
 names-defaults-neg.scala:140: error: not found: value b
diff --git a/test/files/neg/sammy_error_exist_no_crash.check b/test/files/neg/sammy_error_exist_no_crash.check
index a0d2237ce0..944b6471fd 100644
--- a/test/files/neg/sammy_error_exist_no_crash.check
+++ b/test/files/neg/sammy_error_exist_no_crash.check
@@ -1,6 +1,4 @@
-sammy_error_exist_no_crash.scala:5: error: Could not derive subclass of F[? >: String]
- (with SAM `def method apply(s: String)Int`)
- based on: ((x$1: String) => x$1.<parseInt: error>).
+sammy_error_exist_no_crash.scala:5: error: value parseInt is not a member of String
   bar(_.parseInt)
         ^
 one error found
diff --git a/test/files/pos/sam_ctor_arg.scala b/test/files/pos/sam_ctor_arg.scala
new file mode 100644
index 0000000000..3c556d59f0
--- /dev/null
+++ b/test/files/pos/sam_ctor_arg.scala
@@ -0,0 +1,4 @@
+trait Fun[A, B] { def apply(a: A): B }
+// can't do sam expansion until the sam body def is a static method in the sam class, and not a local method in a block'
+class C(f: Fun[Int, String])
+class Test extends C(s => "a")
+\ No newline at end of file
diff --git a/test/files/pos/sam_infer_argtype_subtypes.scala b/test/files/pos/sam_infer_argtype_subtypes.scala
new file mode 100644
index 0000000000..63966f879e
--- /dev/null
+++ b/test/files/pos/sam_infer_argtype_subtypes.scala
@@ -0,0 +1,6 @@
+trait Fun[A, B] { def apply(a: A): B }
+
+class SamInferResult {
+  def foreach[U](f: Fun[String, U]): U = ???
+  def foo = foreach(println)
+}
+\ No newline at end of file
diff --git a/test/files/pos/sam_inferargs.scala b/test/files/pos/sam_inferargs.scala
new file mode 100644
index 0000000000..10d9b4f0dd
--- /dev/null
+++ b/test/files/pos/sam_inferargs.scala
@@ -0,0 +1,6 @@
+trait Proc { def apply(): Unit }
+class Test {
+  val initCode = List[Proc]()
+  initCode foreach { proc => proc() }
+
+}
diff --git a/test/files/pos/sammy_implicit.scala b/test/files/pos/sammy_implicit.scala
new file mode 100644
index 0000000000..c9c2519bab
--- /dev/null
+++ b/test/files/pos/sammy_implicit.scala
@@ -0,0 +1,10 @@
+abstract class SamImplicitConvert {
+  trait Fun[A, B] { def apply(a: A): B }
+  class Lst[T]
+  abstract class Str { def getBytes: Array[Int] }
+  def flatMap[B](f: Fun[Str, Lst[B]]): List[B] = ???
+
+  implicit def conv(xs: Array[Int]): Lst[Int]
+
+  val encoded = flatMap (_.getBytes)
+}
diff --git a/test/files/pos/t8429.scala b/test/files/pos/t8429.scala
new file mode 100644
index 0000000000..a2d32637e1
--- /dev/null
+++ b/test/files/pos/t8429.scala
@@ -0,0 +1,7 @@
+trait Must {  def musta(str: String, i: Int): Unit }
+
+object Mustare {
+  def takesM(m: Must) = ???
+  takesM{ (a, b) => println } // ok
+  takesM{ case (a: String, b: Int) => println("") } // should also be accepted
+}
diff --git a/test/files/run/sam_return.scala b/test/files/run/sam_return.scala
new file mode 100644
index 0000000000..e959619dd1
--- /dev/null
+++ b/test/files/run/sam_return.scala
@@ -0,0 +1,14 @@
+trait Fun[A, B] { def apply(a: A): B }
+class PF[A, B] { def runWith[U](action: Fun[B, U]): Fun[A, Boolean] = a => {action(a.asInstanceOf[B]); true} }
+
+class TO[A](x: A) {
+  def foreach[U](f: Fun[A, U]): U = f(x)
+  def collectFirst[B](pf: PF[A, B]): Option[B] = {
+    foreach(pf.runWith(b => return Some(b)))
+    None
+  }
+}
+
+object Test extends App {
+  assert(new TO("a").collectFirst(new PF[String, String]).get == "a")
+}
+\ No newline at end of file