Merge pull request #3934 from dotty-staging/fix/methodtype-caching

smarter · web-flow · commit 7862aaf4ca56 · 2018-01-29T09:37:23.000+01:00
Restore caching of CachedMethodType
diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -2887,7 +2887,7 @@ object Types {
     }
 
     final def apply(paramNames: List[TermName])(paramInfosExp: MethodType => List[Type], resultTypeExp: MethodType => Type)(implicit ctx: Context): MethodType =
-      checkValid(new CachedMethodType(paramNames)(paramInfosExp, resultTypeExp, self))
+      checkValid(unique(new CachedMethodType(paramNames)(paramInfosExp, resultTypeExp, self)))
 
     def checkValid(mt: MethodType)(implicit ctx: Context): mt.type = {
       if (Config.checkMethodTypes)

Original file line number	Diff line number	Diff line change
`@@ -2887,7 +2887,7 @@ object Types {`
`2887`	`2887`	`}`
`2888`	`2888`
`2889`	`2889`	`final def apply(paramNames: List[TermName])(paramInfosExp: MethodType => List[Type], resultTypeExp: MethodType => Type)(implicit ctx: Context): MethodType =`
`2890`		`- checkValid(new CachedMethodType(paramNames)(paramInfosExp, resultTypeExp, self))`
	`2890`	`+ checkValid(unique(new CachedMethodType(paramNames)(paramInfosExp, resultTypeExp, self)))`
`2891`	`2891`
`2892`	`2892`	`def checkValid(mt: MethodType)(implicit ctx: Context): mt.type = {`
`2893`	`2893`	`if (Config.checkMethodTypes)`