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

K1 JVM: simplify InlinePlatformCompatibilityChecker

Browse Source
This commit is contained in:
Alexander Udalov
2023-08-05 00:49:48 +02:00
committed by Space Team
parent 596aab1673
commit bacb2f0d15
1 changed files with 20 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/InlinePlatformCompatibilityChecker.kt
+20 -71
View File
@@ -18,8 +18,6 @@ package org.jetbrains.kotlin.resolve.jvm.checkers
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.config.JvmTarget
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.descriptors.ClassOrPackageFragmentDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
@@ -35,85 +33,37 @@ import org.jetbrains.kotlin.resolve.inline.InlineUtil
import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
class InlinePlatformCompatibilityChecker(val jvmTarget: JvmTarget, languageVersionSettings: LanguageVersionSettings) : CallChecker {
private val properError = languageVersionSettings.supportsFeature(LanguageFeature.ProperInlineFromHigherPlatformDiagnostic)
private val doCheck = doCheck()
class InlinePlatformCompatibilityChecker(val jvmTarget: JvmTarget) : CallChecker {
override fun check(resolvedCall: ResolvedCall<*>, reportOn: PsiElement, context: CallCheckerContext) {
if (!doCheck) return
val resultingDescriptor = resolvedCall.resultingDescriptor as? CallableMemberDescriptor ?: return
if (!InlineUtil.isInline(resultingDescriptor)) {
if (resultingDescriptor is PropertyDescriptor && InlineUtil.isInline(resultingDescriptor.getter)) {
//TODO: we should distinguish setter usage from getter one, now we could report wrong diagnostic on non-inline setter
//var prop: Int
// inline get
// set
//
// prop - resolved call with property descriptor and we should report error
// prop = 1 - resolved call with setter for whole expression and property descriptor for left part,
// so we couldn't distinguish is this expression for setter or for getter and will report wrong diagnostic
} else {
return
}
// TODO (KT-60971): distinguish the case when one property accessor is inline and the other isn't.
if (!InlineUtil.isInline(resultingDescriptor) &&
(resultingDescriptor !is PropertyDescriptor || !InlineUtil.isInline(resultingDescriptor.getter))
) {
return
}
val propertyOrFun = DescriptorUtils.getDirectMember(resultingDescriptor)
val compilingBytecodeVersion = jvmTarget.majorVersion
if (!properError) {
val inliningBytecodeVersion = getBytecodeVersionIfDeserializedDescriptor(propertyOrFun, false)
if (inliningBytecodeVersion != null && compilingBytecodeVersion < inliningBytecodeVersion) {
context.trace.report(
ErrorsJvm.INLINE_FROM_HIGHER_PLATFORM.on(
reportOn,
JvmTarget.getDescription(inliningBytecodeVersion),
JvmTarget.getDescription(compilingBytecodeVersion)
)
val inliningBytecodeVersion = getBytecodeVersionIfDeserializedDescriptor(propertyOrFun) ?: return
if (jvmTarget.majorVersion < inliningBytecodeVersion) {
context.trace.report(
ErrorsJvm.INLINE_FROM_HIGHER_PLATFORM.on(
reportOn,
JvmTarget.getDescription(inliningBytecodeVersion),
JvmTarget.getDescription(jvmTarget.majorVersion)
)
return
}
)
}
val inliningBytecodeVersionProper = getBytecodeVersionIfDeserializedDescriptor(propertyOrFun, true) ?: return
if (compilingBytecodeVersion < inliningBytecodeVersionProper) {
if (properError) {
context.trace.report(
ErrorsJvm.INLINE_FROM_HIGHER_PLATFORM.on(
reportOn,
JvmTarget.getDescription(inliningBytecodeVersionProper),
JvmTarget.getDescription(compilingBytecodeVersion)
)
)
} else {
//INLINE_FROM_HIGHER_PLATFORM was checked in `if (!properError)`
context.trace.report(
ErrorsJvm.INLINE_FROM_HIGHER_PLATFORM_WARNING.on(
reportOn,
JvmTarget.getDescription(inliningBytecodeVersionProper),
JvmTarget.getDescription(compilingBytecodeVersion)
)
)
}
}
}
companion object {
fun doCheck() = "true" != System.getProperty("kotlin.skip.bytecode.version.check")
fun getBytecodeVersionIfDeserializedDescriptor(
funOrProperty: DeclarationDescriptor,
useConcreteSuperImplementation: Boolean
): Int? {
private fun getBytecodeVersionIfDeserializedDescriptor(funOrProperty: DeclarationDescriptor): Int? {
if (funOrProperty !is DeserializedCallableMemberDescriptor) return null
val realDeclarationIfFound =
if (useConcreteSuperImplementation) funOrProperty.getConcreteDeclarationForInline() else funOrProperty
val containingDeclaration = realDeclarationIfFound.containingDeclaration as ClassOrPackageFragmentDescriptor
val containingDeclaration =
funOrProperty.getConcreteDeclarationForInline().containingDeclaration as ClassOrPackageFragmentDescriptor
val source = containingDeclaration.source
val binaryClass =
@@ -131,10 +81,9 @@ class InlinePlatformCompatibilityChecker(val jvmTarget: JvmTarget, languageVersi
val superImplementation = overriddenDescriptors.firstOrNull {
val containingDeclaration = it.containingDeclaration
!DescriptorUtils.isInterface(containingDeclaration) && !DescriptorUtils.isAnnotationClass(containingDeclaration)
}
superImplementation?.let {
return it.getConcreteDeclarationForInline()
if (superImplementation != null) {
return superImplementation.getConcreteDeclarationForInline()
}
}
return this