From cb39221f8560d4156fd747b3def4e0940007cfe2 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 31 Oct 2022 09:51:30 +0100 Subject: [PATCH] FIR2IR: drop unused code with annotation placeholder --- .../generators/CallAndReferenceGenerator.kt | 9 +------- ...erencePlaceholderForResolvedAnnotations.kt | 22 ------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirReferencePlaceholderForResolvedAnnotations.kt diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt index 3992922afd9..880ee4a5e00 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt @@ -18,7 +18,6 @@ import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.FirSuperReference import org.jetbrains.kotlin.fir.references.builder.buildResolvedNamedReference -import org.jetbrains.kotlin.fir.references.impl.FirReferencePlaceholderForResolvedAnnotations import org.jetbrains.kotlin.fir.resolve.calls.FirSyntheticFunctionSymbol import org.jetbrains.kotlin.fir.resolve.fullyExpandedType import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor @@ -765,13 +764,7 @@ class CallAndReferenceGenerator( is FirAnnotationCall -> call.calleeReference else -> null } - val function = if (calleeReference == FirReferencePlaceholderForResolvedAnnotations) { - val coneClassLikeType = (call as FirAnnotation).annotationTypeRef.coneTypeSafe() - val firClass = (coneClassLikeType?.lookupTag?.toSymbol(session) as? FirRegularClassSymbol)?.fir - firClass?.declarations?.filterIsInstance()?.firstOrNull() - } else { - ((calleeReference as? FirResolvedNamedReference)?.resolvedSymbol as? FirFunctionSymbol<*>)?.fir - } + val function = ((calleeReference as? FirResolvedNamedReference)?.resolvedSymbol as? FirFunctionSymbol<*>)?.fir val valueParameters = function?.valueParameters val argumentMapping = call.resolvedArgumentMapping val substitutor = (call as? FirFunctionCall)?.buildSubstitutorByCalledFunction(function) ?: ConeSubstitutor.Empty diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirReferencePlaceholderForResolvedAnnotations.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirReferencePlaceholderForResolvedAnnotations.kt deleted file mode 100644 index 5a20f0cfe7e..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirReferencePlaceholderForResolvedAnnotations.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.fir.references.impl - -import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.visitors.FirTransformer -import org.jetbrains.kotlin.fir.visitors.FirVisitor - -object FirReferencePlaceholderForResolvedAnnotations : FirReference() { - override val source: KtSourceElement? - get() = null - - override fun acceptChildren(visitor: FirVisitor, data: D) {} - - override fun transformChildren(transformer: FirTransformer, data: D): FirReference { - return this - } -} \ No newline at end of file