azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Support common metadata in kotlinx-metadata"

Browse Source 
This reverts commit f9cc443e4f.
This commit is contained in:
Nikolay Krasko
2022-02-16 22:31:26 +03:00
parent f9cc443e4f
commit 03cb9942e6
4 changed files with 15 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInsPackageFragmentImpl.kt
+14 -9
View File
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.metadata.ProtoBuf
import org.jetbrains.kotlin.metadata.builtins.BuiltInsBinaryVersion import org.jetbrains.kotlin.metadata.builtins.BuiltInsBinaryVersion
import org.jetbrains.kotlin.metadata.builtins.readBuiltinsPackageFragment
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.resolve.descriptorUtil.module
import org.jetbrains.kotlin.serialization.deserialization.DeserializedPackageFragmentImpl import org.jetbrains.kotlin.serialization.deserialization.DeserializedPackageFragmentImpl
@@ -34,15 +33,21 @@ class BuiltInsPackageFragmentImpl private constructor(
inputStream: InputStream, inputStream: InputStream,
isFallback: Boolean isFallback: Boolean
): BuiltInsPackageFragmentImpl { ): BuiltInsPackageFragmentImpl {
val (proto, version) = inputStream.readBuiltinsPackageFragment() lateinit var version: BuiltInsBinaryVersion
if (proto == null) { val proto = inputStream.use { stream ->
// TODO: report a proper diagnostic version = BuiltInsBinaryVersion.readFrom(stream)
throw UnsupportedOperationException(
"Kotlin built-in definition format version is not supported: " + if (!version.isCompatible()) {
"expected ${BuiltInsBinaryVersion.INSTANCE}, actual $version. " + // TODO: report a proper diagnostic
"Please update Kotlin" throw UnsupportedOperationException(
) "Kotlin built-in definition format version is not supported: " +
"expected ${BuiltInsBinaryVersion.INSTANCE}, actual $version. " +
"Please update Kotlin"
)
}
ProtoBuf.PackageFragment.parseFrom(stream, BuiltInSerializerProtocol.extensionRegistry)
} }
return BuiltInsPackageFragmentImpl(fqName, storageManager, module, proto, version, isFallback) return BuiltInsPackageFragmentImpl(fqName, storageManager, module, proto, version, isFallback)
core/metadata/src/org/jetbrains/kotlin/metadata/builtins/readPackageFragment.kt
-22
View File
@@ -1,22 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.metadata.builtins
import org.jetbrains.kotlin.metadata.ProtoBuf
import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite
import java.io.InputStream
fun InputStream.readBuiltinsPackageFragment(): Pair<ProtoBuf.PackageFragment?, BuiltInsBinaryVersion> =
use { stream ->
val version = BuiltInsBinaryVersion.readFrom(stream)
val proto =
if (version.isCompatible()) ProtoBuf.PackageFragment.parseFrom(
stream,
ExtensionRegistryLite.newInstance().apply(BuiltInsProtoBuf::registerAllExtensions)
)
else null
proto to version
}
libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/JvmMetadataExtensions.kt
+1 -6
View File
@@ -298,12 +298,7 @@ internal class JvmMetadataExtensions : MetadataExtensions {
override fun createPackageExtension(): KmPackageExtension = JvmPackageExtension() override fun createPackageExtension(): KmPackageExtension = JvmPackageExtension()
override fun createModuleFragmentExtensions(): KmModuleFragmentExtension = override fun createModuleFragmentExtensions(): KmModuleFragmentExtension =
object : KmModuleFragmentExtension { error("metadata-jvm doesn't have any extensions for module fragment!")
override val type: KmExtensionType = KmExtensionType(KmModuleFragmentExtension::class)
override fun accept(visitor: KmModuleFragmentExtensionVisitor) {
}
}
override fun createFunctionExtension(): KmFunctionExtension = JvmFunctionExtension() override fun createFunctionExtension(): KmFunctionExtension = JvmFunctionExtension()
libraries/kotlinx-metadata/src/kotlinx/metadata/internal/common/KotlinCommonMetadata.kt
-44
View File
@@ -1,44 +0,0 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package kotlinx.metadata.internal.common
import kotlinx.metadata.KmModuleFragment
import kotlinx.metadata.KmModuleFragmentVisitor
import kotlinx.metadata.impl.accept
import org.jetbrains.kotlin.metadata.ProtoBuf
import org.jetbrains.kotlin.metadata.builtins.readBuiltinsPackageFragment
import org.jetbrains.kotlin.metadata.deserialization.NameResolverImpl
import java.io.ByteArrayInputStream
class KotlinCommonMetadata private constructor(private val proto: ProtoBuf.PackageFragment) {
fun toKmModuleFragment(): KmModuleFragment =
KmModuleFragment().apply(this::accept)
class Writer : KmModuleFragmentVisitor() {
// TODO
}
fun accept(v: KmModuleFragmentVisitor) {
val strings = NameResolverImpl(proto.strings, proto.qualifiedNames)
if (proto.hasPackage()) {
v.visitPackage()?.let { proto.`package`.accept(it, strings) }
}
for (klass in proto.class_List) {
v.visitClass()?.let { klass.accept(it, strings) }
}
v.visitEnd()
}
companion object {
@JvmStatic
fun read(bytes: ByteArray): KotlinCommonMetadata? {
val (proto, _) = ByteArrayInputStream(bytes).readBuiltinsPackageFragment()
if (proto == null) return null
return KotlinCommonMetadata(proto)
}
}
}