[IR] simplify Carriers (remove type parameters)

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/Dce.kt

@@ -386,11 +386,9 @@ fun usefulDeclarations(roots: Iterable<IrDeclaration>, context: JsIrBackendConte
                 ) {
                     declaration.enqueue(klass, "annotated by @JsName")
                 }
-            }
 
-            // TODO is this needed?
+                // A hack to enforce property lowering.
-            for (declaration in ArrayList(klass.declarations)) {
+                // Until a getter is accessed it doesn't get moved to the declaration list.
-                // TODO this is a hack.
                 if (declaration is IrProperty) {
                     fun IrSimpleFunction.enqueue(description: String) {
                         findOverriddenContagiousDeclaration()?.let { enqueue(it, description) }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrDeclarationBase.kt

@@ -24,13 +24,13 @@ import org.jetbrains.kotlin.ir.declarations.impl.carriers.DeclarationCarrier
 import org.jetbrains.kotlin.ir.expressions.IrBody
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 
-abstract class IrDeclarationBase<T : DeclarationCarrier<T>>(
+abstract class IrDeclarationBase<T : DeclarationCarrier>(
     startOffset: Int,
     endOffset: Int,
     origin: IrDeclarationOrigin
 ) : IrPersistingElementBase<T>(startOffset, endOffset),
     IrDeclaration,
-    DeclarationCarrier<T> {
+    DeclarationCarrier {
 
     override var parentField: IrDeclarationParent? = null
 
@@ -75,18 +75,18 @@ abstract class IrDeclarationBase<T : DeclarationCarrier<T>>(
     }
 }
 
-abstract class IrPersistingElementBase<T : Carrier<T>>(
+abstract class IrPersistingElementBase<T : Carrier>(
     startOffset: Int,
     endOffset: Int
 ) : IrElementBase(startOffset, endOffset),
-    Carrier<T> {
+    Carrier {
 
     override var lastModified: Int = stageController.currentStage
 
     var loweredUpTo = stageController.currentStage
 
     // TODO Array<T>?
-    private var values: Array<Any?>? = null
+    private var values: Array<Carrier>? = null
 
     val createdOn: Int = stageController.currentStage
 //        get() = values?.let { (it[0] as T).lastModified } ?: lastModified
@@ -140,13 +140,7 @@ abstract class IrPersistingElementBase<T : Carrier<T>>(
         if (stage == lastModified) {
             return this as T
         } else {
-            val newValues = values?.let { oldValues ->
+            values = (values ?: emptyArray()) + this.clone() as T
-                oldValues.copyOf(oldValues.size + 1)
-            } ?: arrayOfNulls<Any?>(1)
-
-            newValues[newValues.size - 1] = this.clone()
-
-            values = newValues
         }
 
         this.lastModified = stage

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionBase.kt

@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 import org.jetbrains.kotlin.name.Name
 
-abstract class IrFunctionBase<T : FunctionBaseCarrier<T>>(
+abstract class IrFunctionBase<T : FunctionBaseCarrier>(
     startOffset: Int,
     endOffset: Int,
     origin: IrDeclarationOrigin,
@@ -40,7 +40,7 @@ abstract class IrFunctionBase<T : FunctionBaseCarrier<T>>(
 ) :
     IrDeclarationBase<T>(startOffset, endOffset, origin),
     IrFunction,
-    FunctionBaseCarrier<T> {
+    FunctionBaseCarrier {
 
     override var returnTypeFieldField: IrType = returnType
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/AnonymousInitializerCarrier.kt

@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.expressions.IrBlockBody
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 
-interface AnonymousInitializerCarrier : DeclarationCarrier<AnonymousInitializerCarrier> {
+interface AnonymousInitializerCarrier : DeclarationCarrier {
     var bodyField: IrBlockBody?
 
     override fun clone(): AnonymousInitializerCarrier {

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/BodyCarrier.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.ir.declarations.impl.carriers
 
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 
-interface BodyCarrier : Carrier<BodyCarrier> {
+interface BodyCarrier : Carrier {
 
     var containerField: IrDeclaration?
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/Carrier.kt

@@ -5,10 +5,8 @@
 
 package org.jetbrains.kotlin.ir.declarations.impl.carriers
 
-// TODO degenerify
+interface Carrier {
-// TODO degenerify
-interface Carrier<in T : Carrier<T>> {
     val lastModified: Int
 
-    fun clone(): Carrier<T>
+    fun clone(): Carrier
 }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/ClassCarrier.kt

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.types.IrType
 
-interface ClassCarrier : DeclarationCarrier<ClassCarrier> {
+interface ClassCarrier : DeclarationCarrier {
     var thisReceiverField: IrValueParameter?
     var metadataField: MetadataSource?
     var visibilityField: Visibility

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/ConstructorCarrier.kt

@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.types.IrType
 
 
-interface ConstructorCarrier : FunctionBaseCarrier<ConstructorCarrier> {
+interface ConstructorCarrier : FunctionBaseCarrier {
 
     override fun clone(): ConstructorCarrier {
         return ConstructorCarrierImpl(

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/DeclarationCarrier.kt

@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.utils.SmartList
 
-interface DeclarationCarrier<in T : DeclarationCarrier<T>>: Carrier<T> {
+interface DeclarationCarrier: Carrier {
     var parentField: IrDeclarationParent?
     var originField: IrDeclarationOrigin
     var annotationsField: List<IrConstructorCall>

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/EnumEntryCarrier.kt

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.expressions.IrExpressionBody
 
-interface EnumEntryCarrier : DeclarationCarrier<EnumEntryCarrier> {
+interface EnumEntryCarrier : DeclarationCarrier {
     var correspondingClassField: IrClass?
     var initializerExpressionField: IrExpressionBody?
     

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/ErrorCarrier.kt

@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 
-interface ErrorCarrier : DeclarationCarrier<ErrorCarrier> {
+interface ErrorCarrier : DeclarationCarrier {
 
     override fun clone(): ErrorCarrier {
         return ErrorCarrierImpl(lastModified, parentField, originField, annotationsField)
@@ -21,4 +21,4 @@ class ErrorCarrierImpl(
     override var parentField: IrDeclarationParent?,
     override var originField: IrDeclarationOrigin,
     override var annotationsField: List<IrConstructorCall>
-    ) : ErrorCarrier
+) : ErrorCarrier

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/FieldCarrier.kt

@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.expressions.IrExpressionBody
 import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
 
-interface FieldCarrier : DeclarationCarrier<FieldCarrier> {
+interface FieldCarrier : DeclarationCarrier {
     var initializerField: IrExpressionBody?
     var correspondingPropertySymbolField: IrPropertySymbol?
     var metadataField: MetadataSource?

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/FunctionBaseCarrier.kt

@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.ir.declarations.MetadataSource
 import org.jetbrains.kotlin.ir.expressions.IrBody
 import org.jetbrains.kotlin.ir.types.IrType
 
-interface FunctionBaseCarrier<T : FunctionBaseCarrier<T>> : DeclarationCarrier<T> {
+interface FunctionBaseCarrier : DeclarationCarrier {
     var returnTypeFieldField: IrType
     var dispatchReceiverParameterField: IrValueParameter?
     var extensionReceiverParameterField: IrValueParameter?

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/FunctionCarrier.kt

@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.types.IrType
 
-interface FunctionCarrier : FunctionBaseCarrier<FunctionCarrier> {
+interface FunctionCarrier : FunctionBaseCarrier {
     var correspondingPropertySymbolField: IrPropertySymbol?
     var overriddenSymbolsField: List<IrSimpleFunctionSymbol>
     var attributeOwnerIdField: IrAttributeContainer

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/LocalDelegatedPropertyCarrier.kt

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.ir.declarations.impl.carriers
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 
-interface LocalDelegatedPropertyCarrier : DeclarationCarrier<LocalDelegatedPropertyCarrier> {
+interface LocalDelegatedPropertyCarrier : DeclarationCarrier {
     var delegateField: IrVariable?
     var getterField: IrFunction?
     var setterField: IrFunction?

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/PropertyCarrier.kt

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.ir.declarations.impl.carriers
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 
-interface PropertyCarrier : DeclarationCarrier<PropertyCarrier> {
+interface PropertyCarrier : DeclarationCarrier {
     var backingFieldField: IrField?
     var getterField: IrSimpleFunction?
     var setterField: IrSimpleFunction?

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/TypeAliasCarrier.kt

@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.declarations.IrTypeParameter
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 
-interface TypeAliasCarrier : DeclarationCarrier<TypeAliasCarrier> {
+interface TypeAliasCarrier : DeclarationCarrier {
 
     var typeParametersField: List<IrTypeParameter>
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/TypeParameterCarrier.kt

@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 
-interface TypeParameterCarrier : DeclarationCarrier<TypeParameterCarrier> {
+interface TypeParameterCarrier : DeclarationCarrier {
 
     override fun clone(): TypeParameterCarrier {
         return TypeParameterCarrierImpl(lastModified, parentField, originField, annotationsField)
@@ -21,4 +21,4 @@ class TypeParameterCarrierImpl(
     override var parentField: IrDeclarationParent?,
     override var originField: IrDeclarationOrigin,
     override var annotationsField: List<IrConstructorCall>
-    ) : TypeParameterCarrier
+) : TypeParameterCarrier

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/carriers/ValueParameterCarrier.kt

@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.expressions.IrExpressionBody
 
-interface ValueParameterCarrier : DeclarationCarrier<ValueParameterCarrier> {
+interface ValueParameterCarrier : DeclarationCarrier {
     var defaultValueField: IrExpressionBody?
 
     override fun clone(): ValueParameterCarrier {