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
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmBinaryAnnotationDeserializer.kt
+1 -1
View File
@@ -86,7 +86,7 @@ class JvmBinaryAnnotationDeserializer(
val jvmClassFlags = runIf(containingClassProto?.hasExtension(JvmProtoBuf.jvmClassFlags) == true) { val jvmClassFlags = runIf(containingClassProto?.hasExtension(JvmProtoBuf.jvmClassFlags) == true) {
containingClassProto?.getExtension(JvmProtoBuf.jvmClassFlags) containingClassProto?.getExtension(JvmProtoBuf.jvmClassFlags)
} }
val allCompatibilityModeIsEnabled = jvmClassFlags?.let { JvmFlags.IS_ALL_COMPATIBILITY_MODE.get(it) } ?: true val allCompatibilityModeIsEnabled = jvmClassFlags?.let { JvmFlags.IS_COMPILED_IN_COMPATIBILITY_MODE.get(it) } ?: true
return findJvmBinaryClassAndLoadMemberAnnotations( return findJvmBinaryClassAndLoadMemberAnnotations(
signature, signature,
searchInDefaultImpls = classIsInterface && allCompatibilityModeIsEnabled searchInDefaultImpls = classIsInterface && allCompatibilityModeIsEnabled
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmClassFileBasedSymbolProvider.kt
+1 -1
View File
@@ -139,7 +139,7 @@ class JvmClassFileBasedSymbolProvider(
} }
override fun isNewPlaceForBodyGeneration(classProto: ProtoBuf.Class): Boolean = override fun isNewPlaceForBodyGeneration(classProto: ProtoBuf.Class): Boolean =
JvmFlags.ARE_INTERFACE_METHOD_BODIES_INSIDE.get(classProto.getExtension(JvmProtoBuf.jvmClassFlags)) JvmFlags.IS_COMPILED_IN_JVM_DEFAULT_MODE.get(classProto.getExtension(JvmProtoBuf.jvmClassFlags))
override fun getPackage(fqName: FqName): FqName? = override fun getPackage(fqName: FqName): FqName? =
javaFacade.getPackage(fqName) javaFacade.getPackage(fqName)
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() val IS_MOVED_FROM_INTERFACE_COMPANION = Flags.FlagField.booleanFirst()
//Class //Class
val ARE_INTERFACE_METHOD_BODIES_INSIDE = Flags.FlagField.booleanFirst() val IS_COMPILED_IN_JVM_DEFAULT_MODE = Flags.FlagField.booleanFirst()
val IS_ALL_COMPATIBILITY_MODE = Flags.FlagField.booleanAfter(ARE_INTERFACE_METHOD_BODIES_INSIDE) val IS_COMPILED_IN_COMPATIBILITY_MODE = Flags.FlagField.booleanAfter(IS_COMPILED_IN_JVM_DEFAULT_MODE)
fun getPropertyFlags(isMovedFromInterfaceCompanion: Boolean): Int = fun getPropertyFlags(isMovedFromInterfaceCompanion: Boolean): Int =
IS_MOVED_FROM_INTERFACE_COMPANION.toFlags(isMovedFromInterfaceCompanion) IS_MOVED_FROM_INTERFACE_COMPANION.toFlags(isMovedFromInterfaceCompanion)
fun getClassFlags(isAllInterfaceBodiesInside: Boolean, isCompatibilityMode: Boolean): Int = 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 @JvmStatic
fun isNewPlaceForBodyGeneration(proto: ProtoBuf.Class): Boolean = 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))
} }
libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/JvmFlag.kt
+2 -2
View File
@@ -43,7 +43,7 @@ object JvmFlag {
* class. * class.
*/ */
@JvmField @JvmField
val HAS_METHOD_BODIES_IN_INTERFACE = booleanFlag(JF.ARE_INTERFACE_METHOD_BODIES_INSIDE) val HAS_METHOD_BODIES_IN_INTERFACE = booleanFlag(JF.IS_COMPILED_IN_JVM_DEFAULT_MODE)
/** /**
* Applied to an interface compiled with -Xjvm-default=all-compatibility. * Applied to an interface compiled with -Xjvm-default=all-compatibility.
@@ -53,7 +53,7 @@ object JvmFlag {
* clients compiled without all-compatibility. * clients compiled without all-compatibility.
*/ */
@JvmField @JvmField
val IS_COMPILED_IN_COMPATIBILITY_MODE = booleanFlag(JF.IS_ALL_COMPATIBILITY_MODE) val IS_COMPILED_IN_COMPATIBILITY_MODE = booleanFlag(JF.IS_COMPILED_IN_COMPATIBILITY_MODE)
} }
private fun booleanFlag(f: F.BooleanFlagField): Flag = private fun booleanFlag(f: F.BooleanFlagField): Flag =