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

[FIR2IR] Run IrGenerationExtensions before patching parents of external declarations and constant evaluation

Browse Source 
^KT-52804 Fixed
This commit is contained in:
Dmitriy Novozhilov
2022-06-16 11:51:32 +03:00
committed by teamcity
parent 76622097e4
commit c79a485c8e
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/Fir2IrConverter.kt
+3 -4
View File
@@ -91,10 +91,6 @@ class Fir2IrConverter(
firFile.accept(fir2irVisitor, null) firFile.accept(fir2irVisitor, null)
} }
irModuleFragment.acceptVoid(ExternalPackageParentPatcher(components, fir2IrExtensions))
evaluateConstants(irModuleFragment)
if (irGenerationExtensions.isNotEmpty()) { if (irGenerationExtensions.isNotEmpty()) {
val pluginContext = Fir2IrPluginContext(components) val pluginContext = Fir2IrPluginContext(components)
for (extension in irGenerationExtensions) { for (extension in irGenerationExtensions) {
@@ -102,6 +98,9 @@ class Fir2IrConverter(
} }
} }
irModuleFragment.acceptVoid(ExternalPackageParentPatcher(components, fir2IrExtensions))
evaluateConstants(irModuleFragment)
} }
fun bindFakeOverridesOrPostpone(declarations: List<IrDeclaration>) { fun bindFakeOverridesOrPostpone(declarations: List<IrDeclaration>) {