FIR2IR: Rework DelegatedMemberGenerator

Use scope content instead of manual traversing of declarations
2020-09-24 14:33:49 +03:00
parent e311a60055
commit b241161c35
11 changed files with 687 additions and 548 deletions
@@ -31,10 +31,7 @@ import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.resolve.firProvider
 import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
 import org.jetbrains.kotlin.fir.resolve.isKFunctionInvoke
-import org.jetbrains.kotlin.fir.symbols.Fir2IrConstructorSymbol
-import org.jetbrains.kotlin.fir.symbols.Fir2IrPropertySymbol
-import org.jetbrains.kotlin.fir.symbols.Fir2IrSimpleFunctionSymbol
-import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
+import org.jetbrains.kotlin.fir.symbols.*
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
@@ -82,6 +79,7 @@ class Fir2IrDeclarationStorage(
    private val initializerCache = mutableMapOf<FirAnonymousInitializer, IrAnonymousInitializer>()

    private val propertyCache = mutableMapOf<FirProperty, IrProperty>()
+    private val delegatedReverseCache = mutableMapOf<IrDeclaration, FirDeclaration>()

    private val fieldCache = mutableMapOf<FirField, IrField>()

@@ -371,10 +369,13 @@ class Fir2IrDeclarationStorage(
        }
    }

-    internal fun cacheIrSimpleFunction(function: FirSimpleFunction, irFunction: IrSimpleFunction) {
+    internal fun cacheDelegationFunction(function: FirSimpleFunction, irFunction: IrSimpleFunction) {
        functionCache[function] = irFunction
+        delegatedReverseCache[irFunction] = function
    }

+    fun originalDeclarationForDelegated(irDeclaration: IrDeclaration): FirDeclaration? = delegatedReverseCache[irDeclaration]
+
    internal fun declareIrSimpleFunction(
        signature: IdSignature?,
        containerSource: DeserializedContainerSource?,
@@ -745,8 +746,9 @@ class Fir2IrDeclarationStorage(

    fun getCachedIrProperty(property: FirProperty): IrProperty? = propertyCache[property]

-    internal fun cacheIrProperty(property: FirProperty, irProperty: IrProperty) {
+    internal fun cacheDelegatedProperty(property: FirProperty, irProperty: IrProperty) {
        propertyCache[property] = irProperty
+        delegatedReverseCache[irProperty] = property
    }

    fun getCachedIrField(field: FirField): IrField? = fieldCache[field]
@@ -754,7 +756,7 @@ class Fir2IrDeclarationStorage(
    fun createIrFieldAndDelegatedMembers(field: FirField, owner: FirClass<*>, irClass: IrClass): IrField {
        val irField = createIrField(field, origin = IrDeclarationOrigin.DELEGATE)
        irField.setAndModifyParent(irClass)
-        delegatedMemberGenerator.generate(irField, owner, irClass)
+        delegatedMemberGenerator.generate(irField, field, owner, irClass)
        return irField
    }

@@ -5,40 +5,21 @@

 package org.jetbrains.kotlin.fir.backend.generators

-import org.jetbrains.kotlin.backend.common.ir.isFinalClass
-import org.jetbrains.kotlin.backend.common.ir.isOverridable
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.fir.backend.*
-import org.jetbrains.kotlin.fir.backend.declareThisReceiverParameter
 import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.declarations.builder.buildProperty
-import org.jetbrains.kotlin.fir.declarations.builder.buildSimpleFunction
-import org.jetbrains.kotlin.fir.declarations.builder.buildValueParameterCopy
-import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl
-import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
-import org.jetbrains.kotlin.fir.symbols.CallableId
-import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
-import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
-import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
+import org.jetbrains.kotlin.fir.scopes.*
+import org.jetbrains.kotlin.fir.scopes.impl.delegatedWrapperData
+import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
+import org.jetbrains.kotlin.fir.symbols.PossiblyFirFakeOverrideSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.descriptors.WrappedPropertyDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedTypeParameterDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedValueParameterDescriptor
+import org.jetbrains.kotlin.ir.expressions.IrBlockBody
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrGetFieldImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrReturnImpl
-import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
 import org.jetbrains.kotlin.ir.types.*
-import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
-import org.jetbrains.kotlin.ir.types.impl.makeTypeProjection
-import org.jetbrains.kotlin.ir.util.*
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.types.Variance
-import org.jetbrains.kotlin.utils.DFS

 /**
 * A generator for delegated members from implementation by delegation.
@@ -52,239 +33,119 @@ internal class DelegatedMemberGenerator(
 ) : Fir2IrComponents by components {

    // Generate delegated members for [subClass]. The synthetic field [irField] has the super interface type.
-    fun generate(irField: IrField, firSubClass: FirClass<*>, subClass: IrClass) {
-        val delegateClass = (irField.type as IrSimpleTypeImpl).classOrNull?.owner ?: return
-        val subClasses = mutableMapOf(delegateClass to mutableListOf(subClass))
-        DFS.dfs(
-            listOf(delegateClass), { node -> node.superTypes.mapNotNull { it.classOrNull?.owner } },
-            object : DFS.NodeHandler<IrClass, Unit> {
-                override fun beforeChildren(current: IrClass): Boolean {
-                    for (superType in current.superTypes) {
-                        superType.classOrNull?.owner?.let { subClasses.getOrPut(it) { mutableListOf() }.add(current) }
-                    }
-                    return true
-                }
+    fun generate(irField: IrField, firField: FirField, firSubClass: FirClass<*>, subClass: IrClass) {
+        val subClassLookupTag = firSubClass.symbol.toLookupTag()

-                override fun afterChildren(current: IrClass) = Unit
-                override fun result() = Unit
-            }
-        )
+        val subClassScope = firSubClass.unsubstitutedScope(session, scopeSession)
+        subClassScope.processAllFunctions { functionSymbol ->
+            if (functionSymbol !is FirNamedFunctionSymbol) return@processAllFunctions

-        for ((superClass, mayOverride) in subClasses) {
-            val superClassId = superClass.classId ?: continue
-            if (superClassId == irBuiltIns.anyClass.owner.classId) continue
-            for (member in superClass.declarations) {
-                val delegatable = member.isDelegatable() && !DFS.ifAny(mayOverride, { subClasses[it] ?: emptyList() }) {
-                    // Delegate to the most specific version of each member.
-                    it.declarations.any { !it.isFakeOverride && it.overrides(member) }
-                }
-                if (!delegatable) continue
-                val scope = firSubClass.unsubstitutedScope(session, scopeSession)
-                if (member is IrSimpleFunction) {
-                    val firSuperFunction = declarationStorage.findOverriddenFirFunction(member, superClassId) ?: return
-                    var firSubFunction: FirSimpleFunction? = null
-                    scope.processFunctionsByName(member.name) {
-                        if (it.callableId.classId == firSubClass.classId) {
-                            var overriddenFunctionSymbol = it.overriddenSymbol
-                            while (overriddenFunctionSymbol != null) {
-                                if (overriddenFunctionSymbol.fir == firSuperFunction) {
-                                    firSubFunction = it.fir as FirSimpleFunction
-                                    break
-                                }
-                                overriddenFunctionSymbol = overriddenFunctionSymbol.overriddenSymbol
-                            }
-                        }
-                    }
-                    val irSubFunction = generateDelegatedFunction(subClass, irField, member, firSuperFunction)
-                    firSubFunction?.let { declarationStorage.cacheIrSimpleFunction(it, irSubFunction) }
-                    subClass.addMember(irSubFunction)
-                } else if (member is IrProperty) {
-                    val firSuperProperty = declarationStorage.findOverriddenFirProperty(member, superClassId) ?: return
-                    var firSubProperty: FirProperty? = null
-                    scope.processPropertiesByName(member.name) {
-                        if (it.callableId.classId == firSubClass.classId) {
-                            var overriddenPropertySymbol = it.overriddenSymbol
-                            while (overriddenPropertySymbol != null) {
-                                if (overriddenPropertySymbol.fir == firSuperProperty) {
-                                    firSubProperty = it.fir as FirProperty
-                                    break
-                                }
-                                overriddenPropertySymbol = overriddenPropertySymbol.overriddenSymbol
-                            }
-                        }
-                    }
-                    val irSubProperty = generateDelegatedProperty(subClass, irField, member, firSuperProperty)
-                    firSubProperty?.let { declarationStorage.cacheIrProperty(it, irSubProperty) }
-                }
-            }
+            val unwrapped =
+                functionSymbol
+                    .unwrapDelegateTarget(subClassLookupTag, subClassScope::getDirectOverriddenFunctions, firField, firSubClass)
+                    ?: return@processAllFunctions
+
+            val member =
+                declarationStorage.getIrFunctionSymbol(unwrapped.symbol).owner as? IrSimpleFunction
+                    ?: return@processAllFunctions
+
+            if (isJavaDefault(unwrapped)) return@processAllFunctions
+
+            val irSubFunction = generateDelegatedFunction(
+                subClass, firSubClass, irField, member, functionSymbol.fir
+            )
+
+            declarationStorage.cacheDelegationFunction(functionSymbol.fir, irSubFunction)
+            subClass.addMember(irSubFunction)
+        }
+
+        subClassScope.processAllProperties { propertySymbol ->
+            if (propertySymbol !is FirPropertySymbol) return@processAllProperties
+
+            val unwrapped =
+                propertySymbol
+                    .unwrapDelegateTarget(subClassLookupTag, subClassScope::getDirectOverriddenProperties, firField, firSubClass)
+                    ?: return@processAllProperties
+
+            val member = declarationStorage.getIrPropertySymbol(unwrapped.symbol).owner as? IrProperty
+                ?: return@processAllProperties
+
+            val irSubFunction =
+                generateDelegatedProperty(subClass, firSubClass, irField, member, propertySymbol.fir)
+
+            declarationStorage.cacheDelegatedProperty(propertySymbol.fir, irSubFunction)
+            subClass.addMember(irSubFunction)
        }
    }

-    private fun IrDeclaration.overrides(other: IrDeclaration) = when {
-        // Imported declarations have overridden symbols, so check that first.
-        this is IrProperty && other is IrProperty ->
-            getter?.let { getter -> other.getter?.symbol in getter.overriddenSymbols }
-                ?: setter?.let { setter -> other.setter?.symbol in setter.overriddenSymbols }
-                ?: false
-        this is IrSimpleFunction && other is IrSimpleFunction ->
-            other.symbol in overriddenSymbols
-        else ->
-            false
-    } || isOverriding(irBuiltIns, this, other) // TODO check if this behaves correctly with generic arguments
+    private inline fun <reified S, reified D : FirCallableDeclaration<D>> S.unwrapDelegateTarget(
+        subClassLookupTag: ConeClassLikeLookupTag,
+        noinline directOverridden: S.() -> List<S>,
+        firField: FirField,
+        firSubClass: FirClass<*>,
+    ): D? where S : FirCallableSymbol<D>, S : PossiblyFirFakeOverrideSymbol<D, S> {
+        val unwrappedIntersectionSymbol =
+            this.unwrapIntersectionOverride(directOverridden) ?: return null

-    private fun IrDeclaration.isDelegatable(): Boolean {
-        return isOverridable()
-                && !isFakeOverride
-                && !(this is IrSimpleFunction && hasDefaultImplementation())
-    }
+        val callable = unwrappedIntersectionSymbol.fir as? D ?: return null

-    private fun IrDeclaration.isOverridable(): Boolean {
-        return when (this) {
-            is IrSimpleFunction -> this.isOverridable
-            is IrProperty -> visibility != org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PRIVATE && modality != Modality.FINAL && (parent as? IrClass)?.isFinalClass != true
-            else -> false
+        val delegatedWrapperData = callable.delegatedWrapperData ?: return null
+        if (delegatedWrapperData.containingClass != subClassLookupTag) return null
+        if (delegatedWrapperData.delegateField != firField) return null
+
+        val wrapped = delegatedWrapperData.wrapped as? D ?: return null
+        val wrappedSymbol = wrapped.symbol as? S ?: return null
+
+        return when {
+            wrappedSymbol.isFakeOverride && wrappedSymbol.callableId.classId == firSubClass.classId ->
+                wrapped.symbol.overriddenSymbol!!.fir
+            else -> wrapped
        }
    }

-    private fun IrSimpleFunction.hasDefaultImplementation(): Boolean {
-        var realFunction: IrSimpleFunction? = this
-        while (realFunction != null && realFunction.isFakeOverride) {
-            realFunction = realFunction.overriddenSymbols.firstOrNull()?.owner
-        }
-        return realFunction != null
-                && (realFunction.modality != Modality.ABSTRACT && realFunction.origin == IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB
-                || realFunction.annotations.hasAnnotation(FqName("kotlin.jvm.JvmDefault")))
+    private fun isJavaDefault(function: FirSimpleFunction): Boolean {
+        if (function.symbol.isIntersectionOverride) return isJavaDefault(function.symbol.overriddenSymbol!!.fir)
+        return function.origin == FirDeclarationOrigin.Enhancement && function.modality == Modality.OPEN
+    }
+
+    private fun <S : FirCallableSymbol<*>> S.unwrapIntersectionOverride(directOverridden: S.() -> List<S>): S? {
+        if (this !is PossiblyFirFakeOverrideSymbol<*, *>) return this
+        if (this.isIntersectionOverride) return directOverridden().firstOrNull { it.fir.delegatedWrapperData != null }
+        return this
    }

    private fun generateDelegatedFunction(
        subClass: IrClass,
+        firSubClass: FirClass<*>,
        irField: IrField,
        superFunction: IrSimpleFunction,
-        firSuperFunction: FirFunction<*>
+        delegateOverride: FirSimpleFunction
    ): IrSimpleFunction {
+        val delegateFunction =
+            declarationStorage.createIrFunction(
+                delegateOverride, subClass, origin = IrDeclarationOrigin.DELEGATED_MEMBER,
+                containingClass = firSubClass.symbol.toLookupTag()
+            )
+        delegateFunction.overriddenSymbols =
+            delegateOverride.generateOverriddenFunctionSymbols(firSubClass, session, scopeSession, declarationStorage)
+
+        val body = createDelegateBody(irField, delegateFunction, superFunction)
+        delegateFunction.body = body
+        return delegateFunction
+    }
+
+    private fun createDelegateBody(
+        irField: IrField,
+        delegateFunction: IrSimpleFunction,
+        superFunction: IrSimpleFunction
+    ): IrBlockBody {
        val startOffset = irField.startOffset
        val endOffset = irField.endOffset
-        val descriptor = WrappedSimpleFunctionDescriptor()
-        val origin = IrDeclarationOrigin.DELEGATED_MEMBER
-        val modality = if (superFunction.modality == Modality.ABSTRACT) Modality.OPEN else superFunction.modality
-        // TODO: external classes, as the type parameters are converted using deserialized descriptors when used inside the classes.
-        val addTypeSubstitution = irField.type.classOrNull?.owner?.origin?.let {
-            it != IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB
-                    && it != IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB
-        } == true
-        lateinit var irTypeSubstitutor: IrTypeSubstitutor
-        val delegateFunction = symbolTable.declareSimpleFunction(descriptor) { symbol ->
-            irFactory.createFunction(
-                startOffset,
-                endOffset,
-                origin,
-                symbol,
-                superFunction.name,
-                superFunction.visibility,
-                modality,
-                superFunction.returnType,
-                superFunction.isInline,
-                superFunction.isExternal,
-                superFunction.isTailrec,
-                superFunction.isSuspend,
-                superFunction.isOperator,
-                superFunction.isInfix,
-                superFunction.isExpect
-            ).apply {
-                descriptor.bind(this)
-                declarationStorage.enterScope(this)
-                this.parent = subClass
-                overriddenSymbols = listOf(superFunction.symbol)
-                dispatchReceiverParameter = declareThisReceiverParameter(symbolTable, subClass.defaultType, origin)
-                if (addTypeSubstitution) {
-                    val substParameters = mutableListOf<IrTypeParameterSymbol>()
-                    val substArguments = mutableListOf<IrTypeArgument>()
-                    initializeTypeSubstitution(substParameters, substArguments, irField.type)
-                    typeParameters = superFunction.typeParameters.map { typeParameter ->
-                        val parameterDescriptor = WrappedTypeParameterDescriptor()
-                        symbolTable.declareScopedTypeParameter(
-                            startOffset, endOffset, origin, parameterDescriptor
-                        ) { symbol ->
-                            irFactory.createTypeParameter(
-                                startOffset,
-                                endOffset,
-                                origin,
-                                symbol,
-                                typeParameter.name,
-                                typeParameter.index,
-                                typeParameter.isReified,
-                                typeParameter.variance
-                            ).also {
-                                parameterDescriptor.bind(it)
-                                it.parent = this
-                                substParameters.add(typeParameter.symbol)
-                                substArguments.add(
-                                    makeTypeProjection(
-                                        variance = Variance.INVARIANT,
-                                        type = IrSimpleTypeImpl(it.symbol, false, emptyList(), emptyList())
-                                    )
-                                )
-                                it.superTypes += typeParameter.superTypes
-                            }
-                        }
-                    }
-                    irTypeSubstitutor = IrTypeSubstitutor(substParameters, substArguments, irBuiltIns)
-                }
-                superFunction.extensionReceiverParameter?.let {
-                    val substitutedType = if (addTypeSubstitution) irTypeSubstitutor.substitute(it.type) else it.type
-                    extensionReceiverParameter = declareThisReceiverParameter(symbolTable, substitutedType, origin)
-                }
-                valueParameters = superFunction.valueParameters.map { valueParameter ->
-                    val parameterDescriptor = WrappedValueParameterDescriptor()
-                    val substedType = if (addTypeSubstitution) irTypeSubstitutor.substitute(valueParameter.type) else valueParameter.type
-                    symbolTable.declareValueParameter(
-                        startOffset, endOffset, origin, parameterDescriptor, substedType
-                    ) { symbol ->
-                        irFactory.createValueParameter(
-                            startOffset, endOffset, origin, symbol,
-                            valueParameter.name, valueParameter.index, substedType,
-                            null, valueParameter.isCrossinline, valueParameter.isNoinline
-                        ).also {
-                            parameterDescriptor.bind(it)
-                            it.parent = this
-                        }
-                    }
-                }
-
-                val visibility = when (firSuperFunction) {
-                    is FirSimpleFunction -> firSuperFunction.status.visibility
-                    is FirPropertyAccessor -> firSuperFunction.status.visibility
-                    else -> Visibilities.Public
-                }
-                metadata = FirMetadataSource.Function(
-                    buildSimpleFunction {
-                        this.origin = FirDeclarationOrigin.Synthetic
-                        this.name = superFunction.name
-                        this.symbol = FirNamedFunctionSymbol(getCallableId(subClass, superFunction.name))
-                        this.status = FirDeclarationStatusImpl(visibility, modality)
-                        this.session = components.session
-                        this.returnTypeRef = firSuperFunction.returnTypeRef
-                        firSuperFunction.valueParameters.map { superParameter ->
-                            this.valueParameters.add(
-                                buildValueParameterCopy(superParameter) {
-                                    this.origin = FirDeclarationOrigin.Synthetic
-                                    this.session = components.session
-                                    this.symbol = FirVariableSymbol(superParameter.name)
-                                }
-                            )
-                        }
-                    }
-                )
-
-                declarationStorage.leaveScope(this)
-            }
-        }
-
        val body = irFactory.createBlockBody(startOffset, endOffset)
        val irCall = IrCallImpl(
            startOffset,
            endOffset,
-            if (addTypeSubstitution) irTypeSubstitutor.substitute(superFunction.returnType) else superFunction.returnType,
+            delegateFunction.returnType,
            superFunction.symbol,
            superFunction.typeParameters.size,
            superFunction.valueParameters.size
@@ -314,79 +175,34 @@ internal class DelegatedMemberGenerator(
            val irReturn = IrReturnImpl(startOffset, endOffset, irBuiltIns.nothingType, delegateFunction.symbol, irCall)
            body.statements.add(irReturn)
        }
-        delegateFunction.body = body
-        return delegateFunction
-    }
-
-    private fun initializeTypeSubstitution(
-        typeParameters: MutableList<IrTypeParameterSymbol>,
-        typeArguments: MutableList<IrTypeArgument>,
-        type: IrType
-    ) {
-        if (type is IrSimpleTypeImpl && type.arguments.isNotEmpty()) {
-            val classTypeParameters = type.classOrNull?.owner?.typeParameters
-            if (classTypeParameters?.size == type.arguments.size) {
-                typeParameters.addAll(classTypeParameters.map { it.symbol })
-                typeArguments.addAll(type.arguments)
-            }
-        }
+        return body
    }

    private fun generateDelegatedProperty(
        subClass: IrClass,
+        firSubClass: FirClass<*>,
        irField: IrField,
        superProperty: IrProperty,
-        firSuperProperty: FirProperty
+        firDelegateProperty: FirProperty
    ): IrProperty {
-        val startOffset = irField.startOffset
-        val endOffset = irField.endOffset
-        val descriptor = WrappedPropertyDescriptor()
-        val modality = if (superProperty.modality == Modality.ABSTRACT) Modality.OPEN else superProperty.modality
-        return symbolTable.declareProperty(
-            startOffset, endOffset,
-            IrDeclarationOrigin.DELEGATED_MEMBER, descriptor, superProperty.isDelegated
-        ) { symbol ->
-            irFactory.createProperty(
-                startOffset, endOffset, IrDeclarationOrigin.DELEGATED_MEMBER, symbol,
-                superProperty.name, superProperty.visibility,
-                modality,
-                isVar = superProperty.isVar,
-                isConst = superProperty.isConst,
-                isLateinit = superProperty.isLateinit,
-                isDelegated = superProperty.isDelegated,
-                isExternal = false,
-                isExpect = superProperty.isExpect,
-                isFakeOverride = false
-            ).apply {
-                descriptor.bind(this)
-                this.parent = subClass
-                getter = generateDelegatedFunction(subClass, irField, superProperty.getter!!, firSuperProperty.getter!!).apply {
-                    this.correspondingPropertySymbol = symbol
-                }
-                if (superProperty.isVar) {
-                    setter = generateDelegatedFunction(subClass, irField, superProperty.setter!!, firSuperProperty.setter!!).apply {
-                        this.correspondingPropertySymbol = symbol
-                    }
-                }
-                this.metadata = FirMetadataSource.Property(
-                    buildProperty {
-                        this.name = superProperty.name
-                        this.origin = FirDeclarationOrigin.Synthetic
-                        this.session = components.session
-                        this.status = FirDeclarationStatusImpl(firSuperProperty.status.visibility, modality)
-                        this.isLocal = firSuperProperty.isLocal
-                        this.returnTypeRef = firSuperProperty.returnTypeRef
-                        this.symbol = FirPropertySymbol(getCallableId(subClass, superProperty.name))
-                        this.isVar = firSuperProperty.isVar
-                    }
+        val delegateProperty =
+            declarationStorage.createIrProperty(
+                firDelegateProperty, subClass, origin = IrDeclarationOrigin.DELEGATED_MEMBER,
+                containingClass = firSubClass.symbol.toLookupTag()
+            )
+
+        delegateProperty.getter!!.body = createDelegateBody(irField, delegateProperty.getter!!, superProperty.getter!!)
+        delegateProperty.getter!!.overriddenSymbols =
+            firDelegateProperty.generateOverriddenAccessorSymbols(firSubClass, isGetter = true, session, scopeSession, declarationStorage)
+        if (delegateProperty.isVar) {
+            delegateProperty.setter!!.body = createDelegateBody(irField, delegateProperty.setter!!, superProperty.setter!!)
+            delegateProperty.setter!!.overriddenSymbols =
+                firDelegateProperty.generateOverriddenAccessorSymbols(
+                    firSubClass, isGetter = false, session, scopeSession, declarationStorage
                )
-                subClass.addMember(this)
-            }
        }
+
+        return delegateProperty
    }

-    private fun getCallableId(irClass: IrClass, name: Name): CallableId {
-        val classId = irClass.classId
-        return if (classId != null) CallableId(classId, name) else CallableId(name)
-    }
 }
@@ -5,6 +5,8 @@

 package org.jetbrains.kotlin.fir.scopes

+import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
 import org.jetbrains.kotlin.name.Name

 interface FirContainingNamesAwareScope {
@@ -18,3 +20,27 @@ fun FirScope.getContainingCallableNamesIfPresent(): Set<Name> =

 fun FirScope.getContainingClassifierNamesIfPresent(): Set<Name> =
    if (this is FirContainingNamesAwareScope) getClassifierNames() else emptySet()
+
+fun <S> S.processAllFunctions(processor: (FirFunctionSymbol<*>) -> Unit) where S : FirScope, S : FirContainingNamesAwareScope {
+    for (name in getCallableNames()) {
+        processFunctionsByName(name, processor)
+    }
+}
+
+fun <S> S.processAllProperties(processor: (FirVariableSymbol<*>) -> Unit) where S : FirScope, S : FirContainingNamesAwareScope {
+    for (name in getCallableNames()) {
+        processPropertiesByName(name, processor)
+    }
+}
+
+fun <S> S.collectAllFunctions(): Collection<FirFunctionSymbol<*>> where S : FirScope, S : FirContainingNamesAwareScope {
+    return mutableListOf<FirFunctionSymbol<*>>().apply {
+        processAllFunctions(this::add)
+    }
+}
+
+fun <S> S.collectAllProperties(): Collection<FirVariableSymbol<*>> where S : FirScope, S : FirContainingNamesAwareScope {
+    return mutableListOf<FirVariableSymbol<*>>().apply {
+        processAllProperties(this::add)
+    }
+}
@@ -52,10 +52,10 @@ FILE fqName:<root> fileName:/delegatedGenericImplementation.kt
    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <B> ($this:<root>.Test1<E of <root>.Test1>, a:E of <root>.Test1, b:B of <root>.Test1.foo) returnType:kotlin.Unit
      overridden:
        public abstract fun foo <B> (a: A of <root>.IBase, b: B of <root>.IBase.foo): kotlin.Unit declared in <root>.IBase
-      TYPE_PARAMETER DELEGATED_MEMBER name:B index:0 variance: superTypes:[kotlin.Any?]
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test1<E of <root>.Test1>
-      VALUE_PARAMETER DELEGATED_MEMBER name:a index:0 type:E of <root>.Test1
-      VALUE_PARAMETER DELEGATED_MEMBER name:b index:1 type:B of <root>.Test1.foo
+      TYPE_PARAMETER name:B index:0 variance: superTypes:[kotlin.Any?]
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1<E of <root>.Test1>
+      VALUE_PARAMETER name:a index:0 type:E of <root>.Test1
+      VALUE_PARAMETER name:b index:1 type:B of <root>.Test1.foo
      BLOCK_BODY
        CALL 'public abstract fun foo <B> (a: A of <root>.IBase, b: B of <root>.IBase.foo): kotlin.Unit declared in <root>.IBase' type=kotlin.Unit origin=null
          <B>: <none>
@@ -63,65 +63,81 @@ FILE fqName:<root> fileName:/delegatedGenericImplementation.kt
            receiver: GET_VAR '<this>: <root>.Test1<E of <root>.Test1> declared in <root>.Test1.foo' type=<root>.Test1<E of <root>.Test1> origin=null
          a: GET_VAR 'a: E of <root>.Test1 declared in <root>.Test1.foo' type=E of <root>.Test1 origin=null
          b: GET_VAR 'b: B of <root>.Test1.foo declared in <root>.Test1.foo' type=B of <root>.Test1.foo origin=null
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test1<E of <root>.Test1>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1<E of <root>.Test1>
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Test1'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<E of <root>.Test1> visibility:local [final]' type=<root>.IBase<E of <root>.Test1> origin=null
+              receiver: GET_VAR '<this>: <root>.Test1<E of <root>.Test1> declared in <root>.Test1.equals' type=<root>.Test1<E of <root>.Test1> origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.Test1.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test1<E of <root>.Test1>) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1<E of <root>.Test1>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test1'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<E of <root>.Test1> visibility:local [final]' type=<root>.IBase<E of <root>.Test1> origin=null
+              receiver: GET_VAR '<this>: <root>.Test1<E of <root>.Test1> declared in <root>.Test1.hashCode' type=<root>.Test1<E of <root>.Test1> origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test1<E of <root>.Test1>) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1<E of <root>.Test1>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test1'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<E of <root>.Test1> visibility:local [final]' type=<root>.IBase<E of <root>.Test1> origin=null
+              receiver: GET_VAR '<this>: <root>.Test1<E of <root>.Test1> declared in <root>.Test1.toString' type=<root>.Test1<E of <root>.Test1> origin=null
    PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val]
-      FUN DELEGATED_MEMBER name:<get-id> visibility:public modality:OPEN <C> ($this:<root>.Test1<E of <root>.Test1>, $receiver:C of <root>.Test1.<get-id>) returnType:kotlin.collections.Map<A of <root>.IBase, C of <root>.IBase.<get-id>>?
+      FUN DELEGATED_MEMBER name:<get-id> visibility:public modality:OPEN <C> ($this:<root>.Test1<E of <root>.Test1>, $receiver:C of <root>.Test1.<get-id>) returnType:kotlin.collections.Map<E of <root>.Test1, C of <root>.Test1.<get-id>>?
        correspondingProperty: PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val]
        overridden:
          public abstract fun <get-id> <C> (): kotlin.collections.Map<A of <root>.IBase, C of <root>.IBase.<get-id>>? declared in <root>.IBase
-        TYPE_PARAMETER DELEGATED_MEMBER name:C index:0 variance: superTypes:[kotlin.Any?]
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test1<E of <root>.Test1>
-        $receiver: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:C of <root>.Test1.<get-id>
+        TYPE_PARAMETER name:C index:0 variance: superTypes:[kotlin.Any?]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Test1<E of <root>.Test1>
+        $receiver: VALUE_PARAMETER name:<this> type:C of <root>.Test1.<get-id>
        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-id> <C> (): kotlin.collections.Map<A of <root>.IBase, C of <root>.IBase.<get-id>>? declared in <root>.Test1'
+          RETURN type=kotlin.Nothing from='public open fun <get-id> <C> (): kotlin.collections.Map<E of <root>.Test1, C of <root>.Test1.<get-id>>? declared in <root>.Test1'
            CALL 'public abstract fun <get-id> <C> (): kotlin.collections.Map<A of <root>.IBase, C of <root>.IBase.<get-id>>? declared in <root>.IBase' type=kotlin.collections.Map<E of <root>.Test1, C of <root>.Test1.<get-id>>? origin=null
              <C>: <none>
              $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<E of <root>.Test1> visibility:local [final]' type=<root>.IBase<E of <root>.Test1> origin=null
                receiver: GET_VAR '<this>: <root>.Test1<E of <root>.Test1> declared in <root>.Test1.<get-id>' type=<root>.Test1<E of <root>.Test1> origin=null
              $receiver: GET_VAR '<this>: C of <root>.Test1.<get-id> declared in <root>.Test1.<get-id>' type=C of <root>.Test1.<get-id> origin=null
    PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [var]
-      FUN DELEGATED_MEMBER name:<get-x> visibility:public modality:OPEN <D> ($this:<root>.Test1<E of <root>.Test1>, $receiver:kotlin.collections.List<D of <root>.Test1.<get-x>>) returnType:D of <root>.IBase.<get-x>?
+      FUN DELEGATED_MEMBER name:<get-x> visibility:public modality:OPEN <D> ($this:<root>.Test1<E of <root>.Test1>, $receiver:kotlin.collections.List<D of <root>.Test1.<get-x>>) returnType:D of <root>.Test1.<get-x>?
        correspondingProperty: PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [var]
        overridden:
          public abstract fun <get-x> <D> (): D of <root>.IBase.<get-x>? declared in <root>.IBase
-        TYPE_PARAMETER DELEGATED_MEMBER name:D index:0 variance: superTypes:[kotlin.Any?]
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test1<E of <root>.Test1>
-        $receiver: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:kotlin.collections.List<D of <root>.Test1.<get-x>>
+        TYPE_PARAMETER name:D index:0 variance: superTypes:[kotlin.Any?]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Test1<E of <root>.Test1>
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.collections.List<D of <root>.Test1.<get-x>>
        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-x> <D> (): D of <root>.IBase.<get-x>? declared in <root>.Test1'
+          RETURN type=kotlin.Nothing from='public open fun <get-x> <D> (): D of <root>.Test1.<get-x>? declared in <root>.Test1'
            CALL 'public abstract fun <get-x> <D> (): D of <root>.IBase.<get-x>? declared in <root>.IBase' type=D of <root>.Test1.<get-x>? origin=null
              <D>: <none>
              $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<E of <root>.Test1> visibility:local [final]' type=<root>.IBase<E of <root>.Test1> origin=null
                receiver: GET_VAR '<this>: <root>.Test1<E of <root>.Test1> declared in <root>.Test1.<get-x>' type=<root>.Test1<E of <root>.Test1> origin=null
              $receiver: GET_VAR '<this>: kotlin.collections.List<D of <root>.Test1.<get-x>> declared in <root>.Test1.<get-x>' type=kotlin.collections.List<D of <root>.Test1.<get-x>> origin=null
-      FUN DELEGATED_MEMBER name:<set-x> visibility:public modality:OPEN <D> ($this:<root>.Test1<E of <root>.Test1>, $receiver:kotlin.collections.List<D of <root>.Test1.<set-x>>, <set-?>:D of <root>.Test1.<set-x>?) returnType:kotlin.Unit
+      FUN DELEGATED_MEMBER name:<set-x> visibility:public modality:OPEN <D> ($this:<root>.Test1<E of <root>.Test1>, $receiver:kotlin.collections.List<D of <root>.Test1.<get-x>>, <set-?>:D of <root>.Test1.<set-x>?) returnType:kotlin.Unit
        correspondingProperty: PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [var]
        overridden:
          public abstract fun <set-x> <D> (<set-?>: D of <root>.IBase.<set-x>?): kotlin.Unit declared in <root>.IBase
-        TYPE_PARAMETER DELEGATED_MEMBER name:D index:0 variance: superTypes:[kotlin.Any?]
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test1<E of <root>.Test1>
-        $receiver: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:kotlin.collections.List<D of <root>.Test1.<set-x>>
-        VALUE_PARAMETER DELEGATED_MEMBER name:<set-?> index:0 type:D of <root>.Test1.<set-x>?
+        TYPE_PARAMETER name:D index:0 variance: superTypes:[kotlin.Any?]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Test1<E of <root>.Test1>
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.collections.List<D of <root>.Test1.<get-x>>
+        VALUE_PARAMETER name:<set-?> index:0 type:D of <root>.Test1.<set-x>?
        BLOCK_BODY
          CALL 'public abstract fun <set-x> <D> (<set-?>: D of <root>.IBase.<set-x>?): kotlin.Unit declared in <root>.IBase' type=kotlin.Unit origin=null
            <D>: <none>
            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<E of <root>.Test1> visibility:local [final]' type=<root>.IBase<E of <root>.Test1> origin=null
              receiver: GET_VAR '<this>: <root>.Test1<E of <root>.Test1> declared in <root>.Test1.<set-x>' type=<root>.Test1<E of <root>.Test1> origin=null
-            $receiver: GET_VAR '<this>: kotlin.collections.List<D of <root>.Test1.<set-x>> declared in <root>.Test1.<set-x>' type=kotlin.collections.List<D of <root>.Test1.<set-x>> origin=null
+            $receiver: GET_VAR '<this>: kotlin.collections.List<D of <root>.Test1.<get-x>> declared in <root>.Test1.<set-x>' type=kotlin.collections.List<D of <root>.Test1.<get-x>> origin=null
            <set-?>: GET_VAR '<set-?>: D of <root>.Test1.<set-x>? declared in <root>.Test1.<set-x>' type=D of <root>.Test1.<set-x>? origin=null
    FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<E of <root>.Test1> visibility:local [final]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
  CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[<root>.IBase<kotlin.String>]
    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2
    CONSTRUCTOR visibility:public <> (j:<root>.IBase<kotlin.String>) returnType:<root>.Test2 [primary]
@@ -154,10 +170,10 @@ FILE fqName:<root> fileName:/delegatedGenericImplementation.kt
    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <B> ($this:<root>.Test2, a:kotlin.String, b:B of <root>.Test2.foo) returnType:kotlin.Unit
      overridden:
        public abstract fun foo <B> (a: A of <root>.IBase, b: B of <root>.IBase.foo): kotlin.Unit declared in <root>.IBase
-      TYPE_PARAMETER DELEGATED_MEMBER name:B index:0 variance: superTypes:[kotlin.Any?]
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test2
-      VALUE_PARAMETER DELEGATED_MEMBER name:a index:0 type:kotlin.String
-      VALUE_PARAMETER DELEGATED_MEMBER name:b index:1 type:B of <root>.Test2.foo
+      TYPE_PARAMETER name:B index:0 variance: superTypes:[kotlin.Any?]
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+      VALUE_PARAMETER name:a index:0 type:kotlin.String
+      VALUE_PARAMETER name:b index:1 type:B of <root>.Test2.foo
      BLOCK_BODY
        CALL 'public abstract fun foo <B> (a: A of <root>.IBase, b: B of <root>.IBase.foo): kotlin.Unit declared in <root>.IBase' type=kotlin.Unit origin=null
          <B>: <none>
@@ -165,62 +181,78 @@ FILE fqName:<root> fileName:/delegatedGenericImplementation.kt
            receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.foo' type=<root>.Test2 origin=null
          a: GET_VAR 'a: kotlin.String declared in <root>.Test2.foo' type=kotlin.String origin=null
          b: GET_VAR 'b: B of <root>.Test2.foo declared in <root>.Test2.foo' type=B of <root>.Test2.foo origin=null
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test2, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Test2'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<kotlin.String> visibility:local [final]' type=<root>.IBase<kotlin.String> origin=null
+              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.equals' type=<root>.Test2 origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.Test2.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test2'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<kotlin.String> visibility:local [final]' type=<root>.IBase<kotlin.String> origin=null
+              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.hashCode' type=<root>.Test2 origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test2'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<kotlin.String> visibility:local [final]' type=<root>.IBase<kotlin.String> origin=null
+              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.toString' type=<root>.Test2 origin=null
    PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val]
-      FUN DELEGATED_MEMBER name:<get-id> visibility:public modality:OPEN <C> ($this:<root>.Test2, $receiver:C of <root>.Test2.<get-id>) returnType:kotlin.collections.Map<A of <root>.IBase, C of <root>.IBase.<get-id>>?
+      FUN DELEGATED_MEMBER name:<get-id> visibility:public modality:OPEN <C> ($this:<root>.Test2, $receiver:C of <root>.Test2.<get-id>) returnType:kotlin.collections.Map<kotlin.String, C of <root>.Test2.<get-id>>?
        correspondingProperty: PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val]
        overridden:
          public abstract fun <get-id> <C> (): kotlin.collections.Map<A of <root>.IBase, C of <root>.IBase.<get-id>>? declared in <root>.IBase
-        TYPE_PARAMETER DELEGATED_MEMBER name:C index:0 variance: superTypes:[kotlin.Any?]
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test2
-        $receiver: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:C of <root>.Test2.<get-id>
+        TYPE_PARAMETER name:C index:0 variance: superTypes:[kotlin.Any?]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+        $receiver: VALUE_PARAMETER name:<this> type:C of <root>.Test2.<get-id>
        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-id> <C> (): kotlin.collections.Map<A of <root>.IBase, C of <root>.IBase.<get-id>>? declared in <root>.Test2'
+          RETURN type=kotlin.Nothing from='public open fun <get-id> <C> (): kotlin.collections.Map<kotlin.String, C of <root>.Test2.<get-id>>? declared in <root>.Test2'
            CALL 'public abstract fun <get-id> <C> (): kotlin.collections.Map<A of <root>.IBase, C of <root>.IBase.<get-id>>? declared in <root>.IBase' type=kotlin.collections.Map<kotlin.String, C of <root>.Test2.<get-id>>? origin=null
              <C>: <none>
              $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<kotlin.String> visibility:local [final]' type=<root>.IBase<kotlin.String> origin=null
                receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.<get-id>' type=<root>.Test2 origin=null
              $receiver: GET_VAR '<this>: C of <root>.Test2.<get-id> declared in <root>.Test2.<get-id>' type=C of <root>.Test2.<get-id> origin=null
    PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [var]
-      FUN DELEGATED_MEMBER name:<get-x> visibility:public modality:OPEN <D> ($this:<root>.Test2, $receiver:kotlin.collections.List<D of <root>.Test2.<get-x>>) returnType:D of <root>.IBase.<get-x>?
+      FUN DELEGATED_MEMBER name:<get-x> visibility:public modality:OPEN <D> ($this:<root>.Test2, $receiver:kotlin.collections.List<D of <root>.Test2.<get-x>>) returnType:D of <root>.Test2.<get-x>?
        correspondingProperty: PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [var]
        overridden:
          public abstract fun <get-x> <D> (): D of <root>.IBase.<get-x>? declared in <root>.IBase
-        TYPE_PARAMETER DELEGATED_MEMBER name:D index:0 variance: superTypes:[kotlin.Any?]
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test2
-        $receiver: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:kotlin.collections.List<D of <root>.Test2.<get-x>>
+        TYPE_PARAMETER name:D index:0 variance: superTypes:[kotlin.Any?]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.collections.List<D of <root>.Test2.<get-x>>
        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-x> <D> (): D of <root>.IBase.<get-x>? declared in <root>.Test2'
+          RETURN type=kotlin.Nothing from='public open fun <get-x> <D> (): D of <root>.Test2.<get-x>? declared in <root>.Test2'
            CALL 'public abstract fun <get-x> <D> (): D of <root>.IBase.<get-x>? declared in <root>.IBase' type=D of <root>.Test2.<get-x>? origin=null
              <D>: <none>
              $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<kotlin.String> visibility:local [final]' type=<root>.IBase<kotlin.String> origin=null
                receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.<get-x>' type=<root>.Test2 origin=null
              $receiver: GET_VAR '<this>: kotlin.collections.List<D of <root>.Test2.<get-x>> declared in <root>.Test2.<get-x>' type=kotlin.collections.List<D of <root>.Test2.<get-x>> origin=null
-      FUN DELEGATED_MEMBER name:<set-x> visibility:public modality:OPEN <D> ($this:<root>.Test2, $receiver:kotlin.collections.List<D of <root>.Test2.<set-x>>, <set-?>:D of <root>.Test2.<set-x>?) returnType:kotlin.Unit
+      FUN DELEGATED_MEMBER name:<set-x> visibility:public modality:OPEN <D> ($this:<root>.Test2, $receiver:kotlin.collections.List<D of <root>.Test2.<get-x>>, <set-?>:D of <root>.Test2.<set-x>?) returnType:kotlin.Unit
        correspondingProperty: PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [var]
        overridden:
          public abstract fun <set-x> <D> (<set-?>: D of <root>.IBase.<set-x>?): kotlin.Unit declared in <root>.IBase
-        TYPE_PARAMETER DELEGATED_MEMBER name:D index:0 variance: superTypes:[kotlin.Any?]
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test2
-        $receiver: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:kotlin.collections.List<D of <root>.Test2.<set-x>>
-        VALUE_PARAMETER DELEGATED_MEMBER name:<set-?> index:0 type:D of <root>.Test2.<set-x>?
+        TYPE_PARAMETER name:D index:0 variance: superTypes:[kotlin.Any?]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.collections.List<D of <root>.Test2.<get-x>>
+        VALUE_PARAMETER name:<set-?> index:0 type:D of <root>.Test2.<set-x>?
        BLOCK_BODY
          CALL 'public abstract fun <set-x> <D> (<set-?>: D of <root>.IBase.<set-x>?): kotlin.Unit declared in <root>.IBase' type=kotlin.Unit origin=null
            <D>: <none>
            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<kotlin.String> visibility:local [final]' type=<root>.IBase<kotlin.String> origin=null
              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.<set-x>' type=<root>.Test2 origin=null
-            $receiver: GET_VAR '<this>: kotlin.collections.List<D of <root>.Test2.<set-x>> declared in <root>.Test2.<set-x>' type=kotlin.collections.List<D of <root>.Test2.<set-x>> origin=null
+            $receiver: GET_VAR '<this>: kotlin.collections.List<D of <root>.Test2.<get-x>> declared in <root>.Test2.<set-x>' type=kotlin.collections.List<D of <root>.Test2.<get-x>> origin=null
            <set-?>: GET_VAR '<set-?>: D of <root>.Test2.<set-x>? declared in <root>.Test2.<set-x>' type=D of <root>.Test2.<set-x>? origin=null
    FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<kotlin.String> visibility:local [final]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
@@ -206,9 +206,9 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.Test1, x:kotlin.Int, s:kotlin.String) returnType:kotlin.Unit
      overridden:
        public abstract fun foo (x: kotlin.Int, s: kotlin.String): kotlin.Unit declared in <root>.IBase
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test1
-      VALUE_PARAMETER DELEGATED_MEMBER name:x index:0 type:kotlin.Int
-      VALUE_PARAMETER DELEGATED_MEMBER name:s index:1 type:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
+      VALUE_PARAMETER name:x index:0 type:kotlin.Int
+      VALUE_PARAMETER name:s index:1 type:kotlin.String
      BLOCK_BODY
        CALL 'public abstract fun foo (x: kotlin.Int, s: kotlin.String): kotlin.Unit declared in <root>.IBase' type=kotlin.Unit origin=null
          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
@@ -218,7 +218,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
    FUN DELEGATED_MEMBER name:bar visibility:public modality:OPEN <> ($this:<root>.Test1) returnType:kotlin.Int
      overridden:
        public abstract fun bar (): kotlin.Int declared in <root>.IBase
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test1
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='public open fun bar (): kotlin.Int declared in <root>.Test1'
          CALL 'public abstract fun bar (): kotlin.Int declared in <root>.IBase' type=kotlin.Int origin=null
@@ -227,27 +227,43 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
    FUN DELEGATED_MEMBER name:qux visibility:public modality:OPEN <> ($this:<root>.Test1, $receiver:kotlin.String) returnType:kotlin.Unit
      overridden:
        public abstract fun qux (): kotlin.Unit declared in <root>.IBase
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test1
-      $receiver: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
+      $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
      BLOCK_BODY
        CALL 'public abstract fun qux (): kotlin.Unit declared in <root>.IBase' type=kotlin.Unit origin=null
          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
            receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.qux' type=<root>.Test1 origin=null
          $receiver: GET_VAR '<this>: kotlin.String declared in <root>.Test1.qux' type=kotlin.String origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test1, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
      overridden:
        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Test1'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
+              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.equals' type=<root>.Test1 origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.Test1.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test1) returnType:kotlin.Int
      overridden:
        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test1'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
+              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test1) returnType:kotlin.String
      overridden:
        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test1'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
+              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]
  CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[<root>.IBase; <root>.IOther]
    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2
    CONSTRUCTOR visibility:public <> () returnType:<root>.Test2 [primary]
@@ -265,9 +281,9 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.Test2, x:kotlin.Int, s:kotlin.String) returnType:kotlin.Unit
      overridden:
        public abstract fun foo (x: kotlin.Int, s: kotlin.String): kotlin.Unit declared in <root>.IBase
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test2
-      VALUE_PARAMETER DELEGATED_MEMBER name:x index:0 type:kotlin.Int
-      VALUE_PARAMETER DELEGATED_MEMBER name:s index:1 type:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+      VALUE_PARAMETER name:x index:0 type:kotlin.Int
+      VALUE_PARAMETER name:s index:1 type:kotlin.String
      BLOCK_BODY
        CALL 'public abstract fun foo (x: kotlin.Int, s: kotlin.String): kotlin.Unit declared in <root>.IBase' type=kotlin.Unit origin=null
          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
@@ -277,7 +293,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
    FUN DELEGATED_MEMBER name:bar visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.Int
      overridden:
        public abstract fun bar (): kotlin.Int declared in <root>.IBase
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test2
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='public open fun bar (): kotlin.Int declared in <root>.Test2'
          CALL 'public abstract fun bar (): kotlin.Int declared in <root>.IBase' type=kotlin.Int origin=null
@@ -286,20 +302,49 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
    FUN DELEGATED_MEMBER name:qux visibility:public modality:OPEN <> ($this:<root>.Test2, $receiver:kotlin.String) returnType:kotlin.Unit
      overridden:
        public abstract fun qux (): kotlin.Unit declared in <root>.IBase
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test2
-      $receiver: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+      $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
      BLOCK_BODY
        CALL 'public abstract fun qux (): kotlin.Unit declared in <root>.IBase' type=kotlin.Unit origin=null
          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
            receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.qux' type=<root>.Test2 origin=null
          $receiver: GET_VAR '<this>: kotlin.String declared in <root>.Test2.qux' type=kotlin.String origin=null
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test2, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Test2'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
+              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.equals' type=<root>.Test2 origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.Test2.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test2'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
+              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.hashCode' type=<root>.Test2 origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test2'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]' type=<root>.IBase origin=null
+              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.toString' type=<root>.Test2 origin=null
    FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase visibility:local [final]
    PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [val]
      FUN DELEGATED_MEMBER name:<get-x> visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.String
        correspondingProperty: PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [val]
        overridden:
          public abstract fun <get-x> (): kotlin.String declared in <root>.IOther
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test2
+        $this: VALUE_PARAMETER name:<this> type:<root>.Test2
        BLOCK_BODY
          RETURN type=kotlin.Nothing from='public open fun <get-x> (): kotlin.String declared in <root>.Test2'
            CALL 'public abstract fun <get-x> (): kotlin.String declared in <root>.IOther' type=kotlin.String origin=null
@@ -310,7 +355,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
        correspondingProperty: PROPERTY DELEGATED_MEMBER name:y visibility:public modality:OPEN [var]
        overridden:
          public abstract fun <get-y> (): kotlin.Int declared in <root>.IOther
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test2
+        $this: VALUE_PARAMETER name:<this> type:<root>.Test2
        BLOCK_BODY
          RETURN type=kotlin.Nothing from='public open fun <get-y> (): kotlin.Int declared in <root>.Test2'
            CALL 'public abstract fun <get-y> (): kotlin.Int declared in <root>.IOther' type=kotlin.Int origin=null
@@ -320,8 +365,8 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
        correspondingProperty: PROPERTY DELEGATED_MEMBER name:y visibility:public modality:OPEN [var]
        overridden:
          public abstract fun <set-y> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.IOther
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test2
-        VALUE_PARAMETER DELEGATED_MEMBER name:<set-?> index:0 type:kotlin.Int
+        $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
        BLOCK_BODY
          CALL 'public abstract fun <set-y> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.IOther' type=kotlin.Unit origin=null
            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_1> type:<root>.IOther visibility:local [final]' type=<root>.IOther origin=null
@@ -332,8 +377,8 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
        correspondingProperty: PROPERTY DELEGATED_MEMBER name:z1 visibility:public modality:OPEN [val]
        overridden:
          public abstract fun <get-z1> (): kotlin.Int declared in <root>.IOther
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test2
-        $receiver: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:kotlin.Byte
+        $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.Byte
        BLOCK_BODY
          RETURN type=kotlin.Nothing from='public open fun <get-z1> (): kotlin.Int declared in <root>.Test2'
            CALL 'public abstract fun <get-z1> (): kotlin.Int declared in <root>.IOther' type=kotlin.Int origin=null
@@ -345,8 +390,8 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
        correspondingProperty: PROPERTY DELEGATED_MEMBER name:z2 visibility:public modality:OPEN [var]
        overridden:
          public abstract fun <get-z2> (): kotlin.Int declared in <root>.IOther
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test2
-        $receiver: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:kotlin.Byte
+        $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.Byte
        BLOCK_BODY
          RETURN type=kotlin.Nothing from='public open fun <get-z2> (): kotlin.Int declared in <root>.Test2'
            CALL 'public abstract fun <get-z2> (): kotlin.Int declared in <root>.IOther' type=kotlin.Int origin=null
@@ -357,9 +402,9 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
        correspondingProperty: PROPERTY DELEGATED_MEMBER name:z2 visibility:public modality:OPEN [var]
        overridden:
          public abstract fun <set-z2> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.IOther
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test2
-        $receiver: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:kotlin.Byte
-        VALUE_PARAMETER DELEGATED_MEMBER name:<set-?> index:0 type:kotlin.Int
+        $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.Byte
+        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
        BLOCK_BODY
          CALL 'public abstract fun <set-z2> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.IOther' type=kotlin.Unit origin=null
            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_1> type:<root>.IOther visibility:local [final]' type=<root>.IOther origin=null
@@ -367,16 +412,3 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
            $receiver: GET_VAR '<this>: kotlin.Byte declared in <root>.Test2.<set-z2>' type=kotlin.Byte origin=null
            <set-?>: GET_VAR '<set-?>: kotlin.Int declared in <root>.Test2.<set-z2>' type=kotlin.Int origin=null
    FIELD DELEGATE name:<$$delegate_1> type:<root>.IOther visibility:local [final]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
@@ -20,44 +20,90 @@ FILE fqName:<root> fileName:/delegatedImplementationOfJavaInterface.kt
          RETURN type=kotlin.Nothing from='private final fun <get-j> (): <root>.J declared in <root>.Test'
            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:j type:<root>.J visibility:private [final]' type=<root>.J origin=null
              receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.<get-j>' type=<root>.Test origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]
-    FUN FAKE_OVERRIDE name:takeNotNull visibility:public modality:OPEN <> ($this:<root>.J, x:kotlin.String) returnType:kotlin.Unit [fake_override]
+    FUN DELEGATED_MEMBER name:takeNotNull visibility:public modality:OPEN <> ($this:<root>.Test, x:kotlin.String) returnType:kotlin.Unit
      overridden:
        public abstract fun takeNotNull (x: kotlin.String): kotlin.Unit declared in <root>.J
-      $this: VALUE_PARAMETER name:<this> type:<root>.J
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test
      VALUE_PARAMETER name:x index:0 type:kotlin.String
-    FUN FAKE_OVERRIDE name:takeNullable visibility:public modality:OPEN <> ($this:<root>.J, x:kotlin.String?) returnType:kotlin.Unit [fake_override]
+      BLOCK_BODY
+        CALL 'public abstract fun takeNotNull (x: kotlin.String): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
+            receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.takeNotNull' type=<root>.Test origin=null
+          x: GET_VAR 'x: kotlin.String declared in <root>.Test.takeNotNull' type=kotlin.String origin=null
+    FUN DELEGATED_MEMBER name:takeNullable visibility:public modality:OPEN <> ($this:<root>.Test, x:kotlin.String?) returnType:kotlin.Unit
      overridden:
        public abstract fun takeNullable (x: kotlin.String?): kotlin.Unit declared in <root>.J
-      $this: VALUE_PARAMETER name:<this> type:<root>.J
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test
      VALUE_PARAMETER name:x index:0 type:kotlin.String?
-    FUN FAKE_OVERRIDE name:takeFlexible visibility:public modality:OPEN <> ($this:<root>.J, x:kotlin.String?) returnType:kotlin.Unit [fake_override]
+      BLOCK_BODY
+        CALL 'public abstract fun takeNullable (x: kotlin.String?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
+            receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.takeNullable' type=<root>.Test origin=null
+          x: GET_VAR 'x: kotlin.String? declared in <root>.Test.takeNullable' type=kotlin.String? origin=null
+    FUN DELEGATED_MEMBER name:takeFlexible visibility:public modality:OPEN <> ($this:<root>.Test, x:kotlin.String?) returnType:kotlin.Unit
      overridden:
        public abstract fun takeFlexible (x: kotlin.String?): kotlin.Unit declared in <root>.J
-      $this: VALUE_PARAMETER name:<this> type:<root>.J
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test
      VALUE_PARAMETER name:x index:0 type:kotlin.String?
-    FUN FAKE_OVERRIDE name:returnNotNull visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.String [fake_override]
+      BLOCK_BODY
+        CALL 'public abstract fun takeFlexible (x: kotlin.String?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
+            receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.takeFlexible' type=<root>.Test origin=null
+          x: GET_VAR 'x: kotlin.String? declared in <root>.Test.takeFlexible' type=kotlin.String? origin=null
+    FUN DELEGATED_MEMBER name:returnNotNull visibility:public modality:OPEN <> ($this:<root>.Test) returnType:kotlin.String
      overridden:
        public abstract fun returnNotNull (): kotlin.String declared in <root>.J
-      $this: VALUE_PARAMETER name:<this> type:<root>.J
-    FUN FAKE_OVERRIDE name:returnNullable visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.String? [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun returnNotNull (): kotlin.String declared in <root>.Test'
+          CALL 'public abstract fun returnNotNull (): kotlin.String declared in <root>.J' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
+              receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.returnNotNull' type=<root>.Test origin=null
+    FUN DELEGATED_MEMBER name:returnNullable visibility:public modality:OPEN <> ($this:<root>.Test) returnType:kotlin.String?
      overridden:
        public abstract fun returnNullable (): kotlin.String? declared in <root>.J
-      $this: VALUE_PARAMETER name:<this> type:<root>.J
-    FUN FAKE_OVERRIDE name:returnsFlexible visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.String? [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun returnNullable (): kotlin.String? declared in <root>.Test'
+          CALL 'public abstract fun returnNullable (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
+              receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.returnNullable' type=<root>.Test origin=null
+    FUN DELEGATED_MEMBER name:returnsFlexible visibility:public modality:OPEN <> ($this:<root>.Test) returnType:kotlin.String?
      overridden:
        public abstract fun returnsFlexible (): kotlin.String? declared in <root>.J
-      $this: VALUE_PARAMETER name:<this> type:<root>.J
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun returnsFlexible (): kotlin.String? declared in <root>.Test'
+          CALL 'public abstract fun returnsFlexible (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
+              receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.returnsFlexible' type=<root>.Test origin=null
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
      overridden:
        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test
      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Test'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
+              receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.equals' type=<root>.Test origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.Test.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test) returnType:kotlin.Int
      overridden:
        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
+              receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.hashCode' type=<root>.Test origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test) returnType:kotlin.String
      overridden:
        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]' type=<root>.J origin=null
+              receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.toString' type=<root>.Test origin=null
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.J visibility:local [final]
@@ -64,22 +64,38 @@ FILE fqName:<root> fileName:/delegatedImplementationWithExplicitOverride.kt
    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.Unit
      overridden:
        public abstract fun foo (): kotlin.Unit declared in <root>.IFooBar
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.C
+      $this: VALUE_PARAMETER name:<this> type:<root>.C
      BLOCK_BODY
        CALL 'public abstract fun foo (): kotlin.Unit declared in <root>.IFooBar' type=kotlin.Unit origin=null
          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFooBar visibility:local [final]' type=<root>.IFooBar origin=null
            receiver: GET_VAR '<this>: <root>.C declared in <root>.C.foo' type=<root>.C origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFooBar visibility:local [final]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.C, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
      overridden:
        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.C
      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.C'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFooBar visibility:local [final]' type=<root>.IFooBar origin=null
+              receiver: GET_VAR '<this>: <root>.C declared in <root>.C.equals' type=<root>.C origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.C.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.Int
      overridden:
        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.C
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.C'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFooBar visibility:local [final]' type=<root>.IFooBar origin=null
+              receiver: GET_VAR '<this>: <root>.C declared in <root>.C.hashCode' type=<root>.C origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.String
      overridden:
        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.C
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.C'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFooBar visibility:local [final]' type=<root>.IFooBar origin=null
+              receiver: GET_VAR '<this>: <root>.C declared in <root>.C.toString' type=<root>.C origin=null
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFooBar visibility:local [final]
@@ -72,8 +72,9 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.JUnrelatedFoo'
        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:K3 modality:FINAL visibility:public superTypes:[<root>.JUnrelatedFoo; <root>.IFoo]'
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.IFoo) returnType:kotlin.String [fake_override]
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:<root>.IFoo) returnType:kotlin.String [fake_override]
      overridden:
+        public open fun foo (): kotlin.String? declared in <root>.JUnrelatedFoo
        public abstract fun foo (): kotlin.String declared in <root>.IFoo
      $this: VALUE_PARAMETER name:<this> type:<root>.IFoo
    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
@@ -129,26 +130,42 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.TestJFoo) returnType:kotlin.String
      overridden:
        public abstract fun foo (): kotlin.String declared in <root>.IFoo
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.TestJFoo
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestJFoo
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.TestJFoo'
          CALL 'public abstract fun foo (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
              receiver: GET_VAR '<this>: <root>.TestJFoo declared in <root>.TestJFoo.foo' type=<root>.TestJFoo origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.TestJFoo, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
      overridden:
        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestJFoo
      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.TestJFoo'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestJFoo declared in <root>.TestJFoo.equals' type=<root>.TestJFoo origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.TestJFoo.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestJFoo) returnType:kotlin.Int
      overridden:
        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestJFoo
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestJFoo'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestJFoo declared in <root>.TestJFoo.hashCode' type=<root>.TestJFoo origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestJFoo) returnType:kotlin.String
      overridden:
        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestJFoo
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestJFoo'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestJFoo declared in <root>.TestJFoo.toString' type=<root>.TestJFoo origin=null
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
  CLASS CLASS name:TestK1 modality:FINAL visibility:public superTypes:[<root>.IFoo]
    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestK1
    CONSTRUCTOR visibility:public <> () returnType:<root>.TestK1 [primary]
@@ -161,26 +178,42 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.TestK1) returnType:kotlin.String
      overridden:
        public abstract fun foo (): kotlin.String declared in <root>.IFoo
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.TestK1
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK1
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.TestK1'
          CALL 'public abstract fun foo (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
              receiver: GET_VAR '<this>: <root>.TestK1 declared in <root>.TestK1.foo' type=<root>.TestK1 origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.TestK1, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
      overridden:
        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK1
      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.TestK1'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestK1 declared in <root>.TestK1.equals' type=<root>.TestK1 origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.TestK1.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestK1) returnType:kotlin.Int
      overridden:
        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK1
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestK1'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestK1 declared in <root>.TestK1.hashCode' type=<root>.TestK1 origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestK1) returnType:kotlin.String
      overridden:
        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK1
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestK1'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestK1 declared in <root>.TestK1.toString' type=<root>.TestK1 origin=null
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
  CLASS CLASS name:TestK2 modality:FINAL visibility:public superTypes:[<root>.IFoo]
    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestK2
    CONSTRUCTOR visibility:public <> () returnType:<root>.TestK2 [primary]
@@ -193,26 +226,42 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.TestK2) returnType:kotlin.String
      overridden:
        public abstract fun foo (): kotlin.String declared in <root>.IFoo
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.TestK2
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK2
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.TestK2'
          CALL 'public abstract fun foo (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
              receiver: GET_VAR '<this>: <root>.TestK2 declared in <root>.TestK2.foo' type=<root>.TestK2 origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.TestK2, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
      overridden:
        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK2
      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.TestK2'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestK2 declared in <root>.TestK2.equals' type=<root>.TestK2 origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.TestK2.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestK2) returnType:kotlin.Int
      overridden:
        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK2
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestK2'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestK2 declared in <root>.TestK2.hashCode' type=<root>.TestK2 origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestK2) returnType:kotlin.String
      overridden:
        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK2
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestK2'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestK2 declared in <root>.TestK2.toString' type=<root>.TestK2 origin=null
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
  CLASS CLASS name:TestK3 modality:FINAL visibility:public superTypes:[<root>.IFoo]
    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestK3
    CONSTRUCTOR visibility:public <> () returnType:<root>.TestK3 [primary]
@@ -225,26 +274,42 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.TestK3) returnType:kotlin.String
      overridden:
        public abstract fun foo (): kotlin.String declared in <root>.IFoo
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.TestK3
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK3
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.TestK3'
          CALL 'public abstract fun foo (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
              receiver: GET_VAR '<this>: <root>.TestK3 declared in <root>.TestK3.foo' type=<root>.TestK3 origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.TestK3, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
      overridden:
        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK3
      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.TestK3'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestK3 declared in <root>.TestK3.equals' type=<root>.TestK3 origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.TestK3.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestK3) returnType:kotlin.Int
      overridden:
        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK3
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestK3'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestK3 declared in <root>.TestK3.hashCode' type=<root>.TestK3 origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestK3) returnType:kotlin.String
      overridden:
        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK3
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestK3'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestK3 declared in <root>.TestK3.toString' type=<root>.TestK3 origin=null
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
  CLASS CLASS name:TestK4 modality:FINAL visibility:public superTypes:[<root>.IFoo]
    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestK4
    CONSTRUCTOR visibility:public <> () returnType:<root>.TestK4 [primary]
@@ -257,23 +322,39 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.TestK4) returnType:kotlin.String
      overridden:
        public abstract fun foo (): kotlin.String declared in <root>.IFoo
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.TestK4
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK4
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.TestK4'
          CALL 'public abstract fun foo (): kotlin.String declared in <root>.IFoo' type=kotlin.String origin=null
            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
              receiver: GET_VAR '<this>: <root>.TestK4 declared in <root>.TestK4.foo' type=<root>.TestK4 origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.TestK4, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
      overridden:
        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK4
      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.TestK4'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestK4 declared in <root>.TestK4.equals' type=<root>.TestK4 origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.TestK4.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestK4) returnType:kotlin.Int
      overridden:
        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK4
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestK4'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestK4 declared in <root>.TestK4.hashCode' type=<root>.TestK4 origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestK4) returnType:kotlin.String
      overridden:
        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestK4
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestK4'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]' type=<root>.IFoo origin=null
+              receiver: GET_VAR '<this>: <root>.TestK4 declared in <root>.TestK4.toString' type=<root>.TestK4 origin=null
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IFoo visibility:local [final]
@@ -33,32 +33,48 @@ FILE fqName:<root> fileName:/kt35550.kt
        SET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.I visibility:local [final]' type=kotlin.Unit origin=EQ
          receiver: GET_VAR '<this>: <root>.A declared in <root>.A' type=<root>.A origin=null
          value: GET_VAR 'i: <root>.I declared in <root>.A.<init>' type=<root>.I origin=null
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.A, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.A'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.I visibility:local [final]' type=<root>.I origin=null
+              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.equals' type=<root>.A origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.A.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.A'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.I visibility:local [final]' type=<root>.I origin=null
+              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.hashCode' type=<root>.A origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.A'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.I visibility:local [final]' type=<root>.I origin=null
+              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.toString' type=<root>.A origin=null
    PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val]
-      FUN DELEGATED_MEMBER name:<get-id> visibility:public modality:OPEN <T> ($this:<root>.A, $receiver:T of <root>.A.<get-id>) returnType:T of <root>.I.<get-id>
+      FUN DELEGATED_MEMBER name:<get-id> visibility:public modality:OPEN <T> ($this:<root>.A, $receiver:T of <root>.A.<get-id>) returnType:T of <root>.A.<get-id>
        correspondingProperty: PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val]
        overridden:
          public open fun <get-id> <T> (): T of <root>.I.<get-id> declared in <root>.I
-        TYPE_PARAMETER DELEGATED_MEMBER name:T index:0 variance: superTypes:[kotlin.Any?]
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.A
-        $receiver: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:T of <root>.A.<get-id>
+        TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
+        $this: VALUE_PARAMETER name:<this> type:<root>.A
+        $receiver: VALUE_PARAMETER name:<this> type:T of <root>.A.<get-id>
        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-id> <T> (): T of <root>.I.<get-id> declared in <root>.A'
+          RETURN type=kotlin.Nothing from='public open fun <get-id> <T> (): T of <root>.A.<get-id> declared in <root>.A'
            CALL 'public open fun <get-id> <T> (): T of <root>.I.<get-id> declared in <root>.I' type=T of <root>.A.<get-id> origin=null
              <T>: <none>
              $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.I visibility:local [final]' type=<root>.I origin=null
                receiver: GET_VAR '<this>: <root>.A declared in <root>.A.<get-id>' type=<root>.A origin=null
              $receiver: GET_VAR '<this>: T of <root>.A.<get-id> declared in <root>.A.<get-id>' type=T of <root>.A.<get-id> origin=null
    FIELD DELEGATE name:<$$delegate_0> type:<root>.I visibility:local [final]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
@@ -41,31 +41,20 @@ FILE fqName:<root> fileName:/delegatedMembers.kt
    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.Test<TT of <root>.Test>, x:kotlin.Int) returnType:kotlin.Unit
      overridden:
        public abstract fun foo (x: kotlin.Int): kotlin.Unit declared in <root>.IBase
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test<TT of <root>.Test>
-      VALUE_PARAMETER DELEGATED_MEMBER name:x index:0 type:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test<TT of <root>.Test>
+      VALUE_PARAMETER name:x index:0 type:kotlin.Int
      BLOCK_BODY
        CALL 'public abstract fun foo (x: kotlin.Int): kotlin.Unit declared in <root>.IBase' type=kotlin.Unit origin=null
          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<TT of <root>.Test> visibility:local [final]' type=<root>.IBase<TT of <root>.Test> origin=null
            receiver: GET_VAR '<this>: <root>.Test<TT of <root>.Test> declared in <root>.Test.foo' type=<root>.Test<TT of <root>.Test> origin=null
          x: GET_VAR 'x: kotlin.Int declared in <root>.Test.foo' type=kotlin.Int origin=null
-    PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
-      FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.Test<TT of <root>.Test>) returnType:kotlin.Int
-        correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
-        overridden:
-          public abstract fun <get-bar> (): kotlin.Int declared in <root>.IBase
-        $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test<TT of <root>.Test>
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): kotlin.Int declared in <root>.Test'
-            CALL 'public abstract fun <get-bar> (): kotlin.Int declared in <root>.IBase' type=kotlin.Int origin=null
-              $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<TT of <root>.Test> visibility:local [final]' type=<root>.IBase<TT of <root>.Test> origin=null
-                receiver: GET_VAR '<this>: <root>.Test<TT of <root>.Test> declared in <root>.Test.<get-bar>' type=<root>.Test<TT of <root>.Test> origin=null
    FUN DELEGATED_MEMBER name:qux visibility:public modality:OPEN <X> ($this:<root>.Test<TT of <root>.Test>, t:TT of <root>.Test, x:X of <root>.Test.qux) returnType:kotlin.Unit
      overridden:
        public abstract fun qux <X> (t: T of <root>.IBase, x: X of <root>.IBase.qux): kotlin.Unit declared in <root>.IBase
-      TYPE_PARAMETER DELEGATED_MEMBER name:X index:0 variance: superTypes:[kotlin.Any?]
-      $this: VALUE_PARAMETER DELEGATED_MEMBER name:<this> type:<root>.Test<TT of <root>.Test>
-      VALUE_PARAMETER DELEGATED_MEMBER name:t index:0 type:TT of <root>.Test
-      VALUE_PARAMETER DELEGATED_MEMBER name:x index:1 type:X of <root>.Test.qux
+      TYPE_PARAMETER name:X index:0 variance: superTypes:[kotlin.Any?]
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test<TT of <root>.Test>
+      VALUE_PARAMETER name:t index:0 type:TT of <root>.Test
+      VALUE_PARAMETER name:x index:1 type:X of <root>.Test.qux
      BLOCK_BODY
        CALL 'public abstract fun qux <X> (t: T of <root>.IBase, x: X of <root>.IBase.qux): kotlin.Unit declared in <root>.IBase' type=kotlin.Unit origin=null
          <X>: <none>
@@ -73,17 +62,44 @@ FILE fqName:<root> fileName:/delegatedMembers.kt
            receiver: GET_VAR '<this>: <root>.Test<TT of <root>.Test> declared in <root>.Test.qux' type=<root>.Test<TT of <root>.Test> origin=null
          t: GET_VAR 't: TT of <root>.Test declared in <root>.Test.qux' type=TT of <root>.Test origin=null
          x: GET_VAR 'x: X of <root>.Test.qux declared in <root>.Test.qux' type=X of <root>.Test.qux origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<TT of <root>.Test> visibility:local [final]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test<TT of <root>.Test>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
      overridden:
        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test<TT of <root>.Test>
      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.Test'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<TT of <root>.Test> visibility:local [final]' type=<root>.IBase<TT of <root>.Test> origin=null
+              receiver: GET_VAR '<this>: <root>.Test<TT of <root>.Test> declared in <root>.Test.equals' type=<root>.Test<TT of <root>.Test> origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.Test.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test<TT of <root>.Test>) returnType:kotlin.Int
      overridden:
        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test<TT of <root>.Test>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<TT of <root>.Test> visibility:local [final]' type=<root>.IBase<TT of <root>.Test> origin=null
+              receiver: GET_VAR '<this>: <root>.Test<TT of <root>.Test> declared in <root>.Test.hashCode' type=<root>.Test<TT of <root>.Test> origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test<TT of <root>.Test>) returnType:kotlin.String
      overridden:
        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test<TT of <root>.Test>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<TT of <root>.Test> visibility:local [final]' type=<root>.IBase<TT of <root>.Test> origin=null
+              receiver: GET_VAR '<this>: <root>.Test<TT of <root>.Test> declared in <root>.Test.toString' type=<root>.Test<TT of <root>.Test> origin=null
+    PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
+      FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.Test<TT of <root>.Test>) returnType:kotlin.Int
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-bar> (): kotlin.Int declared in <root>.IBase
+        $this: VALUE_PARAMETER name:<this> type:<root>.Test<TT of <root>.Test>
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): kotlin.Int declared in <root>.Test'
+            CALL 'public abstract fun <get-bar> (): kotlin.Int declared in <root>.IBase' type=kotlin.Int origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<TT of <root>.Test> visibility:local [final]' type=<root>.IBase<TT of <root>.Test> origin=null
+                receiver: GET_VAR '<this>: <root>.Test<TT of <root>.Test> declared in <root>.Test.<get-bar>' type=<root>.Test<TT of <root>.Test> origin=null
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.IBase<TT of <root>.Test> visibility:local [final]
@@ -87,53 +87,109 @@ FILE fqName:<root> fileName:/rawTypeInSignature.kt
        SET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=kotlin.Unit origin=EQ
          receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw' type=<root>.KRaw origin=null
          value: GET_VAR 'j: <root>.JRaw declared in <root>.KRaw.<init>' type=<root>.JRaw origin=null
-    FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]
-    FUN FAKE_OVERRIDE name:takesRawList visibility:public modality:OPEN <> ($this:<root>.JRaw, list:kotlin.collections.List<*>?) returnType:kotlin.Unit [fake_override]
+    FUN DELEGATED_MEMBER name:takesRawList visibility:public modality:OPEN <> ($this:<root>.KRaw, list:kotlin.collections.List<*>?) returnType:kotlin.Unit
      overridden:
        public abstract fun takesRawList (list: kotlin.collections.List<*>?): kotlin.Unit declared in <root>.JRaw
-      $this: VALUE_PARAMETER name:<this> type:<root>.JRaw
+      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
      VALUE_PARAMETER name:list index:0 type:kotlin.collections.List<*>?
-    FUN FAKE_OVERRIDE name:returnsRawList visibility:public modality:OPEN <> ($this:<root>.JRaw) returnType:kotlin.collections.List<*>? [fake_override]
+      BLOCK_BODY
+        CALL 'public abstract fun takesRawList (list: kotlin.collections.List<*>?): kotlin.Unit declared in <root>.JRaw' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
+            receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.takesRawList' type=<root>.KRaw origin=null
+          list: GET_VAR 'list: kotlin.collections.List<*>? declared in <root>.KRaw.takesRawList' type=kotlin.collections.List<*>? origin=null
+    FUN DELEGATED_MEMBER name:returnsRawList visibility:public modality:OPEN <> ($this:<root>.KRaw) returnType:kotlin.collections.List<*>?
      overridden:
        public abstract fun returnsRawList (): kotlin.collections.List<*>? declared in <root>.JRaw
-      $this: VALUE_PARAMETER name:<this> type:<root>.JRaw
-    FUN FAKE_OVERRIDE name:takesRawGenericInv visibility:public modality:OPEN <> ($this:<root>.JRaw, g:<root>.GenericInv<*>?) returnType:kotlin.Unit [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun returnsRawList (): kotlin.collections.List<*>? declared in <root>.KRaw'
+          CALL 'public abstract fun returnsRawList (): kotlin.collections.List<*>? declared in <root>.JRaw' type=kotlin.collections.List<*>? origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
+              receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.returnsRawList' type=<root>.KRaw origin=null
+    FUN DELEGATED_MEMBER name:takesRawGenericInv visibility:public modality:OPEN <> ($this:<root>.KRaw, g:<root>.GenericInv<*>?) returnType:kotlin.Unit
      overridden:
        public abstract fun takesRawGenericInv (g: <root>.GenericInv<*>?): kotlin.Unit declared in <root>.JRaw
-      $this: VALUE_PARAMETER name:<this> type:<root>.JRaw
+      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
      VALUE_PARAMETER name:g index:0 type:<root>.GenericInv<*>?
-    FUN FAKE_OVERRIDE name:returnsRawGenericInv visibility:public modality:OPEN <> ($this:<root>.JRaw) returnType:<root>.GenericInv<*>? [fake_override]
+      BLOCK_BODY
+        CALL 'public abstract fun takesRawGenericInv (g: <root>.GenericInv<*>?): kotlin.Unit declared in <root>.JRaw' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
+            receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.takesRawGenericInv' type=<root>.KRaw origin=null
+          g: GET_VAR 'g: <root>.GenericInv<*>? declared in <root>.KRaw.takesRawGenericInv' type=<root>.GenericInv<*>? origin=null
+    FUN DELEGATED_MEMBER name:returnsRawGenericInv visibility:public modality:OPEN <> ($this:<root>.KRaw) returnType:<root>.GenericInv<*>?
      overridden:
        public abstract fun returnsRawGenericInv (): <root>.GenericInv<*>? declared in <root>.JRaw
-      $this: VALUE_PARAMETER name:<this> type:<root>.JRaw
-    FUN FAKE_OVERRIDE name:takesRawGenericIn visibility:public modality:OPEN <> ($this:<root>.JRaw, g:<root>.GenericIn<kotlin.Nothing>?) returnType:kotlin.Unit [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun returnsRawGenericInv (): <root>.GenericInv<*>? declared in <root>.KRaw'
+          CALL 'public abstract fun returnsRawGenericInv (): <root>.GenericInv<*>? declared in <root>.JRaw' type=<root>.GenericInv<*>? origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
+              receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.returnsRawGenericInv' type=<root>.KRaw origin=null
+    FUN DELEGATED_MEMBER name:takesRawGenericIn visibility:public modality:OPEN <> ($this:<root>.KRaw, g:<root>.GenericIn<kotlin.Nothing>?) returnType:kotlin.Unit
      overridden:
        public abstract fun takesRawGenericIn (g: <root>.GenericIn<kotlin.Nothing>?): kotlin.Unit declared in <root>.JRaw
-      $this: VALUE_PARAMETER name:<this> type:<root>.JRaw
+      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
      VALUE_PARAMETER name:g index:0 type:<root>.GenericIn<kotlin.Nothing>?
-    FUN FAKE_OVERRIDE name:returnsRawGenericIn visibility:public modality:OPEN <> ($this:<root>.JRaw) returnType:<root>.GenericIn<kotlin.Nothing>? [fake_override]
+      BLOCK_BODY
+        CALL 'public abstract fun takesRawGenericIn (g: <root>.GenericIn<kotlin.Nothing>?): kotlin.Unit declared in <root>.JRaw' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
+            receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.takesRawGenericIn' type=<root>.KRaw origin=null
+          g: GET_VAR 'g: <root>.GenericIn<kotlin.Nothing>? declared in <root>.KRaw.takesRawGenericIn' type=<root>.GenericIn<kotlin.Nothing>? origin=null
+    FUN DELEGATED_MEMBER name:returnsRawGenericIn visibility:public modality:OPEN <> ($this:<root>.KRaw) returnType:<root>.GenericIn<kotlin.Nothing>?
      overridden:
        public abstract fun returnsRawGenericIn (): <root>.GenericIn<kotlin.Nothing>? declared in <root>.JRaw
-      $this: VALUE_PARAMETER name:<this> type:<root>.JRaw
-    FUN FAKE_OVERRIDE name:takesRawGenericOut visibility:public modality:OPEN <> ($this:<root>.JRaw, g:<root>.GenericOut<*>?) returnType:kotlin.Unit [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun returnsRawGenericIn (): <root>.GenericIn<kotlin.Nothing>? declared in <root>.KRaw'
+          CALL 'public abstract fun returnsRawGenericIn (): <root>.GenericIn<kotlin.Nothing>? declared in <root>.JRaw' type=<root>.GenericIn<kotlin.Nothing>? origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
+              receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.returnsRawGenericIn' type=<root>.KRaw origin=null
+    FUN DELEGATED_MEMBER name:takesRawGenericOut visibility:public modality:OPEN <> ($this:<root>.KRaw, g:<root>.GenericOut<*>?) returnType:kotlin.Unit
      overridden:
        public abstract fun takesRawGenericOut (g: <root>.GenericOut<*>?): kotlin.Unit declared in <root>.JRaw
-      $this: VALUE_PARAMETER name:<this> type:<root>.JRaw
+      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
      VALUE_PARAMETER name:g index:0 type:<root>.GenericOut<*>?
-    FUN FAKE_OVERRIDE name:returnsRawGenericOut visibility:public modality:OPEN <> ($this:<root>.JRaw) returnType:<root>.GenericOut<*>? [fake_override]
+      BLOCK_BODY
+        CALL 'public abstract fun takesRawGenericOut (g: <root>.GenericOut<*>?): kotlin.Unit declared in <root>.JRaw' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
+            receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.takesRawGenericOut' type=<root>.KRaw origin=null
+          g: GET_VAR 'g: <root>.GenericOut<*>? declared in <root>.KRaw.takesRawGenericOut' type=<root>.GenericOut<*>? origin=null
+    FUN DELEGATED_MEMBER name:returnsRawGenericOut visibility:public modality:OPEN <> ($this:<root>.KRaw) returnType:<root>.GenericOut<*>?
      overridden:
        public abstract fun returnsRawGenericOut (): <root>.GenericOut<*>? declared in <root>.JRaw
-      $this: VALUE_PARAMETER name:<this> type:<root>.JRaw
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun returnsRawGenericOut (): <root>.GenericOut<*>? declared in <root>.KRaw'
+          CALL 'public abstract fun returnsRawGenericOut (): <root>.GenericOut<*>? declared in <root>.JRaw' type=<root>.GenericOut<*>? origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
+              receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.returnsRawGenericOut' type=<root>.KRaw origin=null
+    FUN DELEGATED_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.KRaw, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
      overridden:
        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in <root>.KRaw'
+          CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any' type=kotlin.Boolean origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
+              receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.equals' type=<root>.KRaw origin=null
+            other: GET_VAR 'other: kotlin.Any? declared in <root>.KRaw.equals' type=kotlin.Any? origin=null
+    FUN DELEGATED_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.KRaw) returnType:kotlin.Int
      overridden:
        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.KRaw'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
+              receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.hashCode' type=<root>.KRaw origin=null
+    FUN DELEGATED_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.KRaw) returnType:kotlin.String
      overridden:
        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.KRaw
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.KRaw'
+          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]' type=<root>.JRaw origin=null
+              receiver: GET_VAR '<this>: <root>.KRaw declared in <root>.KRaw.toString' type=<root>.KRaw origin=null
+    FIELD DELEGATE name:<$$delegate_0> type:<root>.JRaw visibility:local [final]