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

IR: do not serialize nonlocal initializers in inline-only mode

Browse Source
This commit is contained in:
Georgy Bronnikov
2021-06-25 23:01:27 +03:00
committed by TeamCityServer
parent 28bff2ba4f
commit 225705a237
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
+7 -6
View File
@@ -6,9 +6,7 @@
package org.jetbrains.kotlin.backend.common.serialization package org.jetbrains.kotlin.backend.common.serialization
import org.jetbrains.kotlin.backend.common.serialization.encodings.* import org.jetbrains.kotlin.backend.common.serialization.encodings.*
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.InlineClassRepresentation
import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.IrFileEntry import org.jetbrains.kotlin.ir.IrFileEntry
import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.*
@@ -1292,7 +1290,7 @@ open class IrFileSerializer(
val proto = ProtoField.newBuilder() val proto = ProtoField.newBuilder()
.setBase(serializeIrDeclarationBase(field, FieldFlags.encode(field))) .setBase(serializeIrDeclarationBase(field, FieldFlags.encode(field)))
.setNameType(serializeNameAndType(field.name, field.type)) .setNameType(serializeNameAndType(field.name, field.type))
if (!skipMutableState) { if (!skipMutableState && !(bodiesOnlyForInlines && (field.parent as? IrDeclarationWithVisibility)?.visibility != DescriptorVisibilities.LOCAL)) {
val initializer = field.initializer?.expression val initializer = field.initializer?.expression
if (initializer != null) { if (initializer != null) {
proto.initializer = serializeIrExpressionBody(initializer) proto.initializer = serializeIrExpressionBody(initializer)
@@ -1431,8 +1429,11 @@ open class IrFileSerializer(
open fun backendSpecificSerializeAllMembers(irClass: IrClass) = false open fun backendSpecificSerializeAllMembers(irClass: IrClass) = false
fun memberNeedsSerialization(member: IrDeclaration): Boolean { fun memberNeedsSerialization(member: IrDeclaration): Boolean {
assert(member.parent is IrClass) val parent = member.parent
if (backendSpecificSerializeAllMembers(member.parent as IrClass)) return true require(parent is IrClass)
if (backendSpecificSerializeAllMembers(parent)) return true
if (bodiesOnlyForInlines && member is IrAnonymousInitializer && parent.visibility != DescriptorVisibilities.LOCAL)
return false
return (!member.isFakeOverride) return (!member.isFakeOverride)
} }