Skip to content

Commit c82fa8c

Browse files
authored
Merge pull request #4082 from gzm0/cleanup
Inline ClassCache management
2 parents cd8065f + f1ef1c9 commit c82fa8c

File tree

1 file changed

+6
-11
lines changed
  • linker/shared/src/main/scala/org/scalajs/linker/backend/emitter

1 file changed

+6
-11
lines changed

linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/Emitter.scala

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,12 @@ final class Emitter(config: Emitter.Config) {
335335

336336
private def genClass(linkedClass: LinkedClass): GeneratedClass = {
337337
val className = linkedClass.className
338-
val classCache = getClassCache(linkedClass.ancestors)
339-
val classTreeCache = classCache.getCache(linkedClass.version)
338+
339+
val classCache =
340+
classCaches.getOrElseUpdate(linkedClass.ancestors, new ClassCache)
341+
val classTreeCache =
342+
classCache.getCache(linkedClass.version)
343+
340344
val kind = linkedClass.kind
341345

342346
// Global ref management
@@ -513,9 +517,6 @@ final class Emitter(config: Emitter.Config) {
513517
val staticFields = if (linkedClass.kind.isJSType) {
514518
Nil
515519
} else {
516-
val classCache = getClassCache(linkedClass.ancestors)
517-
val classTreeCache = classCache.getCache(linkedClass.version)
518-
519520
classTreeCache.staticFields.getOrElseUpdate(
520521
classEmitter.genCreateStaticFieldsOfScalaClass(linkedClass)(classCache))
521522
}
@@ -557,12 +558,6 @@ final class Emitter(config: Emitter.Config) {
557558
v1.flatMap(s1 => v2.map(s2 => "" + s1.length + "-" + s1 + s2))
558559
}
559560

560-
private def getClassTreeCache(linkedClass: LinkedClass): DesugaredClassCache =
561-
getClassCache(linkedClass.ancestors).getCache(linkedClass.version)
562-
563-
private def getClassCache(ancestors: List[ClassName]) =
564-
classCaches.getOrElseUpdate(ancestors, new ClassCache)
565-
566561
// Caching
567562

568563
private final class ClassCache extends knowledgeGuardian.KnowledgeAccessor {

0 commit comments

Comments
 (0)