Less regressive package object fix.

At least I think so.

4 files changed, 26 insertions, 10 deletions

diff --git a/src/compiler/scala/reflect/internal/Symbols.scala b/src/compiler/scala/reflect/internal/Symbols.scala
index 20e4362ae4..c38bb6394f 100644
--- a/src/compiler/scala/reflect/internal/Symbols.scala
+++ b/src/compiler/scala/reflect/internal/Symbols.scala
@@ -2499,17 +2499,13 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     def implicitMembers: List[Symbol] = {
       val tp = info
       if ((implicitMembersCacheKey1 ne tp) || (implicitMembersCacheKey2 ne tp.decls.elems)) {
-        implicitMembersCacheKey1 = tp
-        implicitMembersCacheKey2 = tp.decls.elems
-        // When a package object which defines an implicit, it may turn up here in two
-        // forms which are not recognized as the same implicit definition, creating a
-        // spurious ambiguity (see pos/t3999). Since I haven't figured out package objects
-        // well enough to fix this at the root, I am filtering here by applying the
-        // property that a member's owner must be unique.
-        if (isPackageClass)
-          implicitMembersCacheValue = tp.implicitMembers filter (_.owner eq this)
-        else
+        // Skip a package object class, because the members are also in
+        // the package and we wish to avoid spurious ambiguities as in pos/t3999.
+        if (!isPackageObjectClass) {
+          implicitMembersCacheKey1 = tp
+          implicitMembersCacheKey2 = tp.decls.elems
           implicitMembersCacheValue = tp.implicitMembers
+        }
       }
       implicitMembersCacheValue
     }
diff --git a/test/files/pos/package-implicit/ActorRef.scala b/test/files/pos/package-implicit/ActorRef.scala
new file mode 100644
index 0000000000..e3f93c5e72
--- /dev/null
+++ b/test/files/pos/package-implicit/ActorRef.scala
@@ -0,0 +1,7 @@
+package t1000647.foo
+
+trait ActorRef {
+  def stop(): Unit = {}
+}
+
+trait ScalaActorRef { self: ActorRef => }
\ No newline at end of file
diff --git a/test/files/pos/package-implicit/DataFlow.scala b/test/files/pos/package-implicit/DataFlow.scala
new file mode 100644
index 0000000000..d948280d0d
--- /dev/null
+++ b/test/files/pos/package-implicit/DataFlow.scala
@@ -0,0 +1,7 @@
+package t1000647.bar
+
+import t1000647.foo.{ScalaActorRef}
+
+object DataFlow {
+  def foo(ref: ScalaActorRef) = ref.stop()
+}
diff --git a/test/files/pos/package-implicit/package.scala b/test/files/pos/package-implicit/package.scala
new file mode 100644
index 0000000000..96c4b133f8
--- /dev/null
+++ b/test/files/pos/package-implicit/package.scala
@@ -0,0 +1,6 @@
+package t1000647
+
+package object foo {
+  implicit def scala2ActorRef(ref: ScalaActorRef): ActorRef =
+    ref.asInstanceOf[ActorRef]
+}
\ No newline at end of file