Revert "SI-3832 Extract tracking of under-construction classes to a mixin"

retronym · retronym · commit 27e41405b185 · 2017-09-12T17:00:31.000+10:00
This reverts commit c2dc346.
diff --git a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala
@@ -202,7 +202,7 @@ abstract class ExplicitOuter extends InfoTransform
    *  values for outer parameters of constructors.
    *  The class provides methods for referencing via outer.
    */
-  abstract class OuterPathTransformer(unit: CompilationUnit) extends TypingTransformer(unit) with UnderConstructionTransformer {
+  abstract class OuterPathTransformer(unit: CompilationUnit) extends TypingTransformer(unit) {
     /** The directly enclosing outer parameter, if we are in a constructor */
     protected var outerParam: Symbol = NoSymbol
 
@@ -267,6 +267,13 @@ abstract class ExplicitOuter extends InfoTransform
       else outerPath(outerSelect(base), from.outerClass, to)
     }
 
+
+    /** The stack of class symbols in which a call to this() or to the super
+      * constructor, or early definition is active
+      */
+    protected def isUnderConstruction(clazz: Symbol) = selfOrSuperCalls contains clazz
+    protected val selfOrSuperCalls = collection.mutable.Stack[Symbol]()
+
     override def transform(tree: Tree): Tree = {
       def sym = tree.symbol
       val savedOuterParam = outerParam
@@ -279,7 +286,13 @@ abstract class ExplicitOuter extends InfoTransform
             assert(outerParam.name startsWith nme.OUTER, outerParam.name)
           case _ =>
         }
-        super.transform(tree)
+        if ((treeInfo isSelfOrSuperConstrCall tree) || (treeInfo isEarlyDef tree)) {
+          selfOrSuperCalls push currentOwner.owner
+          val transformed = super.transform(tree)
+          selfOrSuperCalls.pop()
+          transformed
+        } else
+          super.transform(tree)
       }
       finally outerParam = savedOuterParam
     }
diff --git a/src/reflect/scala/reflect/internal/Trees.scala b/src/reflect/scala/reflect/internal/Trees.scala
@@ -1769,25 +1769,6 @@ trait Trees extends api.Trees {
     }
   }
 
-  /** Tracks the classes currently under construction during a transform */
-  trait UnderConstructionTransformer extends Transformer {
-    import collection.mutable
-
-    protected def isUnderConstruction(clazz: Symbol) = selfOrSuperCalls contains clazz
-
-    /** The stack of class symbols in which a call to this() or to the super
-      * constructor, or early definition is active */
-    private val selfOrSuperCalls = mutable.Stack[Symbol]()
-
-    abstract override def transform(tree: Tree) = {
-      if ((treeInfo isSelfOrSuperConstrCall tree) || (treeInfo isEarlyDef tree)) {
-        selfOrSuperCalls push currentOwner.owner
-        try super.transform(tree)
-        finally selfOrSuperCalls.pop()
-      } else super.transform(tree)
-    }
-  }
-
   def duplicateAndKeepPositions(tree: Tree) = new Duplicator(focusPositions = false) transform tree
 
   // this is necessary to avoid crashes like https://github.com/scalamacros/paradise/issues/1
