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

Rename JVM default flags

Browse Source
This commit is contained in:
Mikhael Bogdanov
2021-12-03 17:58:01 +01:00
parent ea58c858d1
commit a1262a4ecd
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmFlags.kt
+3 -3
View File
@@ -15,13 +15,13 @@ object JvmFlags {
val IS_MOVED_FROM_INTERFACE_COMPANION = Flags.FlagField.booleanFirst()
//Class
val ARE_INTERFACE_METHOD_BODIES_INSIDE = Flags.FlagField.booleanFirst()
val IS_ALL_COMPATIBILITY_MODE = Flags.FlagField.booleanAfter(ARE_INTERFACE_METHOD_BODIES_INSIDE)
val IS_COMPILED_IN_JVM_DEFAULT_MODE = Flags.FlagField.booleanFirst()
val IS_COMPILED_IN_COMPATIBILITY_MODE = Flags.FlagField.booleanAfter(IS_COMPILED_IN_JVM_DEFAULT_MODE)
fun getPropertyFlags(isMovedFromInterfaceCompanion: Boolean): Int =
IS_MOVED_FROM_INTERFACE_COMPANION.toFlags(isMovedFromInterfaceCompanion)
fun getClassFlags(isAllInterfaceBodiesInside: Boolean, isCompatibilityMode: Boolean): Int =
ARE_INTERFACE_METHOD_BODIES_INSIDE.toFlags(isAllInterfaceBodiesInside) or IS_ALL_COMPATIBILITY_MODE.toFlags(isCompatibilityMode)
IS_COMPILED_IN_JVM_DEFAULT_MODE.toFlags(isAllInterfaceBodiesInside) or IS_COMPILED_IN_COMPATIBILITY_MODE.toFlags(isCompatibilityMode)
}
core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmProtoBufUtil.kt
+1 -1
View File
@@ -132,5 +132,5 @@ object JvmProtoBufUtil {
@JvmStatic
fun isNewPlaceForBodyGeneration(proto: ProtoBuf.Class): Boolean =
JvmFlags.ARE_INTERFACE_METHOD_BODIES_INSIDE.get(proto.getExtension(JvmProtoBuf.jvmClassFlags))
JvmFlags.IS_COMPILED_IN_JVM_DEFAULT_MODE.get(proto.getExtension(JvmProtoBuf.jvmClassFlags))
}