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

[K2, MPP] Fix reporting of MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED

Browse Source
This commit is contained in:
Ivan Kochurkin
2023-03-13 21:00:29 +01:00
committed by Space Team
parent 60edf1def3
commit cd07eba25c
7 changed files with 88 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrActualizerUtils.kt
-4
View File
@@ -153,10 +153,6 @@ fun KtDiagnosticReporterWithImplicitIrBasedContext.reportMissingActual(irDeclara
at(irDeclaration).report(CommonBackendErrors.NO_ACTUAL_FOR_EXPECT, irDeclaration.module)
}
fun KtDiagnosticReporterWithImplicitIrBasedContext.reportManyInterfacesMembersNotImplemented(declaration: IrClass, actualMember: IrDeclarationWithName) {
at(declaration).report(CommonBackendErrors.MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED, actualMember.name.asString())
}
internal fun IrElement.containsOptionalExpectation(): Boolean {
return this is IrClass &&
this.kind == ClassKind.ANNOTATION_CLASS &&
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/MissingFakeOverridesAdder.kt
+20 -16
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.backend.common.actualizer
import org.jetbrains.kotlin.KtDiagnosticReporterWithImplicitIrBasedContext
import org.jetbrains.kotlin.backend.common.CommonBackendErrors
import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.builders.declarations.buildFun
import org.jetbrains.kotlin.ir.builders.declarations.buildProperty
@@ -39,7 +40,7 @@ class MissingFakeOverridesAdder(
private fun processSupertypes(declaration: IrClass) {
val members by lazy(LazyThreadSafetyMode.NONE) {
val notBuiltinMembers = declaration.declarations.filter { !it.isBuiltinMember() }
val notBuiltinMembers = declaration.declarations.filterNot { it.isBuiltinMember() }
val result = mutableMapOf<String, MutableList<IrDeclaration>>()
for (member in notBuiltinMembers) {
result.getOrPut(generateIrElementFullNameFromExpect(member, typeAliasMap)) { mutableListOf() }.add(member)
@@ -71,22 +72,25 @@ class MissingFakeOverridesAdder(
}
}
private fun addFakeOverride(actualMember: IrDeclaration, members: Map<String, List<IrDeclaration>>, declaration: IrClass) {
when (actualMember) {
is IrFunctionImpl,
is IrPropertyImpl -> {
if (members.getMatch(actualMember, expectActualMap, typeAliasMap) != null) {
diagnosticsReporter.reportManyInterfacesMembersNotImplemented(declaration, actualMember as IrDeclarationWithName)
return
}
private fun addFakeOverride(
actualMember: IrDeclaration,
members: MutableMap<String, MutableList<IrDeclaration>>,
declaration: IrClass
) {
val newMember = when (actualMember) {
is IrFunctionImpl -> createFakeOverrideFunction(actualMember, declaration)
is IrPropertyImpl -> createFakeOverrideProperty(actualMember, declaration)
else -> return
}
val newMember = if (actualMember is IrFunctionImpl) {
createFakeOverrideFunction(actualMember, declaration)
} else {
createFakeOverrideProperty(actualMember as IrPropertyImpl, declaration)
}
declaration.declarations.add(newMember)
}
if (members.getMatch(newMember, expectActualMap, typeAliasMap) == null) {
declaration.declarations.add(newMember)
members.getOrPut(generateIrElementFullNameFromExpect(newMember, typeAliasMap)) { mutableListOf() }.add(newMember)
} else {
diagnosticsReporter.at(declaration).report(
CommonBackendErrors.MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED,
(actualMember as IrDeclarationWithName).name.asString()
)
}
}
}