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

[Expect/Actual] Add ability to skip matching of constructors of expect enums

Browse Source 
In terms of MPP there are no such thing as `expect constructor` for enums,
  but they are physically exist in FIR and IR, so we need a switch which
  skips matching for them

FE 1.0 implementation did not touch to avoid any hidden changes
This commit is contained in:
Dmitriy Novozhilov
2023-06-06 17:26:41 +03:00
committed by Space Team
parent ba41e8ec38
commit 8b9079d026
8 changed files with 22 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/mpp/FirExpectActualMatchingContext.kt
+4 -8
View File
@@ -37,6 +37,9 @@ class FirExpectActualMatchingContext(
override val shouldCheckReturnTypesOfCallables: Boolean
get() = false
override val enumConstructorsAreAlwaysCompatible: Boolean
get() = true
private fun CallableSymbolMarker.asSymbol(): FirCallableSymbol<*> = this as FirCallableSymbol<*>
private fun FunctionSymbolMarker.asSymbol(): FirFunctionSymbol<*> = this as FirFunctionSymbol<*>
private fun PropertySymbolMarker.asSymbol(): FirPropertySymbol = this as FirPropertySymbol
@@ -260,14 +263,7 @@ class FirExpectActualMatchingContext(
override fun CallableSymbolMarker.shouldSkipMatching(containingExpectClass: RegularClassSymbolMarker): Boolean {
val symbol = asSymbol()
val classSymbol = containingExpectClass.asSymbol()
val isConstructor = symbol is FirConstructorSymbol
if (isConstructor && classSymbol.classKind.isEnumClass) {
/*
* Expect enums in FIR have (expect) constructors, but actually there is no need to map them
*/
return true
}
if (!isConstructor && symbol.dispatchReceiverType?.classId != classSymbol.classId) {
if (symbol !is FirConstructorSymbol && symbol.dispatchReceiverType?.classId != classSymbol.classId) {
// Skip fake overrides
return true
}