Inline Function1#andThen in the interest of performance

EugeneFlesselle · EugeneFlesselle · commit 5535e13b1183 · 2024-07-02T10:40:07.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala b/compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala
@@ -68,12 +68,12 @@ class TreeTypeMap(
     }
   }
 
-  val mapType: Type => Type =
+  def mapType(tp: Type): Type =
     val substMap = new TypeMap():
       def apply(tp: Type): Type = tp match
         case tp: TermRef if tp.symbol.isImport => mapOver(tp)
         case tp => tp.substSym(substFrom, substTo)
-    typeMap.andThen(substMap).andThen(mapOwnerThis)
+    mapOwnerThis(substMap(typeMap(tp)))
   end mapType
 
   private def updateDecls(prevStats: List[Tree], newStats: List[Tree]): Unit =

Original file line number	Diff line number	Diff line change
`@@ -68,12 +68,12 @@ class TreeTypeMap(`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`- val mapType: Type => Type =`
	`71`	`+ def mapType(tp: Type): Type =`
`72`	`72`	`val substMap = new TypeMap():`
`73`	`73`	`def apply(tp: Type): Type = tp match`
`74`	`74`	`case tp: TermRef if tp.symbol.isImport => mapOver(tp)`
`75`	`75`	`case tp => tp.substSym(substFrom, substTo)`
`76`		`- typeMap.andThen(substMap).andThen(mapOwnerThis)`
	`76`	`+ mapOwnerThis(substMap(typeMap(tp)))`
`77`	`77`	`end mapType`
`78`	`78`
`79`	`79`	`private def updateDecls(prevStats: List[Tree], newStats: List[Tree]): Unit =`