From 13502abab91ff2da624b9c06419c32b3a2c485d7 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 28 Dec 2022 16:15:03 +0100 Subject: [PATCH] Fix FIR bootstrap in version 2.0 --- .../kotlin/common-configuration.gradle.kts | 20 +++++++++------- .../jvm/deserialization/ModuleMapping.kt | 2 +- libraries/commonConfiguration.gradle | 2 ++ libraries/reflect/build.gradle.kts | 24 ++++++++++++------- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/buildSrc/src/main/kotlin/common-configuration.gradle.kts b/buildSrc/src/main/kotlin/common-configuration.gradle.kts index 613d409ae55..28da9003f0f 100644 --- a/buildSrc/src/main/kotlin/common-configuration.gradle.kts +++ b/buildSrc/src/main/kotlin/common-configuration.gradle.kts @@ -172,14 +172,18 @@ fun Project.configureKotlinCompilationOptions() { kotlinOptions { freeCompilerArgs += jvmCompilerArgs - if (useJvmFir && project.path !in projectsWithDisabledFirBootstrap) { - freeCompilerArgs += "-Xuse-k2" - freeCompilerArgs += "-Xabi-stability=stable" - if (useFirLT) { - freeCompilerArgs += "-Xuse-fir-lt" - } - if (useFirIC) { - freeCompilerArgs += "-Xuse-fir-ic" + if (useJvmFir) { + if (project.path !in projectsWithDisabledFirBootstrap) { + freeCompilerArgs += "-Xuse-k2" + freeCompilerArgs += "-Xabi-stability=stable" + if (useFirLT) { + freeCompilerArgs += "-Xuse-fir-lt" + } + if (useFirIC) { + freeCompilerArgs += "-Xuse-fir-ic" + } + } else { + freeCompilerArgs += "-Xskip-prerelease-check" } } if (renderDiagnosticNames) { diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/ModuleMapping.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/ModuleMapping.kt index 43258009c81..41752a097fe 100644 --- a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/ModuleMapping.kt +++ b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/ModuleMapping.kt @@ -53,7 +53,7 @@ class ModuleMapping private constructor( debugName: String, skipMetadataVersionCheck: Boolean, isJvmPackageNameSupported: Boolean, - metadataVersionFromLanguageVersion: JvmMetadataVersion, + metadataVersionFromLanguageVersion: JvmMetadataVersion = JvmMetadataVersion.INSTANCE, reportIncompatibleVersionError: (JvmMetadataVersion) -> Unit, ): ModuleMapping { if (bytes == null) { diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle index 38f9fb4eb51..c5c453aa06a 100644 --- a/libraries/commonConfiguration.gradle +++ b/libraries/commonConfiguration.gradle @@ -62,6 +62,8 @@ ext.configureFrontendIr = { Project project -> if (project.kotlinBuildProperties.useFirForLibraries) { freeCompilerArgs += "-Xuse-k2" allWarningsAsErrors = false + } else if (project.kotlinBuildProperties.useFir) { + freeCompilerArgs += "-Xskip-prerelease-check" } if (project.properties.renderDiagnosticNames) { freeCompilerArgs += "-Xrender-internal-diagnostic-names" diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index b773f9d66e2..825ff564e4b 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -63,32 +63,40 @@ dependencies { class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer { @Suppress("ArrayInDataClass") private data class Entry(val path: String, val bytes: ByteArray) + private val data = mutableListOf() override fun getName() = "KotlinModuleShadowTransformer" override fun canTransformResource(element: FileTreeElement): Boolean = - element.path.substringAfterLast(".") == KOTLIN_MODULE + element.path.substringAfterLast(".") == KOTLIN_MODULE override fun transform(context: TransformerContext) { fun relocate(content: String): String = - context.relocators.fold(content) { acc, relocator -> relocator.applyToSourceContent(acc) } + context.relocators.fold(content) { acc, relocator -> relocator.applyToSourceContent(acc) } - val metadata = KotlinModuleMetadata.read(context.`is`.readBytes()) - ?: error("Not a .kotlin_module file: ${context.path}") + val internalData = org.jetbrains.kotlin.metadata.jvm.deserialization.ModuleMapping.loadModuleMapping( + context.`is`.readBytes(), javaClass.name, skipMetadataVersionCheck = true, isJvmPackageNameSupported = true + ) { + } val writer = KotlinModuleMetadata.Writer() logger.info("Transforming ${context.path}") - metadata.accept(object : KmModuleVisitor(writer) { + val visitor = object : KmModuleVisitor(writer) { override fun visitPackageParts(fqName: String, fileFacades: List, multiFileClassParts: Map) { assert(multiFileClassParts.isEmpty()) { multiFileClassParts } // There are no multi-file class parts in core super.visitPackageParts(relocate(fqName), fileFacades.map(::relocate), multiFileClassParts) } - }) + } + for ((fqName, parts) in internalData.packageFqName2Parts) { + val (fileFacades, multiFileClassParts) = parts.parts.partition { parts.getMultifileFacadeName(it) == null } + visitor.visitPackageParts(fqName, fileFacades, multiFileClassParts.associateWith { parts.getMultifileFacadeName(it)!! }) + } + visitor.visitEnd() + data += Entry(context.path, writer.write().bytes) } - override fun hasTransformedResource(): Boolean = - data.isNotEmpty() + override fun hasTransformedResource(): Boolean = data.isNotEmpty() override fun modifyOutputStream(os: ZipOutputStream, preserveFileTimestamps: Boolean) { for ((path, bytes) in data) {