From 293df7bd500c502dfc75a6d5959e9fe080bd8d05 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 5 Jun 2020 10:14:42 +0300 Subject: [PATCH] [IR BE common] Use Descriptor-based IR only in CheckIrElementVisitor --- compiler/ir/backend.common/build.gradle.kts | 8 -------- .../kotlin/backend/common/CheckIrElementVisitor.kt | 2 ++ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/compiler/ir/backend.common/build.gradle.kts b/compiler/ir/backend.common/build.gradle.kts index caef995ea9d..acb573d5779 100644 --- a/compiler/ir/backend.common/build.gradle.kts +++ b/compiler/ir/backend.common/build.gradle.kts @@ -16,11 +16,3 @@ sourceSets { "test" {} } -tasks { - val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { - kotlinOptions { - freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.ir.DescriptorBasedIr" - } - } -} - diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CheckIrElementVisitor.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CheckIrElementVisitor.kt index 23bbbc08f58..dc58df2c20b 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CheckIrElementVisitor.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CheckIrElementVisitor.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.backend.common import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.ir.DescriptorBasedIr import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns @@ -31,6 +32,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal typealias ReportError = (element: IrElement, message: String) -> Unit +@OptIn(DescriptorBasedIr::class) class CheckIrElementVisitor( val irBuiltIns: IrBuiltIns, val reportError: ReportError,