From 29ecc4d987f13afbf43e855dca0c0dad54384211 Mon Sep 17 00:00:00 2001 From: "vladislav.grechko" Date: Thu, 27 Jul 2023 18:28:30 +0200 Subject: [PATCH] Minor: refactor `ApiVersionIsAtLeastEvaluationLowering` --- .../jvm/lower/ApiVersionIsAtLeastEvaluationLowering.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ApiVersionIsAtLeastEvaluationLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ApiVersionIsAtLeastEvaluationLowering.kt index c2a0e066d6f..7d923d246fe 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ApiVersionIsAtLeastEvaluationLowering.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ApiVersionIsAtLeastEvaluationLowering.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.ir.expressions.IrExpression import org.jetbrains.kotlin.ir.expressions.IrInlinedFunctionBlock import org.jetbrains.kotlin.ir.types.isInt import org.jetbrains.kotlin.ir.util.getPackageFragment -import org.jetbrains.kotlin.ir.util.isFacadeClass +import org.jetbrains.kotlin.ir.util.isTopLevelInPackage import org.jetbrains.kotlin.ir.visitors.IrElementTransformer internal class ApiVersionIsAtLeastEvaluationLowering(val context: JvmBackendContext) : FileLoweringPass, @@ -73,9 +73,7 @@ internal class ApiVersionIsAtLeastEvaluationLowering(val context: JvmBackendCont private val IrFunction.isApiVersionIsAtLeast: Boolean get() { - return name.asString() == "apiVersionIsAtLeast" - && getPackageFragment().packageFqName == StandardNames.KOTLIN_INTERNAL_FQ_NAME - && parent.isFacadeClass + return isTopLevelInPackage("apiVersionIsAtLeast", StandardNames.KOTLIN_INTERNAL_FQ_NAME) && valueParameters.size == 3 && valueParameters[0].type.isInt() && valueParameters[1].type.isInt()