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

[FIR2IR] Replace getOrCreateIrScript with createIrScript

Browse Source 
Fir2IrDeclarationStorage should not sometimes create IR declarations
  during lookup requests
This commit is contained in:
Dmitriy Novozhilov
2023-11-14 15:58:16 +02:00
committed by Space Team
parent 7263edf322
commit 55f62834cb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
+1 -1
View File
@@ -509,7 +509,7 @@ class Fir2IrConverter(
} }
is FirScript -> { is FirScript -> {
require(parent is IrFile) require(parent is IrFile)
val irScript = declarationStorage.getOrCreateIrScript(declaration) val irScript = declarationStorage.createIrScript(declaration)
addDeclarationToParentIfNeeded(irScript) addDeclarationToParentIfNeeded(irScript)
declarationStorage.withScope(irScript.symbol) { declarationStorage.withScope(irScript.symbol) {
irScript.parent = parent irScript.parent = parent
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+2 -2
View File
@@ -1158,8 +1158,8 @@ class Fir2IrDeclarationStorage(
return scriptCache[script] return scriptCache[script]
} }
fun getOrCreateIrScript(script: FirScript): IrScript { fun createIrScript(script: FirScript): IrScript {
getCachedIrScript(script)?.let { return it } getCachedIrScript(script)?.let { error("IrScript already created: ${script.render()}") }
val symbol = createScriptSymbol(signatureComposer.composeSignature(script)) val symbol = createScriptSymbol(signatureComposer.composeSignature(script))
return callablesGenerator.createIrScript(script, symbol).also { return callablesGenerator.createIrScript(script, symbol).also {
scriptCache[script] = it scriptCache[script] = it