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

IR: always update deserializedSymbols in referenceLocalIrSymbol

Browse Source 
The symbol created in deserializeIrSymbolToDeclare might be discarded
when an existing declaration is used in deserialization (as it happens
when deserializing IR bodies for JVM declarations).
This commit is contained in:
Georgy Bronnikov
2021-07-23 19:06:12 +03:00
committed by TeamCityServer
parent eccbf38061
commit 307de0be89
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt
+1 -1
View File
@@ -286,7 +286,7 @@ class IrDeclarationDeserializer(
// make sure this symbol is known to linker // make sure this symbol is known to linker
symbolDeserializer.referenceLocalIrSymbol(result.symbol, sig) symbolDeserializer.referenceLocalIrSymbol(result.symbol, sig)
result.annotations += deserializeAnnotations(proto.base.annotationList) result.annotations = deserializeAnnotations(proto.base.annotationList)
result.parent = currentParent result.parent = currentParent
return result return result
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrSymbolDeserializer.kt
+1 -1
View File
@@ -73,7 +73,7 @@ class IrSymbolDeserializer(
} }
fun referenceLocalIrSymbol(symbol: IrSymbol, signature: IdSignature) { fun referenceLocalIrSymbol(symbol: IrSymbol, signature: IdSignature) {
deserializedSymbols.putIfAbsent(signature, symbol) deserializedSymbols.put(signature, symbol)
} }
fun referenceSimpleFunctionByLocalSignature(idSignature: IdSignature) : IrSimpleFunctionSymbol = fun referenceSimpleFunctionByLocalSignature(idSignature: IdSignature) : IrSimpleFunctionSymbol =