Revert "Support common metadata in kotlinx-metadata"

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
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.metadata.ProtoBuf
import org.jetbrains.kotlin.metadata.builtins.BuiltInsBinaryVersion
import org.jetbrains.kotlin.metadata.builtins.readBuiltinsPackageFragment
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.resolve.descriptorUtil.module
import org.jetbrains.kotlin.serialization.deserialization.DeserializedPackageFragmentImpl
@@ -34,15 +33,21 @@ class BuiltInsPackageFragmentImpl private constructor(
inputStream: InputStream,
isFallback: Boolean
): BuiltInsPackageFragmentImpl {
val (proto, version) = inputStream.readBuiltinsPackageFragment()
lateinit var version: BuiltInsBinaryVersion
if (proto == null) {
// TODO: report a proper diagnostic
throw UnsupportedOperationException(
"Kotlin built-in definition format version is not supported: " +
"expected ${BuiltInsBinaryVersion.INSTANCE}, actual $version. " +
"Please update Kotlin"
)
val proto = inputStream.use { stream ->
version = BuiltInsBinaryVersion.readFrom(stream)
if (!version.isCompatible()) {
// TODO: report a proper diagnostic
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)