Compile all the JVM builtins as a part of stdlib

After proper changes in the compiler, we are ready to get rid of the
hacky step of compilation no-bytecode builtins with K2Metadata and
instead compile the full stdlib source set by K2JVM compiler.

The build scripts updated properly: compilation no longer relies on jar
produced by `core/builtins` module and instead uses a full stdlib source
set. Recently introduced `-Xcompile-builtins-as-part-of-stdlib` flag
is used to enable the new compiler behavior.

The stdlib sources fixed properly: `actual` modifiers added whenever
required, diagnostics suppressed.

Test data updated properly, as JVM methods enhancements are no longer
considered as overrides.

^KT-68154: Fixed

(cherry picked from commit 6ef69b9)

Author: grechkovlad

analysis/analysis-api/testData/components/resolver/singleByPsi/CollectionStream.references.txt

@@ -1,3 +1,3 @@
 KtNameReferenceExpression(174,180): 'stream'
   KtSimpleNameReference:
-    (in kotlin.collections.Collection) {psi: ClsMethodImpl}override fun stream(): java.util.stream.Stream<E>
+    (in kotlin.collections.Collection) {psi: ClsMethodImpl} fun stream(): java.util.stream.Stream<E>

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.pretty.txt

@@ -15,7 +15,7 @@ val ordinal: kotlin.Int
 
 override fun getDeclaringClass(): java.lang.Class<test.E!>!
 
-override fun finalize()
+fun finalize()
 
 companion object
 

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.standalone.fir.pretty.txt

@@ -15,7 +15,7 @@ val ordinal: kotlin.Int
 
 override fun getDeclaringClass(): java.lang.Class<test.E!>!
 
-override fun finalize()
+fun finalize()
 
 companion object
 

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.standalone.fir.txt

@@ -564,7 +564,7 @@ KaNamedFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: true
+  isOverride: false
   isStatic: false
   isSuspend: false
   isTailRec: false

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.txt

@@ -564,7 +564,7 @@ KaNamedFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: true
+  isOverride: false
   isStatic: false
   isSuspend: false
   isTailRec: false

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.pretty.txt

@@ -19,7 +19,7 @@ val ordinal: kotlin.Int
 
 override fun getDeclaringClass(): java.lang.Class<test.E!>!
 
-override fun finalize()
+fun finalize()
 
 companion object
 

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.standalone.fir.pretty.txt

@@ -19,7 +19,7 @@ val ordinal: kotlin.Int
 
 override fun getDeclaringClass(): java.lang.Class<test.E!>!
 
-override fun finalize()
+fun finalize()
 
 companion object
 

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.standalone.fir.txt

@@ -708,7 +708,7 @@ KaNamedFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: true
+  isOverride: false
   isStatic: false
   isSuspend: false
   isTailRec: false

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.txt

@@ -708,7 +708,7 @@ KaNamedFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: true
+  isOverride: false
   isStatic: false
   isSuspend: false
   isTailRec: false

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.pretty.txt

@@ -19,7 +19,7 @@ val ordinal: kotlin.Int
 
 override fun getDeclaringClass(): java.lang.Class<test.E!>!
 
-override fun finalize()
+fun finalize()
 
 companion object
 

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.standalone.fir.pretty.txt

@@ -19,7 +19,7 @@ val ordinal: kotlin.Int
 
 override fun getDeclaringClass(): java.lang.Class<test.E!>!
 
-override fun finalize()
+fun finalize()
 
 companion object
 

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.standalone.fir.txt

@@ -708,7 +708,7 @@ KaNamedFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: true
+  isOverride: false
   isStatic: false
   isSuspend: false
   isTailRec: false

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.txt

@@ -708,7 +708,7 @@ KaNamedFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: true
+  isOverride: false
   isStatic: false
   isSuspend: false
   isTailRec: false

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.pretty.txt

@@ -17,7 +17,7 @@ val ordinal: kotlin.Int
 
 override fun getDeclaringClass(): java.lang.Class<test.E!>!
 
-override fun finalize()
+fun finalize()
 
 companion object
 

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.standalone.fir.pretty.txt

@@ -17,7 +17,7 @@ val ordinal: kotlin.Int
 
 override fun getDeclaringClass(): java.lang.Class<test.E!>!
 
-override fun finalize()
+fun finalize()
 
 companion object
 

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.standalone.fir.txt

@@ -666,7 +666,7 @@ KaNamedFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: true
+  isOverride: false
   isStatic: false
   isSuspend: false
   isTailRec: false

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.txt

@@ -666,7 +666,7 @@ KaNamedFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: true
+  isOverride: false
   isStatic: false
   isSuspend: false
   isTailRec: false

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.pretty.txt

@@ -19,7 +19,7 @@ val ordinal: kotlin.Int
 
 override fun getDeclaringClass(): java.lang.Class<test.E!>!
 
-override fun finalize()
+fun finalize()
 
 companion object
 

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.standalone.fir.pretty.txt

@@ -19,7 +19,7 @@ val ordinal: kotlin.Int
 
 override fun getDeclaringClass(): java.lang.Class<test.E!>!
 
-override fun finalize()
+fun finalize()
 
 companion object
 

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.standalone.fir.txt

@@ -768,7 +768,7 @@ KaNamedFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: true
+  isOverride: false
   isStatic: false
   isSuspend: false
   isTailRec: false

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.txt

@@ -768,7 +768,7 @@ KaNamedFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: true
+  isOverride: false
   isStatic: false
   isSuspend: false
   isTailRec: false

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.pretty.txt

@@ -17,7 +17,7 @@ val ordinal: kotlin.Int
 
 override fun getDeclaringClass(): java.lang.Class<test.E!>!
 
-override fun finalize()
+fun finalize()
 
 companion object
 

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.standalone.fir.pretty.txt

@@ -17,7 +17,7 @@ val ordinal: kotlin.Int
 
 override fun getDeclaringClass(): java.lang.Class<test.E!>!
 
-override fun finalize()
+fun finalize()
 
 companion object
 

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.standalone.fir.txt

@@ -666,7 +666,7 @@ KaNamedFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: true
+  isOverride: false
   isStatic: false
   isSuspend: false
   isTailRec: false

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.txt

@@ -666,7 +666,7 @@ KaNamedFunctionSymbol:
   isInfix: false
   isInline: false
   isOperator: false
-  isOverride: true
+  isOverride: false
   isStatic: false
   isSuspend: false
   isTailRec: false

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.txt

@@ -583,7 +583,7 @@ scopes:
         isInfix: false
         isInline: false
         isOperator: false
-        isOverride: true
+        isOverride: false
         isStatic: false
         isSuspend: false
         isTailRec: false

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.txt

@@ -583,7 +583,7 @@ scopes:
         isInfix: false
         isInline: false
         isOperator: false
-        isOverride: true
+        isOverride: false
         isStatic: false
         isSuspend: false
         isTailRec: false

compiler/tests-common/tests/org/jetbrains/kotlin/serialization/builtins/BuiltinsTestUtils.kt

@@ -10,6 +10,7 @@ import com.intellij.util.containers.ContainerUtil
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.name.StandardClassIds
 import org.jetbrains.kotlin.resolve.lazy.createResolveSessionForFiles
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.io.File
@@ -19,11 +20,14 @@ object BuiltinsTestUtils {
     fun compileBuiltinsModule(environment: KotlinCoreEnvironment): ModuleDescriptor {
         val files = KotlinTestUtils.loadToKtFiles(
             environment, ContainerUtil.concat<File>(
-                allFilesUnder("libraries/stdlib/jvm/builtins"),
-                allFilesUnder("core/builtins/build/src/common"),
-                allFilesUnder("core/builtins/build/src/reflect"),
+                allFilesUnder("libraries/stdlib/jvm/"),
+                allFilesUnder("libraries/stdlib/src/")
             )
-        )
+        ).filter {
+            it.annotationEntries.any { annotation ->
+                annotation.shortName == StandardClassIds.Annotations.JvmBuiltin.shortClassName
+            }
+        }
         return createResolveSessionForFiles(environment.project, files, false).moduleDescriptor
     }
 

generators/builtins/arrays.kt

@@ -82,11 +82,13 @@ abstract class GenerateArrays(val writer: PrintWriter, val primitiveArrays: Bool
                         type = arrayTypeName
                     }
                 }
-                classBody("""
+                classBody(
+                    """
                     private var index = 0
                     override fun hasNext() = index < array.size
                     override fun next${kind?.capitalized ?: ""}() = if (index < array.size) array[index++] else throw NoSuchElementException("${'$'}index")
-                """.trimIndent())
+                """.trimIndent()
+                )
             }
         }
 
@@ -209,22 +211,25 @@ abstract class GenerateArrays(val writer: PrintWriter, val primitiveArrays: Bool
 
 
 class GenerateCommonArrays(writer: PrintWriter, primitiveArrays: Boolean) : GenerateArrays(writer, primitiveArrays) {
-    override fun FileBuilder.modifyGeneratedFile() {
-        import("kotlin.internal.ActualizeByJvmBuiltinProvider")
-    }
-
     override fun arrayBuilder(kind: PrimitiveType?): ArrayBuilder = object : ArrayBuilder(kind) {
         override fun ClassBuilder.modifyGeneratedClass() {
-            annotations += "ActualizeByJvmBuiltinProvider"
             expectActual = ExpectActualModifier.Expect
         }
     }
 }
 
 class GenerateJvmArrays(writer: PrintWriter, primitiveArrays: Boolean) : GenerateArrays(writer, primitiveArrays) {
+    override fun FileBuilder.modifyGeneratedFile() {
+        annotate("kotlin.internal.JvmBuiltin")
+        annotate("kotlin.internal.SuppressBytecodeGeneration")
+        suppress("NON_ABSTRACT_FUNCTION_WITH_NO_BODY")
+        suppress("PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED")
+        suppress("MUST_BE_INITIALIZED_OR_BE_ABSTRACT")
+    }
+
     override fun arrayBuilder(kind: PrimitiveType?): ArrayBuilder = object : ArrayBuilder(kind) {
         override fun ClassBuilder.modifyGeneratedClass() {
-            expectActual = ExpectActualModifier.Unspecified
+            expectActual = ExpectActualModifier.Actual
         }
     }
 }
@@ -292,7 +297,8 @@ class GenerateWasmArrays(writer: PrintWriter, primitiveArrays: Boolean) : Genera
                 name = "storage"
                 type = storageArrayType
             }
-            classBody("""
+            classBody(
+                """
                 init {
                     if (size < 0) throw IllegalArgumentException("Negative array size")
                     storage = $storageArrayType(size)
@@ -301,7 +307,8 @@ class GenerateWasmArrays(writer: PrintWriter, primitiveArrays: Boolean) : Genera
                 @WasmPrimitiveConstructor
                 @Suppress("PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED")
                 internal constructor(storage: $storageArrayType)
-            """.trimIndent())
+            """.trimIndent()
+            )
         }
 
         override fun SecondaryConstructorBuilder.modifySecondaryConstructor() {
@@ -314,12 +321,12 @@ class GenerateWasmArrays(writer: PrintWriter, primitiveArrays: Boolean) : Genera
             """
                 rangeCheck(index, storage.len())
                 ${
-                    when (kind) {
-                        null -> "@Suppress(\"UNCHECKED_CAST\") return storage.get(index) as T"
-                        PrimitiveType.BOOLEAN -> "return storage.get(index).reinterpretAsInt().reinterpretAsBoolean()"
-                        else -> "return storage.get(index)"
-                    }
+                when (kind) {
+                    null -> "@Suppress(\"UNCHECKED_CAST\") return storage.get(index) as T"
+                    PrimitiveType.BOOLEAN -> "return storage.get(index).reinterpretAsInt().reinterpretAsBoolean()"
+                    else -> "return storage.get(index)"
                 }
+            }
             """.trimIndent().setAsBlockBody()
         }
 

generators/builtins/generateBuiltIns.kt

@@ -24,7 +24,7 @@ fun assertExists(file: File) {
 }
 
 val BUILT_INS_COMMON_DIR = File("libraries/stdlib/src/kotlin")
-val BUILT_INS_NATIVE_DIR_JVM = File("libraries/stdlib/jvm/builtins/")
+val BUILT_INS_NATIVE_DIR_JVM = File("libraries/stdlib/jvm/builtins")
 val BUILT_INS_NATIVE_DIR_JS = File("libraries/stdlib/js/builtins/")
 val BUILT_INS_NATIVE_DIR_WASM = File("libraries/stdlib/wasm/builtins/")
 val BUILT_INS_NATIVE_DIR_NATIVE = File("kotlin-native/runtime/src/main/kotlin/")
@@ -36,7 +36,7 @@ interface BuiltInsGenerator {
     fun generate()
 }
 
-abstract class BuiltInsSourceGenerator(val out: PrintWriter) : BuiltInsGenerator {
+abstract class BuiltInsSourceGenerator(val out: PrintWriter, private val annotateAsBuiltinWithBytecode: Boolean = false) : BuiltInsGenerator {
     protected abstract fun generateBody(): Unit
 
     protected open fun getPackage(): String = "kotlin"
@@ -55,6 +55,9 @@ abstract class BuiltInsSourceGenerator(val out: PrintWriter) : BuiltInsGenerator
             out.println("@file:kotlin.jvm.JvmName(\"$name\")")
             out.println("@file:kotlin.jvm.JvmMultifileClass")
         }
+        if (annotateAsBuiltinWithBytecode) {
+            out.println("@file:kotlin.internal.JvmBuiltin")
+        }
         out.print("package ${getPackage()}")
         out.println()
         out.println()

generators/builtins/iterators.kt

@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.generators.builtins.PrimitiveType
 import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
 import java.io.PrintWriter
 
-class GenerateIterators(out: PrintWriter) : BuiltInsSourceGenerator(out) {
+class GenerateIterators(out: PrintWriter) : BuiltInsSourceGenerator(out, annotateAsBuiltinWithBytecode = true) {
     override fun getPackage() = "kotlin.collections"
     override fun generateBody() {
         for (kind in PrimitiveType.entries) {