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

Fir2IrLazyClass: generate enum values() / valueOf() properly

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-07-22 14:53:38 +03:00
parent 8bae0f2d0c
commit 40256aa43d
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt
+14 -5
View File
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.resolve.buildUseSiteMemberScope
import org.jetbrains.kotlin.fir.symbols.Fir2IrClassSymbol import org.jetbrains.kotlin.fir.symbols.Fir2IrClassSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
import org.jetbrains.kotlin.fir.types.isNullableAny import org.jetbrains.kotlin.fir.types.isNullableAny
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.*
@@ -131,12 +132,20 @@ class Fir2IrLazyClass(
is FirSimpleFunction -> { is FirSimpleFunction -> {
if (declaration.name !in processedNames) { if (declaration.name !in processedNames) {
processedNames += declaration.name processedNames += declaration.name
scope.processFunctionsByName(declaration.name) { if (fir.classKind == ClassKind.ENUM_CLASS && declaration.isStatic &&
if (it is FirNamedFunctionSymbol && it.callableId.classId == fir.symbol.classId) { declaration.returnTypeRef is FirResolvedTypeRef
if (it.isAbstractMethodOfAny()) { ) {
return@processFunctionsByName // Handle values() / valueOf() separately
// TODO: handle other static functions / properties properly
result += declarationStorage.getIrFunctionSymbol(declaration.symbol).owner
} else {
scope.processFunctionsByName(declaration.name) {
if (it is FirNamedFunctionSymbol && it.callableId.classId == fir.symbol.classId) {
if (it.isAbstractMethodOfAny()) {
return@processFunctionsByName
}
result += declarationStorage.getIrFunctionSymbol(it).owner
} }
result += declarationStorage.getIrFunctionSymbol(it).owner
} }
} }
} }