Do not use invalidationResults to compute next invalidations

internal/zinc-core/src/main/scala/sbt/internal/inc/Incremental.scala

@@ -1090,14 +1090,14 @@ private final class AnalysisCallback(
 
   override def dependencyPhaseCompleted(): Unit = {
     val incHandler = incHandlerOpt.getOrElse(sys.error("incHandler was expected"))
-    if (invalidationResults.isEmpty) {
+    if (earlyOutput.isDefined && invalidationResults.isEmpty) {
       val a = getAnalysis
       val CompileCycleResult(continue, invalidations, merged) =
         incHandler.mergeAndInvalidate(a, false)
       // Store invalidations and continuation decision; the analysis will be computed again after Analyze phase.
       invalidationResults = Some(CompileCycleResult(continue, invalidations, Analysis.empty))
       // If there will be no more compilation cycles, store the early analysis file and update the pickle jar
-      if (earlyOutput.isDefined && !continue && lookup.shouldDoEarlyOutput(merged)) {
+      if (!continue && lookup.shouldDoEarlyOutput(merged)) {
         writeEarlyArtifacts(merged)
       }
     }

zinc/src/sbt-test/source-dependencies/cyclic-dependency/A.scala

@@ -0,0 +1,13 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
+class A() extends ABase()
+

zinc/src/sbt-test/source-dependencies/cyclic-dependency/ABase.java

@@ -0,0 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
+public abstract class ABase {
+    H h;
+}

zinc/src/sbt-test/source-dependencies/cyclic-dependency/H.scala

@@ -0,0 +1,12 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
+class H() extends HBase()

zinc/src/sbt-test/source-dependencies/cyclic-dependency/HBase.java

@@ -0,0 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
+public abstract class HBase {
+    A a;
+}

zinc/src/sbt-test/source-dependencies/cyclic-dependency/changes/A.scala

@@ -0,0 +1,16 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
+class A() extends ABase()
+
+
+
+// random placeholder change

zinc/src/sbt-test/source-dependencies/cyclic-dependency/changes/ABase.java

@@ -0,0 +1,16 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
+public abstract class ABase {
+    H h;
+}
+
+// Random changes to force recompilation

zinc/src/sbt-test/source-dependencies/cyclic-dependency/incOptions.properties

@@ -0,0 +1 @@
+pipelining = false

zinc/src/sbt-test/source-dependencies/cyclic-dependency/test

@@ -0,0 +1,6 @@
+> compile
+
+$ copy-file changes/ABase.java ABase.java
+$ copy-file changes/A.scala A.scala
+
+> checkIterations 2