Merge pull request #3021 from dotty-staging/fix-3018

Fix #3018: use List instead of Map in InlineLocalObjects

Author: OlivierBlanvillain

compiler/src/dotty/tools/dotc/transform/localopt/InlineLocalObjects.scala

@@ -12,6 +12,7 @@ import core.Symbols._
 import core.Flags._
 import ast.Trees._
 import scala.collection.mutable
+import scala.collection.mutable.LinkedHashMap
 import transform.SymUtils._
 import config.Printers.simplify
 import Simplify._
@@ -33,12 +34,12 @@ class InlineLocalObjects(val simplifyPhase: Simplify) extends Optimisation {
   // ValDefs whose lhs is used with `._1` (or any getter call).
   val gettersCalled = mutable.HashSet[Symbol]()
 
-  // Map from class to new fields, initialised between visitor and transformer.
-  var newFieldsMapping: Map[Symbol, Map[Symbol, Symbol]] = null
-  //                   |           |       |
-  //                   |           |       New fields, replacements these getters
-  //                   |           Usages of getters of these classes
-  //                   ValDefs of the classes that are being torn apart; = candidates.intersect(gettersCalled)
+  // Immutable sorted map from class to new fields, initialized between visitor and transformer.
+  var newFieldsMapping: Map[Symbol, LinkedHashMap[Symbol, Symbol]] = null
+  //                          |                     |       |
+  //                          |                     |       New fields, replacements these getters
+  //                          |                     Usages of getters of these classes
+  //                          ValDefs of the classes that are being torn apart; = candidates.intersect(gettersCalled)
 
   def clear(): Unit = {
     candidates.clear()
@@ -57,7 +58,7 @@ class InlineLocalObjects(val simplifyPhase: Simplify) extends Optimisation {
           val info:  Type    = x.asSeenFrom(refVal.info).info.finalResultType.widenDealias
           ctx.newSymbol(owner, name, flags, info)
         }
-        (refVal, accessors.zip(newLocals).toMap)
+        (refVal, LinkedHashMap[Symbol, Symbol](accessors.zip(newLocals): _*))
       }.toMap
     }
 
@@ -99,7 +100,7 @@ class InlineLocalObjects(val simplifyPhase: Simplify) extends Optimisation {
         Thicket(newFieldsDefs :+ recreate)
 
       case t @ Select(rec, _) if isImmutableAccessor(t) =>
-        newFieldsMapping.getOrElse(rec.symbol, Map.empty).get(t.symbol) match {
+        newFieldsMapping.getOrElse(rec.symbol, Map.empty[Symbol, Symbol]).get(t.symbol) match {
           case None         => t
           case Some(newSym) => ref(newSym)
         }
@@ -108,3 +109,4 @@ class InlineLocalObjects(val simplifyPhase: Simplify) extends Optimisation {
     }
   }
 }
+

tests/run/i3018.flags

@@ -0,0 +1 @@
+-optimise

tests/run/i3018.scala

@@ -0,0 +1,24 @@
+class Type
+class Symbol
+
+sealed trait Space
+case object Empty extends Space
+case class Typ(tp: Type, decomposed: Boolean) extends Space
+case class Prod(tp: Type, unappTp: Type, unappSym: Symbol, params: List[Space], full: Boolean) extends Space
+case class Or(spaces: List[Space]) extends Space
+
+object Test {
+  def simplify(space: Space, aggressive: Boolean = false): Space = space match {
+    case Prod(tp, fun, sym, spaces, full) =>
+      val sp = Prod(tp, fun, sym, spaces.map(simplify(_)), full)
+      if (sp.params.contains(Empty)) Empty
+      else sp
+    case Or(spaces) => space
+    case Typ(tp, _) => space
+    case _ => space
+  }
+
+  def main(args: Array[String]): Unit = {
+    simplify(Prod(new Type, new Type, new Symbol, Nil, false))
+  }
+}