Introduce KlibDeserializedContainerSource
It is a DeserializedContainerSource implementation for deserializing metadata from klibs.
This commit is contained in:
committed by
Space Team
parent
923837f26b
commit
d9ba950d7b
+6
-14
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.fir.session
|
package org.jetbrains.kotlin.fir.session
|
||||||
|
|
||||||
import org.jetbrains.kotlin.descriptors.SourceFile
|
|
||||||
import org.jetbrains.kotlin.fir.FirSession
|
import org.jetbrains.kotlin.fir.FirSession
|
||||||
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
|
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
|
||||||
import org.jetbrains.kotlin.fir.deserialization.*
|
import org.jetbrains.kotlin.fir.deserialization.*
|
||||||
@@ -13,6 +12,7 @@ import org.jetbrains.kotlin.fir.isNewPlaceForBodyGeneration
|
|||||||
import org.jetbrains.kotlin.fir.languageVersionSettings
|
import org.jetbrains.kotlin.fir.languageVersionSettings
|
||||||
import org.jetbrains.kotlin.fir.scopes.FirKotlinScopeProvider
|
import org.jetbrains.kotlin.fir.scopes.FirKotlinScopeProvider
|
||||||
import org.jetbrains.kotlin.fir.symbols.SymbolInternals
|
import org.jetbrains.kotlin.fir.symbols.SymbolInternals
|
||||||
|
import org.jetbrains.kotlin.library.metadata.KlibDeserializedContainerSource
|
||||||
import org.jetbrains.kotlin.library.metadata.KlibMetadataClassDataFinder
|
import org.jetbrains.kotlin.library.metadata.KlibMetadataClassDataFinder
|
||||||
import org.jetbrains.kotlin.library.metadata.KlibMetadataSerializerProtocol
|
import org.jetbrains.kotlin.library.metadata.KlibMetadataSerializerProtocol
|
||||||
import org.jetbrains.kotlin.library.metadata.resolver.KotlinResolvedLibrary
|
import org.jetbrains.kotlin.library.metadata.resolver.KotlinResolvedLibrary
|
||||||
@@ -21,9 +21,6 @@ import org.jetbrains.kotlin.metadata.deserialization.NameResolverImpl
|
|||||||
import org.jetbrains.kotlin.name.ClassId
|
import org.jetbrains.kotlin.name.ClassId
|
||||||
import org.jetbrains.kotlin.name.FqName
|
import org.jetbrains.kotlin.name.FqName
|
||||||
import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration
|
import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration
|
||||||
import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData
|
|
||||||
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerAbiStability
|
|
||||||
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
|
|
||||||
import org.jetbrains.kotlin.utils.SmartList
|
import org.jetbrains.kotlin.utils.SmartList
|
||||||
import java.nio.file.Paths
|
import java.nio.file.Paths
|
||||||
|
|
||||||
@@ -119,16 +116,11 @@ class KlibBasedSymbolProvider(
|
|||||||
val moduleData = moduleDataProvider.getModuleData(libraryPath) ?: return null
|
val moduleData = moduleDataProvider.getModuleData(libraryPath) ?: return null
|
||||||
|
|
||||||
return ClassMetadataFindResult.NoMetadata { symbol ->
|
return ClassMetadataFindResult.NoMetadata { symbol ->
|
||||||
val source = object : DeserializedContainerSource {
|
val source = KlibDeserializedContainerSource(
|
||||||
override val incompatibility: IncompatibleVersionErrorData<*>? = null
|
moduleHeaders[resolvedLibrary]!!,
|
||||||
override val isPreReleaseInvisible =
|
deserializationConfiguration,
|
||||||
deserializationConfiguration.reportErrorsOnPreReleaseDependencies &&
|
classId.packageFqName
|
||||||
(moduleHeaders[resolvedLibrary]!!.flags and 1) != 0
|
)
|
||||||
override val abiStability = DeserializedContainerAbiStability.STABLE
|
|
||||||
override val presentableString = "Package '${classId.packageFqName}'"
|
|
||||||
|
|
||||||
override fun getContainingFile() = SourceFile.NO_SOURCE_FILE
|
|
||||||
}
|
|
||||||
|
|
||||||
deserializeClassToSymbol(
|
deserializeClassToSymbol(
|
||||||
classId,
|
classId,
|
||||||
|
|||||||
+35
@@ -0,0 +1,35 @@
|
|||||||
|
/*
|
||||||
|
* 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 org.jetbrains.kotlin.library.metadata
|
||||||
|
|
||||||
|
import org.jetbrains.kotlin.descriptors.SourceFile
|
||||||
|
import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf.Header
|
||||||
|
import org.jetbrains.kotlin.name.FqName
|
||||||
|
import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
|
||||||
|
import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData
|
||||||
|
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerAbiStability
|
||||||
|
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
|
||||||
|
|
||||||
|
class KlibDeserializedContainerSource private constructor(
|
||||||
|
override val isPreReleaseInvisible: Boolean,
|
||||||
|
override val presentableString: String
|
||||||
|
) : DeserializedContainerSource {
|
||||||
|
|
||||||
|
constructor(header: Header, configuration: DeserializationConfiguration, packageFqName: FqName) : this(
|
||||||
|
configuration.reportErrorsOnPreReleaseDependencies &&
|
||||||
|
(header.flags and 1) != 0,
|
||||||
|
"Package '$packageFqName'"
|
||||||
|
)
|
||||||
|
|
||||||
|
override val incompatibility: IncompatibleVersionErrorData<*>?
|
||||||
|
get() = null
|
||||||
|
|
||||||
|
override val abiStability: DeserializedContainerAbiStability
|
||||||
|
get() = DeserializedContainerAbiStability.STABLE
|
||||||
|
|
||||||
|
// TODO: move [CallableMemberDescriptor.findSourceFile] here.
|
||||||
|
override fun getContainingFile(): SourceFile = SourceFile.NO_SOURCE_FILE
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user