Merge pull request #2859 from som-snytt/issue/7622-phaser

SI-7622 Clean Up Phase Assembly

1 files changed, 6 insertions, 3 deletions

diff --git a/src/reflect/scala/reflect/internal/Phase.scala b/src/reflect/scala/reflect/internal/Phase.scala
index 450c90ed56..1ecc202a07 100644
--- a/src/reflect/scala/reflect/internal/Phase.scala
+++ b/src/reflect/scala/reflect/internal/Phase.scala
@@ -26,11 +26,14 @@ abstract class Phase(val prev: Phase) {
   )
   def flagMask: Long = fmask
 
-  private var nx: Phase = this
+  private var nx: Phase = NoPhase
 
-  def next: Phase = nx
+  // does anyone rely on next == this for terminus?
+  def next: Phase = if (nx eq NoPhase) this else nx
   def hasNext = next != this
-  def iterator = Iterator.iterate(this)(_.next) takeWhile (p => p.next != p)
+  // this definition excludes the terminal phase
+  //def iterator = Iterator.iterate(this)(_.nx) takeWhile (p => p.next != p)
+  def iterator = Iterator.iterate(this)(_.nx) takeWhile (_ ne NoPhase)
 
   def name: String
   def description: String = name