Merge pull request #2590 from paulp/issue/7486

SI-7486 Regressions in implicit search.

3 files changed, 21 insertions, 0 deletions

diff --git a/test/pending/neg/t7441.check b/test/pending/neg/t7441.check
new file mode 100644
index 0000000000..f259457197
--- /dev/null
+++ b/test/pending/neg/t7441.check
@@ -0,0 +1,6 @@
+t7441.scala:4: error: type mismatch;
+ found   : Int(1)
+ required: List[Any]
+    def test = apply(1)
+                     ^
+one error found
diff --git a/test/pending/neg/t7441.scala b/test/pending/neg/t7441.scala
new file mode 100644
index 0000000000..dad7421e3f
--- /dev/null
+++ b/test/pending/neg/t7441.scala
@@ -0,0 +1,7 @@
+object Test {
+  object Bar {
+    def apply(xs: List[Any]): Int = 0
+    def test = apply(1)
+  }
+  implicit def foo = 1
+}
diff --git a/test/pending/pos/t7486.scala b/test/pending/pos/t7486.scala
new file mode 100644
index 0000000000..6dd7f4c4ac
--- /dev/null
+++ b/test/pending/pos/t7486.scala
@@ -0,0 +1,8 @@
+object Test{
+  var locker = 0
+  // remove implicit, or change to `locker = locker + 1` to make it compile.
+  implicit val davyJones0 = {
+    locker += 0
+    0
+  }
+}