From 78b374ec88fae6955d10ec41130e8b682181c13e Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 5 Nov 2020 13:38:41 +0300 Subject: [PATCH] FIR: Do not set overriddenSymbol for KFunction::invoke It has been probably set by mistake since overriddenSymbol is only used for fake overrides --- .../resolve/providers/impl/FirBuiltinSymbolProvider.kt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt index 631054e20f9..2deebf524dd 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt @@ -152,11 +152,6 @@ class FirBuiltinSymbolProvider(session: FirSession, val kotlinScopeProvider: Kot type = ConeTypeParameterTypeImpl(it.symbol.toLookupTag(), false) } } - val superKind: FunctionClassKind? = when (kind) { - FunctionClassKind.KFunction -> FunctionClassKind.Function - FunctionClassKind.KSuspendFunction -> FunctionClassKind.SuspendFunction - else -> null - } fun createSuperType( kind: FunctionClassKind, @@ -206,9 +201,7 @@ class FirBuiltinSymbolProvider(session: FirSession, val kotlinScopeProvider: Kot this.name = name status = functionStatus symbol = FirNamedFunctionSymbol( - CallableId(packageFqName, relativeClassName, name), - // set overriddenSymbol for "invoke" of KFunction/KSuspendFunction - superKind?.getInvoke(arity) + CallableId(packageFqName, relativeClassName, name) ) resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES valueParameters += typeArguments.dropLast(1).mapIndexed { index, typeArgument ->