[FIR2IR] Add pre-caching of built-in classes to avoid their duplications

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt

@@ -8,7 +8,9 @@ package org.jetbrains.kotlin.fir.backend
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.resolve.firProvider
+import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.symbols.StandardClassIds
+import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
 import org.jetbrains.kotlin.fir.types.FirTypeRef
@@ -45,6 +47,24 @@ class Fir2IrClassifierStorage(
     private fun FirTypeRef.toIrType(typeContext: ConversionTypeContext = ConversionTypeContext.DEFAULT): IrType =
         with(typeConverter) { toIrType(typeContext) }
 
+    fun preCacheBuiltinClasses() {
+        for ((classId, irBuiltinSymbol) in typeConverter.classIdToSymbolMap) {
+            val firClass = ConeClassLikeLookupTagImpl(classId).toSymbol(session)!!.fir as FirRegularClass
+            val irClass = irBuiltinSymbol.owner
+            classCache[firClass] = irClass
+            processClassHeader(firClass, irClass)
+            declarationStorage.preCacheBuiltinClassConstructorIfAny(firClass, irClass)
+        }
+        for ((primitiveClassId, primitiveArrayId) in StandardClassIds.primitiveArrayTypeByElementType) {
+            val firClass = ConeClassLikeLookupTagImpl(primitiveArrayId).toSymbol(session)!!.fir as FirRegularClass
+            val irType = typeConverter.classIdToTypeMap[primitiveClassId]
+            val irClass = irBuiltIns.primitiveArrayForType[irType]!!.owner
+            classCache[firClass] = irClass
+            processClassHeader(firClass, irClass)
+            declarationStorage.preCacheBuiltinClassConstructorIfAny(firClass, irClass)
+        }
+    }
+
     internal fun IrDeclaration.declareThisReceiverParameter(
         parent: IrDeclarationParent,
         thisType: IrType,
@@ -354,14 +374,6 @@ class Fir2IrClassifierStorage(
     fun getIrClassSymbol(firClassSymbol: FirClassSymbol<*>): IrClassSymbol {
         val firClass = firClassSymbol.fir
         getCachedIrClass(firClass)?.let { return symbolTable.referenceClass(it.descriptor) }
-        val builtinClassSymbol = when (firClassSymbol.classId) {
-            StandardClassIds.Any -> irBuiltIns.anyClass
-            else -> null
-        }
-        if (builtinClassSymbol != null && firClass is FirRegularClass) {
-            classCache[firClass] = builtinClassSymbol.owner
-            return symbolTable.referenceClass(builtinClassSymbol.descriptor)
-        }
         // TODO: remove all this code and change to unbound symbol creation
         val irClass = createIrClass(firClass)
         if (firClass is FirAnonymousObject || firClass is FirRegularClass && firClass.visibility == Visibilities.LOCAL) {

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt

@@ -186,7 +186,9 @@ class Fir2IrConverter(
             val externalDependenciesGenerator = ExternalDependenciesGenerator(
                 symbolTable, generateTypicalIrProviderList(irModuleFragment.descriptor, builtIns, symbolTable)
             )
+            // Necessary call to generate built-in IR classes
             externalDependenciesGenerator.generateUnboundSymbolsAsDependencies()
+            classifierStorage.preCacheBuiltinClasses()
             for (firFile in firFiles) {
                 converter.processClassHeaders(firFile)
             }

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt

@@ -66,6 +66,12 @@ class Fir2IrDeclarationStorage(
 
     private val localStorage = Fir2IrLocalStorage()
 
+    internal fun preCacheBuiltinClassConstructorIfAny(firClass: FirRegularClass, irClass: IrClass) {
+        val primaryConstructor = firClass.getPrimaryConstructorIfAny() ?: return
+        val irConstructor = irClass.constructors.firstOrNull() ?: return
+        constructorCache[primaryConstructor] = irConstructor
+    }
+
     fun registerFile(firFile: FirFile, irFile: IrFile) {
         fileCache[firFile] = irFile
     }
@@ -653,15 +659,6 @@ class Fir2IrDeclarationStorage(
     fun getIrConstructorSymbol(firConstructorSymbol: FirConstructorSymbol): IrConstructorSymbol {
         val firConstructor = firConstructorSymbol.fir
         getCachedIrConstructor(firConstructor)?.let { return symbolTable.referenceConstructor(it.descriptor) }
-        val builtinParent = when (firConstructorSymbol.callableId.classId) {
-            StandardClassIds.Any -> irBuiltIns.anyClass
-            else -> null
-        }
-        if (builtinParent != null) {
-            val constructorSymbol = builtinParent.constructors.first()
-            constructorCache[firConstructor] = constructorSymbol.owner
-            return symbolTable.referenceConstructor(constructorSymbol.descriptor)
-        }
 
         val irParent = findIrParent(firConstructor) as IrClass
         val parentOrigin = (irParent as? IrDeclaration)?.origin ?: IrDeclarationOrigin.DEFINED

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt

@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.types.Variance
 class Fir2IrTypeConverter(
     private val components: Fir2IrComponents
 ) : Fir2IrComponents by components {
-    private val classIdToSymbolMap = mapOf(
+    internal val classIdToSymbolMap = mapOf(
         StandardClassIds.Nothing to irBuiltIns.nothingClass,
         StandardClassIds.Unit to irBuiltIns.unitClass,
         StandardClassIds.Boolean to irBuiltIns.booleanClass,
@@ -37,7 +37,7 @@ class Fir2IrTypeConverter(
         StandardClassIds.Array to irBuiltIns.arrayClass
     )
 
-    private val classIdToTypeMap = mapOf(
+    internal val classIdToTypeMap = mapOf(
         StandardClassIds.Nothing to irBuiltIns.nothingType,
         StandardClassIds.Unit to irBuiltIns.unitType,
         StandardClassIds.Boolean to irBuiltIns.booleanType,

compiler/testData/codegen/box/arrays/arrayConstructorWithNonInlineLambda.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 
 import kotlin.test.assertEquals

compiler/testData/codegen/box/arrays/arrayConstructorsSimple.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 
 import kotlin.test.assertEquals

compiler/testData/codegen/box/arrays/arrayGetAssignMultiIndex.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 operator fun Array<String>.get(index1: Int, index2: Int) = this[index1 + index2]
 operator fun Array<String>.set(index1: Int, index2: Int, elem: String) {
     this[index1 + index2] = elem

compiler/testData/codegen/box/arrays/arrayGetMultiIndex.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 operator fun Array<String>.get(index1: Int, index2: Int) = this[index1 + index2]
 operator fun Array<String>.set(index1: Int, index2: Int, elem: String) {
     this[index1 + index2] = elem

compiler/testData/codegen/box/arrays/arraysOfInlineClass/accessArrayOfUnsigned.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 

compiler/testData/codegen/box/arrays/indices.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 

compiler/testData/codegen/box/arrays/inlineInitializer.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Foo(
     val width: Int,
     val height: Int,

compiler/testData/codegen/box/arrays/iterator.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box(): String {
     val x = Array<Int>(5, { it } ).iterator()
     var i = 0

compiler/testData/codegen/box/arrays/kt945.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box() : String {
     val data = Array<Array<Boolean>>(3) { Array<Boolean>(4, {false}) }
     for(d in data) {

compiler/testData/codegen/box/arrays/multiDecl/MultiDeclFor.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class C(val i: Int) {
   operator fun component1() = i + 1
   operator fun component2() = i + 2

compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForComponentExtensions.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class C(val i: Int) {
 }
 

compiler/testData/codegen/box/arrays/multiDecl/MultiDeclForValCaptured.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class C(val i: Int) {
   operator fun component1() = i + 1
   operator fun component2() = i + 2

compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentExtensions.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 operator fun Int.component1() = this + 1
 operator fun Int.component2() = this + 2
 

compiler/testData/codegen/box/arrays/multiDecl/int/MultiDeclForComponentExtensionsValCaptured.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 operator fun Int.component1() = this + 1
 operator fun Int.component2() = this + 2
 

compiler/testData/codegen/box/arrays/multiDecl/kt15568.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box(): String {
     val a = Array(2) { DoubleArray(3) }
 

compiler/testData/codegen/box/arrays/multiDecl/kt15575.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box(): String {
     val transform = transform(Array(1) { BooleanArray(1) })
     if (!transform[0][0]) return "OK"

compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentExtensions.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 operator fun Long.component1() = this + 1
 operator fun Long.component2() = this + 2
 

compiler/testData/codegen/box/arrays/multiDecl/long/MultiDeclForComponentExtensionsValCaptured.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 operator fun Long.component1() = this + 1
 operator fun Long.component2() = this + 2
 

compiler/testData/codegen/box/arrays/nonLocalReturnArrayConstructor.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 typealias ArrayS = Array<String>
 
 fun testArray() {

compiler/testData/codegen/box/arrays/nonNullArray.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A() {
     class B(val i: Int) {
     }

compiler/testData/codegen/box/boxingOptimization/taintedValuesBox.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 

compiler/testData/codegen/box/boxingOptimization/unsafeRemoving.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 
 import kotlin.test.assertEquals

compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsArray.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KT-25514 Support usage of function reference with vararg where function of array is expected in new inference
 
 fun foo(x: Int, vararg y: String): String = y[0]

compiler/testData/codegen/box/classes/kt471.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class MyNumber(val i: Int) {
     operator fun inc(): MyNumber = MyNumber(i+1)
 }

compiler/testData/codegen/box/classes/kt633.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class mInt(val i : Int) {
     override fun toString() : String = "mint: $i"
     operator fun plus(i : Int) = mInt(this.i + i)

compiler/testData/codegen/box/controlStructures/breakInWhen.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +AllowBreakAndContinueInsideWhen
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun testFor() {
     val xs = IntArray(10) { i -> i }

compiler/testData/codegen/box/controlStructures/continueInWhen.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +AllowBreakAndContinueInsideWhen
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun testFor() {
     val xs = IntArray(10) { i -> i }

compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayOfObjectArrayWithIndex.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 

compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayOfPrimArrayWithIndex.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 

compiler/testData/codegen/box/dataClasses/arrayParams.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A(val x: Array<Int>, val y: IntArray)
 
 fun foo(x: Array<Int>, y: IntArray) = A(x, y)

compiler/testData/codegen/box/dataClasses/multiDeclarationFor.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A(val x: Int, val y: String)
 
 fun box(): String {

compiler/testData/codegen/box/regressions/kt15196.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 fun foo() {

compiler/testData/codegen/box/reified/arraysReification/jaggedArray.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 inline fun <reified T> jaggedArray(x: (Int, Int) -> T): Array<Array<T>> = Array(1) { i ->
     Array(1) { j -> x(i, j) }
 }

compiler/testData/codegen/box/reified/arraysReification/jaggedDeep.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 inline fun <reified T> jaggedArray(x: (Int, Int, Int) -> T): Array<Array<Array<T>>> = Array(1) { i ->
     Array(1) {
         j -> Array(1) { k -> x(i, j, k)  }

compiler/testData/codegen/box/reified/newArrayInt.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS

compiler/testData/codegen/box/reified/recursiveNewArray.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS

compiler/testData/codegen/box/reified/reifiedIntersectionTypeArgument.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 

compiler/testData/codegen/box/reified/reifiedIntersectionTypeArgumentCrossModule.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 

compiler/testData/codegen/box/reified/reifiedTypeArgumentWithIntersectionTypeAsTypeArgument.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 

compiler/testData/codegen/box/reified/reifiedTypeArgumentWithRecursion.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 

compiler/testData/codegen/box/reified/sameIndexRecursive.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS

compiler/testData/codegen/box/typealias/typeAliasConstructorForArray.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 typealias BoolArray = Array<Boolean>
 typealias IArray = IntArray
 typealias MyArray<T> = Array<T>