Fixed #2504

Fixed #2517

2 files changed, 36 insertions, 0 deletions

diff --git a/test/files/run/t2236.scala b/test/files/run/t2236.scala
new file mode 100755
index 0000000000..8e2b3900d4
--- /dev/null
+++ b/test/files/run/t2236.scala
@@ -0,0 +1,17 @@
+class T[A](implicit val m:Manifest[A])
+class Foo
+class Bar extends T[Foo]
+object Test extends Application {
+  new Bar
+}
+
+object EvidenceTest {
+  trait E[T]
+  trait A[T] { implicit val e: E[T] = null }
+  class B[T : E] extends A[T] { override val e = null }
+
+  def f[T] {
+    implicit val e: E[T] = null
+    new B[T]{}
+  }
+}
diff --git a/test/files/run/t2503.scala b/test/files/run/t2503.scala
new file mode 100755
index 0000000000..353a1dcac8
--- /dev/null
+++ b/test/files/run/t2503.scala
@@ -0,0 +1,19 @@
+import scala.collection.mutable._
+
+trait SB[A] extends Buffer[A] {
+
+  import collection.Traversable
+
+  abstract override def insertAll(n: Int, iter: Traversable[A]): Unit = synchronized {
+     super.insertAll(n, iter)
+  }
+
+  abstract override def update(n: Int, newelem: A): Unit = synchronized {
+    super.update(n, newelem)
+  }
+}
+
+object Test extends Application {
+  new ArrayBuffer[Int] with SB[Int]
+}
+