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

IR: deal with corresponding classes for enum entries in JvmDescriptorUniqIdAware

Browse Source
This commit is contained in:
Georgy Bronnikov
2020-01-24 21:01:44 +03:00
parent f75400cc1a
commit 97abc872b2
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt
+4 -2
View File
@@ -635,11 +635,13 @@ val IrFunctionReference.typeSubstitutionMap: Map<IrTypeParameterSymbol, IrType>
val IrFunctionAccessExpression.typeSubstitutionMap: Map<IrTypeParameterSymbol, IrType> val IrFunctionAccessExpression.typeSubstitutionMap: Map<IrTypeParameterSymbol, IrType>
get() = getTypeSubstitutionMap(symbol.owner) get() = getTypeSubstitutionMap(symbol.owner)
fun SymbolTable.referenceMember(descriptor: DeclarationDescriptor): IrSymbol = // Note: there is not enough information in a descriptor to choose between an enum entry and its corresponding class,
// so the entry itself is chosen in that case.
fun SymbolTable.referenceMember(descriptor: DeclarationDescriptor, correspondingClassForEnum: Boolean = false): IrSymbol =
descriptor.accept( descriptor.accept(
object : DeclarationDescriptorVisitorEmptyBodies<IrSymbol, Unit?>() { object : DeclarationDescriptorVisitorEmptyBodies<IrSymbol, Unit?>() {
override fun visitClassDescriptor(descriptor: ClassDescriptor, data: Unit?) = override fun visitClassDescriptor(descriptor: ClassDescriptor, data: Unit?) =
if (DescriptorUtils.isEnumEntry(descriptor)) if (DescriptorUtils.isEnumEntry(descriptor) && !correspondingClassForEnum)
referenceEnumEntry(descriptor) referenceEnumEntry(descriptor)
else else
referenceClass(descriptor) referenceClass(descriptor)
compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmDescriptorUniqIdAware.kt
+4 -3
View File
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.backend.common.serialization.tryGetExtension
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.ir.declarations.IrDeclaration import org.jetbrains.kotlin.ir.declarations.IrDeclaration
import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
import org.jetbrains.kotlin.ir.declarations.IrEnumEntry
import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.descriptors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.*
@@ -60,7 +61,7 @@ class JvmDescriptorUniqIdAware(val symbolTable: SymbolTable, val stubGenerator:
current.parent = symbolTable.findOrDeclareExternalPackageFragment(nextDescriptor) current.parent = symbolTable.findOrDeclareExternalPackageFragment(nextDescriptor)
break break
} else { } else {
val next = referenceOrDeclare(nextDescriptor) val next = referenceOrDeclare(nextDescriptor, correspondingClassForEnum = true)
current.parent = next as IrDeclarationParent current.parent = next as IrDeclarationParent
currentDescriptor = nextDescriptor currentDescriptor = nextDescriptor
current = next current = next
@@ -69,8 +70,8 @@ class JvmDescriptorUniqIdAware(val symbolTable: SymbolTable, val stubGenerator:
return result return result
} }
private fun referenceOrDeclare(descriptor: DeclarationDescriptor): IrDeclaration = private fun referenceOrDeclare(descriptor: DeclarationDescriptor, correspondingClassForEnum: Boolean = false): IrDeclaration =
symbolTable.referenceMember(descriptor).also { symbolTable.referenceMember(descriptor, correspondingClassForEnum).also {
if (!it.isBound) { if (!it.isBound) {
stubGenerator.getDeclaration(it) stubGenerator.getDeclaration(it)
} }