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

JVM_IR: normalize visibility before serializing

Browse Source
This commit is contained in:
Georgy Bronnikov
2021-05-13 15:47:40 +03:00
committed by TeamCityServer
parent a328ebc889
commit 2d3a558d50
1 changed files with 6 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/encodings/BinaryFlags.kt
+6 -6
View File
@@ -36,7 +36,7 @@ value class ClassFlags(val flags: Long) {
fun encode(clazz: IrClass): Long { fun encode(clazz: IrClass): Long {
return clazz.run { return clazz.run {
val hasAnnotation = annotations.isNotEmpty() val hasAnnotation = annotations.isNotEmpty()
val visibility = ProtoEnumFlags.descriptorVisibility(visibility) val visibility = ProtoEnumFlags.descriptorVisibility(visibility.normalize())
val modality = ProtoEnumFlags.modality(modality) val modality = ProtoEnumFlags.modality(modality)
val kind = ProtoEnumFlags.classKind(kind, isCompanion) val kind = ProtoEnumFlags.classKind(kind, isCompanion)
@@ -74,7 +74,7 @@ value class FunctionFlags(val flags: Long) {
fun encode(function: IrSimpleFunction): Long { fun encode(function: IrSimpleFunction): Long {
function.run { function.run {
val hasAnnotation = annotations.isNotEmpty() val hasAnnotation = annotations.isNotEmpty()
val visibility = ProtoEnumFlags.descriptorVisibility(visibility) val visibility = ProtoEnumFlags.descriptorVisibility(visibility.normalize())
val modality = ProtoEnumFlags.modality(modality) val modality = ProtoEnumFlags.modality(modality)
val kind = if (isFakeOverride) ProtoBuf.MemberKind.FAKE_OVERRIDE else ProtoBuf.MemberKind.DECLARATION val kind = if (isFakeOverride) ProtoBuf.MemberKind.FAKE_OVERRIDE else ProtoBuf.MemberKind.DECLARATION
@@ -91,7 +91,7 @@ value class FunctionFlags(val flags: Long) {
fun encode(constructor: IrConstructor): Long { fun encode(constructor: IrConstructor): Long {
constructor.run { constructor.run {
val hasAnnotation = annotations.isNotEmpty() val hasAnnotation = annotations.isNotEmpty()
val visibility = ProtoEnumFlags.descriptorVisibility(visibility) val visibility = ProtoEnumFlags.descriptorVisibility(visibility.normalize())
val flags = IrFlags.getConstructorFlags(hasAnnotation, visibility, isInline, isExternal, isExpect, isPrimary) val flags = IrFlags.getConstructorFlags(hasAnnotation, visibility, isInline, isExternal, isExpect, isPrimary)
return flags.toLong() return flags.toLong()
@@ -122,7 +122,7 @@ value class PropertyFlags(val flags: Long) {
fun encode(property: IrProperty): Long { fun encode(property: IrProperty): Long {
return property.run { return property.run {
val hasAnnotation = annotations.isNotEmpty() val hasAnnotation = annotations.isNotEmpty()
val visibility = ProtoEnumFlags.descriptorVisibility(visibility) val visibility = ProtoEnumFlags.descriptorVisibility(visibility.normalize())
val modality = ProtoEnumFlags.modality(modality) val modality = ProtoEnumFlags.modality(modality)
val kind = if (isFakeOverride) ProtoBuf.MemberKind.FAKE_OVERRIDE else ProtoBuf.MemberKind.DECLARATION val kind = if (isFakeOverride) ProtoBuf.MemberKind.FAKE_OVERRIDE else ProtoBuf.MemberKind.DECLARATION
val hasGetter = getter != null val hasGetter = getter != null
@@ -176,7 +176,7 @@ value class TypeAliasFlags(val flags: Long) {
companion object { companion object {
fun encode(typeAlias: IrTypeAlias): Long { fun encode(typeAlias: IrTypeAlias): Long {
return typeAlias.run { return typeAlias.run {
val visibility = ProtoEnumFlags.descriptorVisibility(visibility) val visibility = ProtoEnumFlags.descriptorVisibility(visibility.normalize())
IrFlags.getTypeAliasFlags(annotations.isNotEmpty(), visibility, isActual).toLong() IrFlags.getTypeAliasFlags(annotations.isNotEmpty(), visibility, isActual).toLong()
} }
} }
@@ -214,7 +214,7 @@ value class FieldFlags(val flags: Long) {
companion object { companion object {
fun encode(field: IrField): Long { fun encode(field: IrField): Long {
return field.run { return field.run {
val visibility = ProtoEnumFlags.descriptorVisibility(visibility) val visibility = ProtoEnumFlags.descriptorVisibility(visibility.normalize())
IrFlags.getFieldFlags(annotations.isNotEmpty(), visibility, isFinal, isExternal, isStatic).toLong() IrFlags.getFieldFlags(annotations.isNotEmpty(), visibility, isFinal, isExternal, isStatic).toLong()
} }
} }