Add workarounds to link on strawman

Author: nicolasstucki

collection-strawman

@@ -9,10 +9,13 @@ import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.transform.TreeTransforms._
 
+import scala.collection.immutable.ListSet
+
 /** Loads all potentially reachable trees from tasty. ▲
  *  Only performed on whole world optimization mode. ▲ ▲
  *
  *  TODO: Next step is to only load compilation units reachable in the call graph
+ *  TODO: Use Set instead of ListSet. This is a temporary work around to global fresh names for anonymous classes (i.e. dependent on compilation order).
  */
 class LinkAll extends MiniPhaseTransform {
   import tpd._
@@ -23,24 +26,24 @@ class LinkAll extends MiniPhaseTransform {
   override def prepareForUnit(tree: tpd.Tree)(implicit ctx: Context): TreeTransform = NoTransform
 
   override def runOn(units: List[CompilationUnit])(implicit ctx: Context): List[CompilationUnit] =
-    if (ctx.settings.XlinkOptimise.value) super.runOn(allUnits(Set.empty, units.toSet, Set.empty))
+    if (ctx.settings.XlinkOptimise.value) super.runOn(allUnits(ListSet.empty, units.to, ListSet.empty))
     else super.runOn(units)
 
   /** Loads and processes new compilation units, possibly loading more units. */
-  private def allUnits(processed: Set[CompilationUnit], unprocessed: Set[CompilationUnit], loadedClasses: Set[ClassDenotation])(implicit ctx: Context): List[CompilationUnit] = {
+  private def allUnits(processed: ListSet[CompilationUnit], unprocessed: ListSet[CompilationUnit], loadedClasses: ListSet[ClassDenotation])(implicit ctx: Context): List[CompilationUnit] = {
     if (unprocessed.isEmpty) processed.toList
     else {
       val accum = new ClassesToLoadAccumulator
-      val classesToLoad = unprocessed.foldLeft(Set.empty[ClassDenotation])((acc, unit) => accum.apply(acc, unit.tpdTree)) -- loadedClasses
+      val classesToLoad = unprocessed.foldLeft(ListSet.empty[ClassDenotation])((acc, unit) => accum.apply(acc, unit.tpdTree)) -- loadedClasses
       val loadedUnits = classesToLoad.flatMap(cls => loadCompilationUnit(cls))
       allUnits(processed ++ unprocessed, loadedUnits, loadedClasses ++ classesToLoad)
     }
   }
 
   /** Collects all class denotations that may need to be loaded. */
-  private class ClassesToLoadAccumulator extends TreeAccumulator[Set[ClassDenotation]] {
+  private class ClassesToLoadAccumulator extends TreeAccumulator[ListSet[ClassDenotation]] {
     private var inParents = false
-    override def apply(acc: Set[ClassDenotation], tree: tpd.Tree)(implicit ctx: Context): Set[ClassDenotation] = tree match {
+    override def apply(acc: ListSet[ClassDenotation], tree: tpd.Tree)(implicit ctx: Context): ListSet[ClassDenotation] = tree match {
       case New(tpt) => accum(acc, tpt.tpe.classSymbol)
       case AppliedTypeTree(tpt, _) if inParents => accum(acc, tpt.symbol)
       case tree: RefTree if inParents || tree.symbol.is(Module) =>
@@ -55,7 +58,7 @@ class LinkAll extends MiniPhaseTransform {
     }
 
     /** Accumulate class denotation for `sym` if needed */
-    private def accum(acc: Set[ClassDenotation], sym: Symbol)(implicit ctx: Context): Set[ClassDenotation] = {
+    private def accum(acc: ListSet[ClassDenotation], sym: Symbol)(implicit ctx: Context): ListSet[ClassDenotation] = {
       val topClass = sym.topLevelClass.denot.asClass
       if (topClass.is(JavaDefined) || topClass.is(Scala2x) || topClass.symbol == defn.ObjectClass) acc
       else acc + topClass

compiler/src/dotty/tools/dotc/transform/LinkAll.scala

@@ -56,7 +56,7 @@ object Typer {
 
   /** Assert tree has a position, unless it is empty or a typed splice */
   def assertPositioned(tree: untpd.Tree)(implicit ctx: Context) =
-    if (!tree.isEmpty && !tree.isInstanceOf[untpd.TypedSplice] && ctx.typerState.isGlobalCommittable)
+    if (!tree.isEmpty && !tree.isInstanceOf[untpd.TypedSplice] && ctx.typerState.isGlobalCommittable && !ctx.settings.XlinkOptimise.value) // FIXME: remove XlinkOptimise condition
       assert(tree.pos.exists, s"position not set for $tree # ${tree.uniqueId}")
 
   private val ExprOwner = new Property.Key[Symbol]

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -1,2 +1,272 @@
+MyIterator
 Test
 Test$
+strawman/LowPriority
+strawman/collection/ArrayLike
+strawman/collection/ArrayOps
+strawman/collection/ArrayOps$
+strawman/collection/ArrayView
+strawman/collection/ArrayView$
+strawman/collection/BuildFrom
+strawman/collection/BuildFrom$
+strawman/collection/BuildFrom$$anon$21
+strawman/collection/BuildFrom$$anon$22
+strawman/collection/BuildFromLowPriority
+strawman/collection/BuildFromLowPriority$$anon$13
+strawman/collection/BuildFromLowPriority$$anon$14
+strawman/collection/FromSpecificIterable
+strawman/collection/Hashing
+strawman/collection/Hashing$
+strawman/collection/IndexedSeq
+strawman/collection/IndexedSeq$
+strawman/collection/IndexedSeqOps
+strawman/collection/IndexedSeqOps$$anon$37
+strawman/collection/IndexedView
+strawman/collection/IndexedView$
+strawman/collection/IndexedView$$anon$38
+strawman/collection/IndexedView$Drop
+strawman/collection/IndexedView$DropRight
+strawman/collection/IndexedView$Map
+strawman/collection/IndexedView$Reverse
+strawman/collection/IndexedView$Reverse$
+strawman/collection/IndexedView$Take
+strawman/collection/IndexedView$TakeRight
+strawman/collection/Iterable
+strawman/collection/IterableFactory
+strawman/collection/IterableFactory$
+strawman/collection/IterableFactory$$anon$36
+strawman/collection/IterableFactory$Delegate
+strawman/collection/IterableOnce
+strawman/collection/IterableOps
+strawman/collection/Iterator
+strawman/collection/Iterator$
+strawman/collection/Iterator$$anon$39
+strawman/collection/Iterator$$anon$40
+strawman/collection/Iterator$$anon$40$$anon$41
+strawman/collection/Iterator$$anon$42
+strawman/collection/Iterator$$anon$43
+strawman/collection/Iterator$$anon$44
+strawman/collection/Iterator$$anon$45
+strawman/collection/Iterator$$anon$46
+strawman/collection/Iterator$$anon$47
+strawman/collection/Iterator$$anon$48
+strawman/collection/Iterator$$anon$49
+strawman/collection/Iterator$$anon$50
+strawman/collection/Iterator$$anon$51
+strawman/collection/Iterator$$anon$52
+strawman/collection/Iterator$$anon$53
+strawman/collection/Iterator$$anon$54
+strawman/collection/Iterator$$anon$55
+strawman/collection/Iterator$GroupedIterator
+strawman/collection/LinearSeq
+strawman/collection/LinearSeqOps
+strawman/collection/LinearSeqOps$$anon$12
+strawman/collection/Map
+strawman/collection/Map$
+strawman/collection/MapFactory
+strawman/collection/MapFactory$
+strawman/collection/MapFactory$$anon$19
+strawman/collection/MapFactory$Delegate
+strawman/collection/MapOps
+strawman/collection/Seq
+strawman/collection/SeqOps
+strawman/collection/SeqOps$
+strawman/collection/SeqOps$$anon$26
+strawman/collection/SeqOps$$anon$27
+strawman/collection/SeqOps$$anon$28
+strawman/collection/SeqOps$CombinationsItr
+strawman/collection/SeqOps$PermutationsItr
+strawman/collection/Set
+strawman/collection/Set$
+strawman/collection/SetOps
+strawman/collection/SetOps$$anon$4
+strawman/collection/SetOps$SubsetsItr
+strawman/collection/StrictOptimizedIterableOps
+strawman/collection/StringOps
+strawman/collection/StringOps$
+strawman/collection/StringView
+strawman/collection/StringView$
+strawman/collection/View
+strawman/collection/View$
+strawman/collection/View$$anon$29
+strawman/collection/View$$anon$30
+strawman/collection/View$$anon$31
+strawman/collection/View$$anon$32
+strawman/collection/View$$anon$33
+strawman/collection/View$$anon$34
+strawman/collection/View$$anon$35
+strawman/collection/View$Append
+strawman/collection/View$Append$
+strawman/collection/View$Concat
+strawman/collection/View$Concat$
+strawman/collection/View$Drop
+strawman/collection/View$Drop$
+strawman/collection/View$DropRight
+strawman/collection/View$DropRight$
+strawman/collection/View$DropWhile
+strawman/collection/View$DropWhile$
+strawman/collection/View$Elems
+strawman/collection/View$Elems$
+strawman/collection/View$Empty$
+strawman/collection/View$Fill
+strawman/collection/View$Fill$
+strawman/collection/View$Filter
+strawman/collection/View$Filter$
+strawman/collection/View$FlatMap
+strawman/collection/View$FlatMap$
+strawman/collection/View$Map
+strawman/collection/View$Map$
+strawman/collection/View$PadTo
+strawman/collection/View$PadTo$
+strawman/collection/View$Partition
+strawman/collection/View$Partition$
+strawman/collection/View$Partitioned
+strawman/collection/View$Partitioned$
+strawman/collection/View$Prepend
+strawman/collection/View$Prepend$
+strawman/collection/View$ScanLeft
+strawman/collection/View$ScanLeft$
+strawman/collection/View$Single
+strawman/collection/View$Single$
+strawman/collection/View$Take
+strawman/collection/View$Take$
+strawman/collection/View$TakeRight
+strawman/collection/View$TakeRight$
+strawman/collection/View$TakeWhile
+strawman/collection/View$TakeWhile$
+strawman/collection/View$Unzip
+strawman/collection/View$Unzip$
+strawman/collection/View$Updated
+strawman/collection/View$Updated$
+strawman/collection/View$Zip
+strawman/collection/View$Zip$
+strawman/collection/View$ZipWithIndex
+strawman/collection/View$ZipWithIndex$
+strawman/collection/immutable/$colon$colon
+strawman/collection/immutable/$colon$colon$
+strawman/collection/immutable/HashMap
+strawman/collection/immutable/HashMap$
+strawman/collection/immutable/HashMap$$anon$15
+strawman/collection/immutable/HashMap$$anon$16
+strawman/collection/immutable/HashMap$$anon$17
+strawman/collection/immutable/HashMap$$anon$18
+strawman/collection/immutable/HashMap$EmptyHashMap$
+strawman/collection/immutable/HashMap$HashMap1
+strawman/collection/immutable/HashMap$HashMapCollision1
+strawman/collection/immutable/HashMap$HashTrieMap
+strawman/collection/immutable/HashMap$Merger
+strawman/collection/immutable/HashSet
+strawman/collection/immutable/HashSet$
+strawman/collection/immutable/HashSet$$anon$5
+strawman/collection/immutable/HashSet$$anon$6
+strawman/collection/immutable/HashSet$EmptyHashSet$
+strawman/collection/immutable/HashSet$HashSet1
+strawman/collection/immutable/HashSet$HashSetCollision1
+strawman/collection/immutable/HashSet$HashTrieSet
+strawman/collection/immutable/HashSet$LeafHashSet
+strawman/collection/immutable/ImmutableArray
+strawman/collection/immutable/ImmutableArray$
+strawman/collection/immutable/IndexedSeq
+strawman/collection/immutable/IndexedSeq$
+strawman/collection/immutable/IndexedSeqOps
+strawman/collection/immutable/Iterable
+strawman/collection/immutable/List
+strawman/collection/immutable/List$
+strawman/collection/immutable/ListMap
+strawman/collection/immutable/ListMap$
+strawman/collection/immutable/ListMap$$anon$8
+strawman/collection/immutable/ListMap$EmptyListMap$
+strawman/collection/immutable/ListMap$Node
+strawman/collection/immutable/ListSet
+strawman/collection/immutable/ListSet$
+strawman/collection/immutable/ListSet$$anon$1
+strawman/collection/immutable/ListSet$EmptyListSet$
+strawman/collection/immutable/ListSet$Node
+strawman/collection/immutable/Map
+strawman/collection/immutable/Map$
+strawman/collection/immutable/MapOps
+strawman/collection/immutable/Nil
+strawman/collection/immutable/Nil$
+strawman/collection/immutable/Range
+strawman/collection/immutable/Range$
+strawman/collection/immutable/RangeIterator
+strawman/collection/immutable/Seq
+strawman/collection/immutable/Seq$
+strawman/collection/immutable/SeqOps
+strawman/collection/immutable/Set
+strawman/collection/immutable/Set$
+strawman/collection/immutable/SetOps
+strawman/collection/immutable/TrieIterator
+strawman/collection/immutable/TrieIterator$$anon$7
+strawman/collection/immutable/TrieIterator$DupIterator
+strawman/collection/immutable/Vector
+strawman/collection/immutable/Vector$
+strawman/collection/immutable/Vector$$anon$24
+strawman/collection/immutable/VectorBuilder
+strawman/collection/immutable/VectorIterator
+strawman/collection/immutable/VectorPointer
+strawman/collection/mutable/ArrayBuffer
+strawman/collection/mutable/ArrayBuffer$
+strawman/collection/mutable/ArrayBufferView
+strawman/collection/mutable/Builder
+strawman/collection/mutable/Builder$$anon$25
+strawman/collection/mutable/DefaultEntry
+strawman/collection/mutable/FlatHashTable
+strawman/collection/mutable/FlatHashTable$
+strawman/collection/mutable/FlatHashTable$$anon$2
+strawman/collection/mutable/FlatHashTable$$anon$3
+strawman/collection/mutable/FlatHashTable$Contents
+strawman/collection/mutable/FlatHashTable$HashUtils
+strawman/collection/mutable/FlatHashTable$NullSentinel$
+strawman/collection/mutable/Growable
+strawman/collection/mutable/Growable$
+strawman/collection/mutable/GrowableBuilder
+strawman/collection/mutable/GrowableIterable
+strawman/collection/mutable/GrowableSeq
+strawman/collection/mutable/HashEntry
+strawman/collection/mutable/HashMap
+strawman/collection/mutable/HashMap$
+strawman/collection/mutable/HashMap$$anon$23
+strawman/collection/mutable/HashSet
+strawman/collection/mutable/HashSet$
+strawman/collection/mutable/HashTable
+strawman/collection/mutable/HashTable$
+strawman/collection/mutable/HashTable$$anon$20
+strawman/collection/mutable/HashTable$Contents
+strawman/collection/mutable/HashTable$HashUtils
+strawman/collection/mutable/ImmutableBuilder
+strawman/collection/mutable/IndexedOptimizedGrowableSeq
+strawman/collection/mutable/IndexedOptimizedSeq
+strawman/collection/mutable/Iterable
+strawman/collection/mutable/Iterable$
+strawman/collection/mutable/IterableOps
+strawman/collection/mutable/ListBuffer
+strawman/collection/mutable/ListBuffer$
+strawman/collection/mutable/Map
+strawman/collection/mutable/Map$
+strawman/collection/mutable/MapOps
+strawman/collection/mutable/RefArrayUtils
+strawman/collection/mutable/RefArrayUtils$
+strawman/collection/mutable/ReusableBuilder
+strawman/collection/mutable/Seq
+strawman/collection/mutable/SeqOps
+strawman/collection/mutable/Set
+strawman/collection/mutable/Set$
+strawman/collection/mutable/SetOps
+strawman/collection/mutable/Shrinkable
+strawman/collection/mutable/StringBuilder
+strawman/collection/package
+strawman/collection/package$
+strawman/collection/package$$anon$10
+strawman/collection/package$$anon$11
+strawman/collection/package$$anon$9
+strawman/collection/package$$anonfun$3
+strawman/collection/package$DebugUtils$
+strawman/collection/package$toNewIterator
+strawman/collection/package$toNewIterator$
+strawman/collection/package$toNewSeq
+strawman/collection/package$toNewSeq$
+strawman/collection/package$toOldIterator
+strawman/collection/package$toOldIterator$
+strawman/collection/package$toOldSeq
+strawman/collection/package$toOldSeq$

tests/link/strawman/iterator-1.classcheck

@@ -2,16 +2,13 @@ import strawman.collection.Iterator
 
 object Test {
   def main(args: Array[String]): Unit = {
-    // FIXME: issue loading package object
-//    val it = new MyIterator
-//    println(it.hasNext)
-//    println(it.next())
-    println(true)
-    println(3)
+    val it = new MyIterator
+    println(it.hasNext)
+    println(it.next())
   }
 }
 
-//class MyIterator extends Iterator[Int] {
-//  override def hasNext: Boolean = true
-//  override def next(): Int = 3
-//}
+class MyIterator extends Iterator[Int] {
+  override def hasNext: Boolean = true
+  override def next(): Int = 3
+}