From 6c124ccd0cd113a080cde8e204ab39631a0974b9 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Mon, 25 May 2020 10:30:36 +0300
Subject: [PATCH] [IR] Drop deprecated symbol.descriptor based declaration
 constructors

---
 .../ir/declarations/impl/IrClassImpl.kt       | 25 -------------------
 .../kotlin/ir/declarations/impl/IrFileImpl.kt |  9 -------
 .../ir/declarations/impl/IrFunctionImpl.kt    | 25 -------------------
 .../ir/declarations/impl/IrPropertyImpl.kt    | 23 -----------------
 .../declarations/impl/IrValueParameterImpl.kt | 22 ----------------
 5 files changed, 104 deletions(-)

diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt
index 9eb3d42f3ec..8005a9153c6 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt
@@ -51,31 +51,6 @@ class IrClassImpl(
     IrClass,
     ClassCarrier {
 
-    @Deprecated(
-        "This constructor is left for native compilation purpose only. " +
-                "It takes class attributes from symbol.descriptor " +
-                "Please either provide class attributes or its descriptor explicitly"
-    )
-    constructor(
-        startOffset: Int,
-        endOffset: Int,
-        origin: IrDeclarationOrigin,
-        symbol: IrClassSymbol
-    ) : this(
-        startOffset, endOffset, origin, symbol,
-        name = symbol.descriptor.name,
-        kind = symbol.descriptor.kind,
-        visibility = symbol.descriptor.visibility,
-        modality = symbol.descriptor.modality,
-        isCompanion = symbol.descriptor.isCompanionObject,
-        isInner = symbol.descriptor.isInner,
-        isData = symbol.descriptor.isData,
-        isExternal = symbol.descriptor.isExternal,
-        isInline = symbol.descriptor.isInline,
-        isExpect = symbol.descriptor.isExpect,
-        isFun = symbol.descriptor.isFun
-    )
-
     constructor(
         startOffset: Int,
         endOffset: Int,
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFileImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFileImpl.kt
index b98fdd4a3ff..ffa24d56888 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFileImpl.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFileImpl.kt
@@ -35,15 +35,6 @@ class IrFileImpl(
     IrElementBase(0, fileEntry.maxOffset),
     IrFile {
 
-    @Deprecated(
-        "This constructor is left for native compilation purpose only. It uses symbol.descriptor attributes " +
-                "Please provide FqName explicitly"
-    )
-    constructor(
-        fileEntry: SourceManager.FileEntry,
-        symbol: IrFileSymbol
-    ) : this(fileEntry, symbol, symbol.descriptor.fqName)
-
     constructor(
         fileEntry: SourceManager.FileEntry,
         packageFragmentDescriptor: PackageFragmentDescriptor
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt
index bbd042b9bc9..de1ba7f2f72 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt
@@ -39,31 +39,6 @@ class IrFunctionImpl(
     IrSimpleFunction,
     FunctionCarrier {
 
-    @Deprecated(
-        "This constructor is left for native compilation purpose only. " +
-                "It takes function attributes from symbol.descriptor " +
-                "Please either provide function attributes or its descriptor explicitly"
-    )
-    constructor(
-        startOffset: Int,
-        endOffset: Int,
-        origin: IrDeclarationOrigin,
-        symbol: IrSimpleFunctionSymbol,
-        returnType: IrType
-    ) : this(
-        startOffset, endOffset, origin, symbol,
-        name = symbol.descriptor.name,
-        visibility = symbol.descriptor.visibility,
-        modality = symbol.descriptor.modality,
-        returnType = returnType,
-        isInline = symbol.descriptor.isInline,
-        isExternal = symbol.descriptor.isExternal,
-        isTailrec = symbol.descriptor.isTailrec,
-        isSuspend = symbol.descriptor.isSuspend,
-        isOperator = symbol.descriptor.isOperator,
-        isExpect = symbol.descriptor.isExpect
-    )
-
     constructor(
         startOffset: Int,
         endOffset: Int,
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt
index 64b27494109..92fa0eb65e6 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt
@@ -47,29 +47,6 @@ class IrPropertyImpl(
     IrProperty,
     PropertyCarrier {
 
-    @Deprecated(
-        "This constructor is left for native compilation purpose only. " +
-                "It takes property attributes from symbol.descriptor " +
-                "Please either provide property attributes or its descriptor explicitly"
-    )
-    constructor(
-        startOffset: Int,
-        endOffset: Int,
-        origin: IrDeclarationOrigin,
-        symbol: IrPropertySymbol,
-        name: Name
-    ) : this(
-        startOffset, endOffset, origin, symbol, name,
-        visibility = symbol.descriptor.visibility,
-        modality = symbol.descriptor.modality,
-        isVar = symbol.descriptor.isVar,
-        isConst = symbol.descriptor.isConst,
-        isLateinit = symbol.descriptor.isLateInit,
-        isDelegated = symbol.descriptor.isDelegated,
-        isExternal = symbol.descriptor.isExternal,
-        isExpect = symbol.descriptor.isExpect
-    )
-
     @Deprecated(message = "Don't use descriptor-based API for IrProperty", level = DeprecationLevel.WARNING)
     constructor(
         startOffset: Int,
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrValueParameterImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrValueParameterImpl.kt
index 08974b01e88..75073755d05 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrValueParameterImpl.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrValueParameterImpl.kt
@@ -46,28 +46,6 @@ class IrValueParameterImpl(
     IrValueParameter,
     ValueParameterCarrier {
 
-    @Deprecated(
-        "This constructor is left for native compilation purpose only. " +
-                "It takes value parameter attributes from symbol.descriptor " +
-                "Please either provide parameter attributes or its descriptor explicitly"
-    )
-    constructor(
-        startOffset: Int,
-        endOffset: Int,
-        origin: IrDeclarationOrigin,
-        symbol: IrValueParameterSymbol,
-        type: IrType,
-        varargElementType: IrType?
-    ) : this(
-        startOffset, endOffset, origin, symbol,
-        name = symbol.descriptor.name,
-        index = symbol.descriptor.safeAs<ValueParameterDescriptor>()?.index ?: -1,
-        type = type,
-        varargElementType = varargElementType,
-        isCrossinline = symbol.descriptor.safeAs<ValueParameterDescriptor>()?.isCrossinline == true,
-        isNoinline = symbol.descriptor.safeAs<ValueParameterDescriptor>()?.isNoinline == true
-    )
-
     constructor(
         startOffset: Int,
         endOffset: Int,