Do not abuse a block to group instance tests

gzm0 · gzm0 · commit 28b1b65aa12a · 2023-12-28T18:31:52.000+01:00
This was forgotten in 1982a6b.
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/ClassEmitter.scala b/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/ClassEmitter.scala
@@ -683,12 +683,12 @@ private[emitter] final class ClassEmitter(sjsGen: SJSGen) {
 
   def genInstanceTests(className: ClassName, kind: ClassKind)(
       implicit moduleContext: ModuleContext,
-      globalKnowledge: GlobalKnowledge, pos: Position): WithGlobals[js.Tree] = {
+      globalKnowledge: GlobalKnowledge, pos: Position): WithGlobals[List[js.Tree]] = {
     for {
       single <- genSingleInstanceTests(className, kind)
       array <- genArrayInstanceTests(className)
     } yield {
-      js.Block(single ::: array)
+      single ::: array
     }
   }
 
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/Emitter.scala b/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/Emitter.scala
@@ -595,7 +595,7 @@ final class Emitter(config: Emitter.Config) {
        */
 
       if (classEmitter.needInstanceTests(linkedClass)(classCache)) {
-        main += extractWithGlobals(classTreeCache.instanceTests.getOrElseUpdate(
+        main ++= extractWithGlobals(classTreeCache.instanceTests.getOrElseUpdate(
             classEmitter.genInstanceTests(className, kind)(moduleContext, classCache, linkedClass.pos)))
       }
 
@@ -1035,7 +1035,7 @@ object Emitter {
 
   private final class DesugaredClassCache {
     val privateJSFields = new OneTimeCache[WithGlobals[List[js.Tree]]]
-    val instanceTests = new OneTimeCache[WithGlobals[js.Tree]]
+    val instanceTests = new OneTimeCache[WithGlobals[List[js.Tree]]]
     val typeData = new OneTimeCache[WithGlobals[List[js.Tree]]]
     val setTypeData = new OneTimeCache[js.Tree]
     val moduleAccessor = new OneTimeCache[WithGlobals[List[js.Tree]]]

Original file line number	Diff line number	Diff line change
`@@ -683,12 +683,12 @@ private[emitter] final class ClassEmitter(sjsGen: SJSGen) {`
`683`	`683`
`684`	`684`	`def genInstanceTests(className: ClassName, kind: ClassKind)(`
`685`	`685`	`implicit moduleContext: ModuleContext,`
`686`		`- globalKnowledge: GlobalKnowledge, pos: Position): WithGlobals[js.Tree] = {`
	`686`	`+ globalKnowledge: GlobalKnowledge, pos: Position): WithGlobals[List[js.Tree]] = {`
`687`	`687`	`for {`
`688`	`688`	`single <- genSingleInstanceTests(className, kind)`
`689`	`689`	`array <- genArrayInstanceTests(className)`
`690`	`690`	`} yield {`
`691`		`- js.Block(single ::: array)`
	`691`	`+ single ::: array`
`692`	`692`	`}`
`693`	`693`	`}`
`694`	`694`