azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Remove unneeded symbol.fir accesses

Browse Source
This commit is contained in:
Nikolay Lunyak
2024-01-11 14:32:37 +02:00
committed by Space Team
parent 965d8d2fd5
commit 95989fc3e2
19 changed files with 97 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsExportDeclarationChecker.kt
+8 -9
View File
@@ -22,8 +22,9 @@ import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.utils.*
import org.jetbrains.kotlin.fir.expressions.FirConstExpression
import org.jetbrains.kotlin.fir.isEnumEntries
import org.jetbrains.kotlin.fir.symbols.SymbolInternals
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol
import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.js.common.RESERVED_KEYWORDS
import org.jetbrains.kotlin.js.common.SPECIAL_KEYWORDS
@@ -73,7 +74,7 @@ object FirJsExportDeclarationChecker : FirBasicDeclarationChecker() {
checkTypeParameter(typeParameter)
}
if (declaration.isInlineWithReified) {
if (declaration.symbol.isInlineWithReified) {
reportWrongExportedDeclaration("inline function with reified type parameters")
return
}
@@ -153,13 +154,12 @@ object FirJsExportDeclarationChecker : FirBasicDeclarationChecker() {
return parent != null && parent.isInterface
}
private val FirCallableDeclaration.isInlineWithReified: Boolean
private val FirCallableSymbol<*>.isInlineWithReified: Boolean
get() = when (this) {
is FirPropertyAccessor -> {
@OptIn(SymbolInternals::class)
this.propertySymbol.fir.isInlineWithReified
is FirPropertyAccessorSymbol -> {
this.propertySymbol.isInlineWithReified
}
else -> typeParameters.any { it.symbol.isReified }
else -> typeParameterSymbols.any { it.isReified }
}
private fun ConeKotlinType.isExportableReturn(session: FirSession, currentlyProcessed: MutableSet<ConeKotlinType> = hashSetOf()) =
@@ -208,8 +208,7 @@ object FirJsExportDeclarationChecker : FirBasicDeclarationChecker() {
return when {
isPrimitiveExportableType -> true
@OptIn(SymbolInternals::class)
symbol?.fir !is FirMemberDeclaration -> false
symbol?.isMemberDeclaration != true -> false
isEnum -> true
else -> symbol.isEffectivelyExternal(session) || symbol.isExportedObject(session)
}