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

Avoid retaining protobuf package within DeserializedPackageFragmentImpl

Browse Source 
It's only used for DeserializedPackageMemberScope that's being created
during initialization

At the same time, protobuf objects may be not very light-weight
(see 2e933a165a)

 #KT-24513 Fixed
This commit is contained in:
Denis Zharkov
2018-05-30 14:03:08 +03:00
parent 0a3e8fbe66
commit 01a2330a70
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragmentImpl.kt
+5 -1
View File
@@ -30,16 +30,20 @@ abstract class DeserializedPackageFragmentImpl(
fqName: FqName, fqName: FqName,
storageManager: StorageManager, storageManager: StorageManager,
module: ModuleDescriptor, module: ModuleDescriptor,
protected val proto: ProtoBuf.PackageFragment, proto: ProtoBuf.PackageFragment,
private val containerSource: DeserializedContainerSource? private val containerSource: DeserializedContainerSource?
) : DeserializedPackageFragment(fqName, storageManager, module) { ) : DeserializedPackageFragment(fqName, storageManager, module) {
protected val nameResolver = NameResolverImpl(proto.strings, proto.qualifiedNames) protected val nameResolver = NameResolverImpl(proto.strings, proto.qualifiedNames)
override val classDataFinder = ProtoBasedClassDataFinder(proto, nameResolver) { containerSource ?: SourceElement.NO_SOURCE } override val classDataFinder = ProtoBasedClassDataFinder(proto, nameResolver) { containerSource ?: SourceElement.NO_SOURCE }
// Temporary storage: until `initialize` is called
private var _proto: ProtoBuf.PackageFragment? = proto
private lateinit var _memberScope: MemberScope private lateinit var _memberScope: MemberScope
override fun initialize(components: DeserializationComponents) { override fun initialize(components: DeserializationComponents) {
val proto = _proto ?: error("Repeated call to DeserializedPackageFragmentImpl::initialize")
_proto = null
_memberScope = DeserializedPackageMemberScope( _memberScope = DeserializedPackageMemberScope(
this, proto.`package`, nameResolver, containerSource, components, this, proto.`package`, nameResolver, containerSource, components,
classNames = { classNames = {
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt
+2 -3
View File
@@ -40,11 +40,10 @@ class KotlinJavascriptPackageFragment(
header: JsProtoBuf.Header, header: JsProtoBuf.Header,
configuration: DeserializationConfiguration configuration: DeserializationConfiguration
) : DeserializedPackageFragmentImpl(fqName, storageManager, module, proto, JsContainerSource(fqName, header, configuration)) { ) : DeserializedPackageFragmentImpl(fqName, storageManager, module, proto, JsContainerSource(fqName, header, configuration)) {
val fileMap: Map<Int, FileHolder> by storageManager.createLazyValue { val fileMap: Map<Int, FileHolder> =
this.proto.getExtension(JsProtoBuf.packageFragmentFiles).fileList.withIndex().associate { (index, file) -> proto.getExtension(JsProtoBuf.packageFragmentFiles).fileList.withIndex().associate { (index, file) ->
(if (file.hasId()) file.id else index) to FileHolder(file.annotationList) (if (file.hasId()) file.id else index) to FileHolder(file.annotationList)
} }
}
private lateinit var annotationDeserializer: AnnotationDeserializer private lateinit var annotationDeserializer: AnnotationDeserializer