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

[FIR2IR] Handle external declaration parents more accurately

Browse Source 
This allows us to set declaration parent immediately,
not at some moment after its creation
This commit is contained in:
Mikhail Glukhikh
2020-05-13 17:49:29 +03:00
parent 6beee004a3
commit d8398bb0ab
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt
+3 -4
View File
@@ -354,16 +354,15 @@ class Fir2IrClassifierStorage(
val firClass = firClassSymbol.fir val firClass = firClassSymbol.fir
getCachedIrClass(firClass)?.let { return symbolTable.referenceClass(it.descriptor) } getCachedIrClass(firClass)?.let { return symbolTable.referenceClass(it.descriptor) }
// TODO: remove all this code and change to unbound symbol creation // TODO: remove all this code and change to unbound symbol creation
val irClass = createIrClass(firClass)
if (firClass is FirAnonymousObject || firClass is FirRegularClass && firClass.visibility == Visibilities.LOCAL) { if (firClass is FirAnonymousObject || firClass is FirRegularClass && firClass.visibility == Visibilities.LOCAL) {
val irClass = createIrClass(firClass)
return symbolTable.referenceClass(irClass.descriptor) return symbolTable.referenceClass(irClass.descriptor)
} }
val classId = firClassSymbol.classId val classId = firClassSymbol.classId
val parentId = classId.outerClassId val parentId = classId.outerClassId
val irParent = declarationStorage.findIrParent(classId.packageFqName, parentId, firClassSymbol) val irParent = declarationStorage.findIrParent(classId.packageFqName, parentId, firClassSymbol)
if (irParent != null) { val irClass = createIrClass(firClass, irParent)
irClass.parent = irParent
}
if (irParent is IrExternalPackageFragment) { if (irParent is IrExternalPackageFragment) {
declarationStorage.addDeclarationsToExternalClass(firClass as FirRegularClass, irClass) declarationStorage.addDeclarationsToExternalClass(firClass as FirRegularClass, irClass)
} }