Merge pull request #1700 from retronym/ticket/6535

SI-6535 Step back from the precipice of a cycle

2 files changed, 21 insertions, 0 deletions

diff --git a/test/files/neg/t6535.check b/test/files/neg/t6535.check
new file mode 100644
index 0000000000..1225ea70db
--- /dev/null
+++ b/test/files/neg/t6535.check
@@ -0,0 +1,6 @@
+t6535.scala:2: error: encountered unrecoverable cycle resolving import.
+Note: this is often due in part to a class depending on a definition nested within its companion.
+If applicable, you may wish to try moving some members into another object.
+  import Bs.B._
+            ^
+one error found
diff --git a/test/files/neg/t6535.scala b/test/files/neg/t6535.scala
new file mode 100644
index 0000000000..30a750311c
--- /dev/null
+++ b/test/files/neg/t6535.scala
@@ -0,0 +1,15 @@
+object As {
+  import Bs.B._
+
+  object A
+  extends scala.AnyRef // needed for the cycle;
+                       // replacing with a locally defined closs doesn't
+                       // hit the locked import and hence doesn't cycle.
+}
+
+object Bs {
+  import As.A._
+
+  object B
+  extends scala.AnyRef // scala.Immutable, ...
+}