From db61665ab82602ce8fe8cce94e5bd5303ffedac1 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 20 Jul 2021 15:58:17 +0200 Subject: [PATCH] [minor] IR: clean unnecessary ObsoleteDescriptorBasedAPI opt-ins --- .../org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt | 6 ++---- .../jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt | 4 +--- .../backend/common/serialization/IrModuleDeserializer.kt | 2 -- .../kotlin/backend/common/serialization/KotlinIrLinker.kt | 1 - compiler/ir/serialization.js/build.gradle.kts | 8 -------- 5 files changed, 3 insertions(+), 18 deletions(-) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt index 7f55cba8a51..59ae2451b7b 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt @@ -6,11 +6,10 @@ package org.jetbrains.kotlin.ir.backend.js import org.jetbrains.kotlin.builtins.PrimitiveType -import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI +import org.jetbrains.kotlin.ir.IrBuiltIns import org.jetbrains.kotlin.ir.declarations.IrFunction import org.jetbrains.kotlin.ir.declarations.IrProperty import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction -import org.jetbrains.kotlin.ir.descriptors.IrBuiltInsOverDescriptors import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol import org.jetbrains.kotlin.ir.types.isLong import org.jetbrains.kotlin.ir.util.constructors @@ -22,8 +21,7 @@ import org.jetbrains.kotlin.psi2ir.findSingleFunction import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly import java.util.* -@OptIn(ObsoleteDescriptorBasedAPI::class) -class JsIntrinsics(private val irBuiltIns: IrBuiltInsOverDescriptors, val context: JsIrBackendContext) { +class JsIntrinsics(private val irBuiltIns: IrBuiltIns, val context: JsIrBackendContext) { // TODO: Should we drop operator intrinsics in favor of IrDynamicOperatorExpression? diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt index d65d853c54d..52c9838e5e2 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt @@ -25,7 +25,6 @@ import org.jetbrains.kotlin.ir.builders.declarations.addFunction import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.impl.IrExternalPackageFragmentImpl import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl -import org.jetbrains.kotlin.ir.descriptors.IrBuiltInsOverDescriptors import org.jetbrains.kotlin.ir.expressions.IrCall import org.jetbrains.kotlin.ir.symbols.IrClassSymbol import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol @@ -178,8 +177,7 @@ class JsIrBackendContext( private val coroutineIntrinsicsPackage = module.getPackage(COROUTINE_INTRINSICS_PACKAGE_FQNAME) val dynamicType: IrDynamicType = IrDynamicTypeImpl(null, emptyList(), Variance.INVARIANT) - @OptIn(ObsoleteDescriptorBasedAPI::class) - val intrinsics = JsIntrinsics(irBuiltIns as IrBuiltInsOverDescriptors, this) + val intrinsics = JsIntrinsics(irBuiltIns, this) override val sharedVariablesManager = JsSharedVariablesManager(this) diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt index 013c14a832d..20832073713 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.backend.common.serialization import org.jetbrains.kotlin.backend.common.serialization.encodings.BinarySymbolData import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.ir.IrBuiltIns -import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.symbols.* import org.jetbrains.kotlin.ir.util.IdSignature @@ -94,7 +93,6 @@ abstract class IrModuleDeserializer(val moduleDescriptor: ModuleDescriptor, val } // Used to resolve built in symbols like `kotlin.ir.internal.*` or `kotlin.FunctionN` -@OptIn(ObsoleteDescriptorBasedAPI::class) class IrModuleDeserializerWithBuiltIns( private val builtIns: IrBuiltIns, private val delegate: IrModuleDeserializer diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt index 985d9b0af8a..018db432e68 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt @@ -308,7 +308,6 @@ abstract class KotlinIrLinker( return deserializerForModule.moduleFragment } - @OptIn(ObsoleteDescriptorBasedAPI::class) private fun maybeWrapWithBuiltInAndInit( moduleDescriptor: ModuleDescriptor, moduleDeserializer: IrModuleDeserializer diff --git a/compiler/ir/serialization.js/build.gradle.kts b/compiler/ir/serialization.js/build.gradle.kts index 036345b5676..c5758522a60 100644 --- a/compiler/ir/serialization.js/build.gradle.kts +++ b/compiler/ir/serialization.js/build.gradle.kts @@ -15,11 +15,3 @@ dependencies { sourceSets { "main" { projectDefault() } } - -tasks { - val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { - kotlinOptions { - freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI" - } - } -}