FIR: get rid of effectively unused AccessorSymbol
This commit is contained in:
committed by
TeamCityServer
parent
7b9ac4c5f7
commit
41849c8beb
@@ -37,7 +37,6 @@ import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider
|
|||||||
import org.jetbrains.kotlin.fir.scopes.FirTypeScope
|
import org.jetbrains.kotlin.fir.scopes.FirTypeScope
|
||||||
import org.jetbrains.kotlin.fir.scopes.ProcessorAction
|
import org.jetbrains.kotlin.fir.scopes.ProcessorAction
|
||||||
import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
|
import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
|
||||||
import org.jetbrains.kotlin.fir.symbols.AccessorSymbol
|
|
||||||
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
|
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
|
||||||
import org.jetbrains.kotlin.fir.symbols.impl.*
|
import org.jetbrains.kotlin.fir.symbols.impl.*
|
||||||
import org.jetbrains.kotlin.fir.types.*
|
import org.jetbrains.kotlin.fir.types.*
|
||||||
@@ -452,7 +451,7 @@ internal fun FirReference.statementOrigin(): IrStatementOrigin? {
|
|||||||
return when (this) {
|
return when (this) {
|
||||||
is FirPropertyFromParameterResolvedNamedReference -> IrStatementOrigin.INITIALIZE_PROPERTY_FROM_PARAMETER
|
is FirPropertyFromParameterResolvedNamedReference -> IrStatementOrigin.INITIALIZE_PROPERTY_FROM_PARAMETER
|
||||||
is FirResolvedNamedReference -> when (val symbol = resolvedSymbol) {
|
is FirResolvedNamedReference -> when (val symbol = resolvedSymbol) {
|
||||||
is AccessorSymbol, is FirSyntheticPropertySymbol -> IrStatementOrigin.GET_PROPERTY
|
is FirAccessorSymbol -> IrStatementOrigin.GET_PROPERTY
|
||||||
is FirNamedFunctionSymbol -> when {
|
is FirNamedFunctionSymbol -> when {
|
||||||
symbol.callableId.isInvoke() ->
|
symbol.callableId.isInvoke() ->
|
||||||
IrStatementOrigin.INVOKE
|
IrStatementOrigin.INVOKE
|
||||||
|
|||||||
@@ -5,11 +5,5 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.fir.symbols
|
package org.jetbrains.kotlin.fir.symbols
|
||||||
|
|
||||||
import org.jetbrains.kotlin.name.CallableId
|
|
||||||
|
|
||||||
interface SyntheticSymbol
|
interface SyntheticSymbol
|
||||||
|
|
||||||
interface AccessorSymbol {
|
|
||||||
val callableId: CallableId // it's an id of related property (synthetic or not)
|
|
||||||
val accessorId: CallableId // it's an id of accessor function
|
|
||||||
}
|
|
||||||
@@ -11,8 +11,6 @@ import org.jetbrains.kotlin.fir.declarations.*
|
|||||||
import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
|
import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
|
||||||
import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
|
import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
|
||||||
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
|
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
|
||||||
import org.jetbrains.kotlin.fir.symbols.AccessorSymbol
|
|
||||||
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
|
|
||||||
import org.jetbrains.kotlin.fir.symbols.ensureResolved
|
import org.jetbrains.kotlin.fir.symbols.ensureResolved
|
||||||
import org.jetbrains.kotlin.name.CallableId
|
import org.jetbrains.kotlin.name.CallableId
|
||||||
import org.jetbrains.kotlin.name.FqName
|
import org.jetbrains.kotlin.name.FqName
|
||||||
@@ -84,8 +82,8 @@ class FirConstructorSymbol(
|
|||||||
|
|
||||||
open class FirAccessorSymbol(
|
open class FirAccessorSymbol(
|
||||||
callableId: CallableId,
|
callableId: CallableId,
|
||||||
override val accessorId: CallableId
|
open val accessorId: CallableId
|
||||||
) : FirPropertySymbol(callableId), AccessorSymbol
|
) : FirPropertySymbol(callableId)
|
||||||
|
|
||||||
// ------------------------ unnamed ------------------------
|
// ------------------------ unnamed ------------------------
|
||||||
|
|
||||||
@@ -99,6 +97,4 @@ class FirAnonymousFunctionSymbol : FirFunctionWithoutNameSymbol<FirAnonymousFunc
|
|||||||
|
|
||||||
class FirPropertyAccessorSymbol : FirFunctionWithoutNameSymbol<FirPropertyAccessor>(Name.identifier("accessor"))
|
class FirPropertyAccessorSymbol : FirFunctionWithoutNameSymbol<FirPropertyAccessor>(Name.identifier("accessor"))
|
||||||
|
|
||||||
class FirPropertyFieldDeclarationSymbol() : FirBasedSymbol<FirBackingField>()
|
|
||||||
|
|
||||||
class FirErrorFunctionSymbol : FirFunctionWithoutNameSymbol<FirErrorFunction>(Name.identifier("error"))
|
class FirErrorFunctionSymbol : FirFunctionWithoutNameSymbol<FirErrorFunction>(Name.identifier("error"))
|
||||||
|
|||||||
Reference in New Issue
Block a user