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

[PL] Fix: Constructor of external class may delegate to kotlin.Any regardless of the actual superclass

Browse Source
This commit is contained in:
Dmitriy Dolovov
2023-04-16 23:40:15 +02:00
committed by Space Team
parent 997b6e6722
commit b644fc009d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/PartiallyLinkedIrTreePatcher.kt
+4 -1
View File
@@ -334,7 +334,10 @@ internal class PartiallyLinkedIrTreePatcher(
val invalidConstructorDelegationFound = val invalidConstructorDelegationFound =
if (calledConstructor.origin != PartiallyLinkedDeclarationOrigin.MISSING_DECLARATION) { if (calledConstructor.origin != PartiallyLinkedDeclarationOrigin.MISSING_DECLARATION) {
val constructedSuperClassSymbol = calledConstructor.parentAsClass.symbol val constructedSuperClassSymbol = calledConstructor.parentAsClass.symbol
constructedSuperClassSymbol != constructedClassSymbol && constructedSuperClassSymbol != actualSuperClassSymbol // Note: Constructor of an external class may delegate to kotlin.Any
constructedSuperClassSymbol != constructedClassSymbol
&& constructedSuperClassSymbol != actualSuperClassSymbol
&& (!constructedClass.isExternal || constructedSuperClassSymbol != builtIns.anyClass)
} else { } else {
// Fallback to signatures. // Fallback to signatures.
(calledConstructorSymbol.signature as? IdSignature.CommonSignature)?.let { constructorSignature -> (calledConstructorSymbol.signature as? IdSignature.CommonSignature)?.let { constructorSignature ->