Merge pull request #3229 from retronym/ticket/8029

SI-8029 Avoid multi-run cyclic error with companions, package object

3 files changed, 69 insertions, 1 deletions

diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf
index 2ece671638..3b61a02bce 100644
--- a/bincompat-forward.whitelist.conf
+++ b/bincompat-forward.whitelist.conf
@@ -1431,6 +1431,10 @@ filter {
         {
             matchName="scala.reflect.internal.Trees#Modifiers.isDeferredNotDefault"
             problemName=MissingMethodProblem
+        },
+        {
+           matchName="scala.reflect.internal.Symbols#Symbol.rawInfoIsNoType"
+           problemName=MissingMethodProblem
         }
     ]
 }
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala
index b22c706bf4..579f7684fd 100644
--- a/src/reflect/scala/reflect/internal/Symbols.scala
+++ b/src/reflect/scala/reflect/internal/Symbols.scala
@@ -1284,6 +1284,13 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     def hasRawInfo: Boolean = infos ne null
     def hasCompleteInfo = hasRawInfo && rawInfo.isComplete
 
+    // does not run adaptToNewRun, which is prone to trigger cycles (SI-8029)
+    // TODO: give this a better name if you understand the intent of the caller.
+    //       Is it something to do with `reallyExists` or `isStale`?
+    final def rawInfoIsNoType: Boolean = {
+      hasRawInfo && (infos.info eq NoType)
+    }
+
     /** Return info without checking for initialization or completing */
     def rawInfo: Type = {
       var infos = this.infos
@@ -1930,7 +1937,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
 
     /** Is this symbol defined in the same scope and compilation unit as `that` symbol? */
     def isCoDefinedWith(that: Symbol) = (
-         (this.rawInfo ne NoType)
+         !rawInfoIsNoType
       && (this.effectiveOwner == that.effectiveOwner)
       && (   !this.effectiveOwner.isPackageClass
           || (this.sourceFile eq null)
diff --git a/test/files/run/t8029.scala b/test/files/run/t8029.scala
new file mode 100644
index 0000000000..dbd5c41387
--- /dev/null
+++ b/test/files/run/t8029.scala
@@ -0,0 +1,57 @@
+import scala.tools.partest._
+import scala.tools.nsc._
+
+object Test extends DirectTest {
+
+  override def extraSettings: String = "-usejavacp -nowarn -Ystop-after:typer"
+
+  override def code = "" // not used
+
+  def code1 = """
+package object p1 {
+  trait A
+  object A
+}
+  """
+
+  def code2 = """
+package object p2 {
+  class A
+  object A
+}
+  """
+
+  def code3 = """
+package object p3 {
+  object A
+  trait A
+}
+  """
+
+  def code4 = """
+package object p4 {
+  object A
+  trait A
+}
+  """
+
+  def show() {
+    val global = newCompiler()
+    import global._
+    def typecheck(code: String): Unit = {
+      val r = new Run
+      val sourceFile = newSources(code).head
+      global.reporter.reset()
+      r.compileSources(sourceFile :: Nil)
+      assert(!global.reporter.hasErrors)
+    }
+
+    def typecheckTwice(code: String): Unit = {
+      typecheck(code)
+      typecheck(code)
+    }
+
+    // was: illegal cyclic reference involving package ...
+    Seq(code1, code2, code3, code4) foreach typecheckTwice
+  }
+}