[Serializer] More graceful fix of parents
This commit is contained in:
-4
@@ -102,10 +102,6 @@ internal val psiToIrPhase = konanUnitPhase(
|
|||||||
val symbols = KonanSymbols(this, generatorContext.symbolTable, generatorContext.symbolTable.lazyWrapper)
|
val symbols = KonanSymbols(this, generatorContext.symbolTable, generatorContext.symbolTable.lazyWrapper)
|
||||||
val module = translator.generateModuleFragment(generatorContext, environment.getSourceFiles(), deserializer)
|
val module = translator.generateModuleFragment(generatorContext, environment.getSourceFiles(), deserializer)
|
||||||
|
|
||||||
modules.values.forEach {
|
|
||||||
it.patchDeclarationParents()
|
|
||||||
}
|
|
||||||
|
|
||||||
irModule = module
|
irModule = module
|
||||||
irModules = modules
|
irModules = modules
|
||||||
ir.symbols = symbols
|
ir.symbols = symbols
|
||||||
|
|||||||
+3
-1
@@ -250,7 +250,9 @@ class KonanIrModuleDeserializer(
|
|||||||
|
|
||||||
deserializedModuleDescriptor = key.moduleOfOrigin
|
deserializedModuleDescriptor = key.moduleOfOrigin
|
||||||
val reachable = deserializeTopLevelDeclaration(key)
|
val reachable = deserializeTopLevelDeclaration(key)
|
||||||
reversedFileIndex[key]!!.declarations.add(reachable)
|
val file = reversedFileIndex[key]!!
|
||||||
|
file.declarations.add(reachable)
|
||||||
|
reachable.patchDeclarationParents(file)
|
||||||
|
|
||||||
reachableTopLevels.remove(key)
|
reachableTopLevels.remove(key)
|
||||||
deserializedTopLevels.add(key)
|
deserializedTopLevels.add(key)
|
||||||
|
|||||||
Reference in New Issue
Block a user