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

[IR] Don't create packageFragment in IR builtins if not needed

Browse Source 
In REPL it's possible that builtins will be created several times with
  the same symbol table. And since IrBuiltinsPackageFragmentDescriptorImpl
  has overridden equals, symbol for external package will be the same for
  different descriptors (with same FQN). So we should create IrExternalPackageFragment
  here only if it was not created before, on previous compilation
This commit is contained in:
Dmitriy Novozhilov
2023-07-12 10:56:07 +03:00
committed by Space Team
parent 899e95ea04
commit 49a1dfa20e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/descriptors/IrBuiltInsOverDescriptors.kt
+8 -4
View File
@@ -82,11 +82,15 @@ class IrBuiltInsOverDescriptors(
private val kotlinInternalIrPackage = IrExternalPackageFragmentImpl.createEmptyExternalPackageFragment(builtInsModule, kotlinInternalPackage)
private val packageFragmentDescriptor = IrBuiltinsPackageFragmentDescriptorImpl(builtInsModule, KOTLIN_INTERNAL_IR_FQN)
/*
* In REPL it's possible that builtins will be created several times with the same symbol table
* And since IrBuiltinsPackageFragmentDescriptorImpl has overridden equals, symbol for external package
* will be the same for different descriptors (with same FQN). So we should create IrExternalPackageFragment
* here only if it was not created before, on previous compilation
*/
override val operatorsPackageFragment: IrExternalPackageFragment =
IrExternalPackageFragmentImpl(
symbolTable.descriptorExtension.referenceExternalPackageFragment(packageFragmentDescriptor),
KOTLIN_INTERNAL_IR_FQN
)
symbolTable.descriptorExtension.declareExternalPackageFragmentIfNotExists(packageFragmentDescriptor)
private fun ClassDescriptor.toIrSymbol(): IrClassSymbol {
return symbolTable.descriptorExtension.referenceClass(this)