diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java index 4efb94d69d1..4674dc8df88 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java @@ -39,7 +39,7 @@ public class Flags { public static final BooleanFlagField IS_INNER = FlagField.booleanAfter(CLASS_KIND); public static final BooleanFlagField IS_DATA = FlagField.booleanAfter(IS_INNER); public static final BooleanFlagField IS_EXTERNAL_CLASS = FlagField.booleanAfter(IS_DATA); - public static final BooleanFlagField IS_HEADER_CLASS = FlagField.booleanAfter(IS_EXTERNAL_CLASS); + public static final BooleanFlagField IS_EXPECT_CLASS = FlagField.booleanAfter(IS_EXTERNAL_CLASS); // Constructors @@ -57,7 +57,7 @@ public class Flags { public static final BooleanFlagField IS_TAILREC = FlagField.booleanAfter(IS_INLINE); public static final BooleanFlagField IS_EXTERNAL_FUNCTION = FlagField.booleanAfter(IS_TAILREC); public static final BooleanFlagField IS_SUSPEND = FlagField.booleanAfter(IS_EXTERNAL_FUNCTION); - public static final BooleanFlagField IS_HEADER_FUNCTION = FlagField.booleanAfter(IS_SUSPEND); + public static final BooleanFlagField IS_EXPECT_FUNCTION = FlagField.booleanAfter(IS_SUSPEND); // Properties @@ -69,7 +69,7 @@ public class Flags { public static final BooleanFlagField HAS_CONSTANT = FlagField.booleanAfter(IS_LATEINIT); public static final BooleanFlagField IS_EXTERNAL_PROPERTY = FlagField.booleanAfter(HAS_CONSTANT); public static final BooleanFlagField IS_DELEGATED = FlagField.booleanAfter(IS_EXTERNAL_PROPERTY); - public static final BooleanFlagField IS_HEADER_PROPERTY = FlagField.booleanAfter(IS_DELEGATED); + public static final BooleanFlagField IS_EXPECT_PROPERTY = FlagField.booleanAfter(IS_DELEGATED); // Parameters @@ -107,7 +107,7 @@ public class Flags { | IS_INNER.toFlags(inner) | IS_DATA.toFlags(isData) | IS_EXTERNAL_CLASS.toFlags(isExternal) - | IS_HEADER_CLASS.toFlags(isExpect) + | IS_EXPECT_CLASS.toFlags(isExpect) ; } @@ -165,7 +165,7 @@ public class Flags { | IS_TAILREC.toFlags(isTailrec) | IS_EXTERNAL_FUNCTION.toFlags(isExternal) | IS_SUSPEND.toFlags(isSuspend) - | IS_HEADER_FUNCTION.toFlags(isExpect) + | IS_EXPECT_FUNCTION.toFlags(isExpect) ; } @@ -196,7 +196,7 @@ public class Flags { | HAS_CONSTANT.toFlags(hasConstant) | IS_EXTERNAL_PROPERTY.toFlags(isExternal) | IS_DELEGATED.toFlags(isDelegated) - | IS_HEADER_PROPERTY.toFlags(isExpect) + | IS_EXPECT_PROPERTY.toFlags(isExpect) ; } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt index eb3459f7c4d..d5c21da4904 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt @@ -47,7 +47,7 @@ class MemberDeserializer(private val c: DeserializationContext) { Flags.IS_CONST.get(flags), Flags.IS_EXTERNAL_PROPERTY.get(flags), Flags.IS_DELEGATED.get(flags), - Flags.IS_HEADER_PROPERTY.get(flags), + Flags.IS_EXPECT_PROPERTY.get(flags), proto, c.nameResolver, c.typeTable, @@ -175,7 +175,7 @@ class MemberDeserializer(private val c: DeserializationContext) { function.isInline = Flags.IS_INLINE.get(flags) function.isTailrec = Flags.IS_TAILREC.get(flags) function.isSuspend = Flags.IS_SUSPEND.get(flags) - function.isExpect = Flags.IS_HEADER_FUNCTION.get(flags) + function.isExpect = Flags.IS_EXPECT_FUNCTION.get(flags) return function } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt index ec2cd45c7cd..ff802785fc7 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt @@ -98,7 +98,7 @@ class DeserializedClassDescriptor( override fun isData() = Flags.IS_DATA.get(classProto.flags) - override fun isExpect() = Flags.IS_HEADER_CLASS.get(classProto.flags) + override fun isExpect() = Flags.IS_EXPECT_CLASS.get(classProto.flags) override fun isActual() = false