diff --git a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt index 3c23dd3dfdb..c66311becf2 100644 --- a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt +++ b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt @@ -111,7 +111,7 @@ class ClassCodegen private constructor( val reifiedTypeParametersUsages = ReifiedTypeParametersUsages() - private val jvmSignatureClashDetector = JvmSignatureClashDetector(this) + private val jvmMethodSignatureClashDetector = JvmMethodSignatureClashDetector(this) private val visitor = state.factory.newVisitor(irClass.descriptorOrigin, type, irClass.fileParent.loadSourceFilesInfo()).apply { val signature = typeMapper.mapClassSignature(irClass, type, state.classBuilderMode.generateBodies) @@ -217,7 +217,7 @@ class ClassCodegen private constructor( generateInnerAndOuterClasses() visitor.done(config.generateSmapCopyToAnnotation) - jvmSignatureClashDetector.reportErrors() + jvmMethodSignatureClashDetector.reportErrors() } private fun shouldSkipCodeGenerationAccordingToGenerationFilter(): Boolean { @@ -354,7 +354,7 @@ class ClassCodegen private constructor( fieldSignature, (field.initializer?.expression as? IrConst<*>)?.value ) - jvmSignatureClashDetector.trackField(field, RawSignature(fieldName, fieldType.descriptor, MemberKind.FIELD)) + jvmMethodSignatureClashDetector.trackField(field, RawSignature(fieldName, fieldType.descriptor, MemberKind.FIELD)) if (field.origin != JvmLoweredDeclarationOrigin.CONTINUATION_CLASS_RESULT_FIELD) { val skipNullabilityAnnotations = @@ -403,7 +403,7 @@ class ClassCodegen private constructor( private fun generateMethod(method: IrFunction, classSMAP: SourceMapper) { if (method.isFakeOverride) { - jvmSignatureClashDetector.trackFakeOverrideMethod(method) + jvmMethodSignatureClashDetector.trackFakeOverrideMethod(method) return } @@ -442,7 +442,7 @@ class ClassCodegen private constructor( } else { node.accept(smapCopyingVisitor) } - jvmSignatureClashDetector.trackMethod(method, RawSignature(node.name, node.desc, MemberKind.METHOD)) + jvmMethodSignatureClashDetector.trackMethod(method, RawSignature(node.name, node.desc, MemberKind.METHOD)) when (val metadata = method.metadata) { is MetadataSource.Property -> metadataSerializer.bindPropertyMetadata(metadata, Method(node.name, node.desc), method.origin) diff --git a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmMethodSignatureClashDetector.kt similarity index 99% rename from compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt rename to compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmMethodSignatureClashDetector.kt index 86eb5b3fa9a..00af44ea6b1 100644 --- a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt +++ b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmMethodSignatureClashDetector.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.MemberKind import org.jetbrains.kotlin.resolve.jvm.diagnostics.RawSignature import org.jetbrains.kotlin.utils.SmartSet -class JvmSignatureClashDetector( +class JvmMethodSignatureClashDetector( private val classCodegen: ClassCodegen ) { private val methodsBySignature = LinkedHashMap>()