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

[JVM] Rename JvmSignatureClashDetector → JvmMethodSignatureClashDetector

Browse Source 
This is to preserve the Git history of this file during the subsequent
refactoring.
This commit is contained in:
Sergej Jaskiewicz
2024-01-09 19:25:27 +01:00
committed by Space Team
parent c800144025
commit e0f9e09a97
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
+5 -5
View File
@@ -111,7 +111,7 @@ class ClassCodegen private constructor(
val reifiedTypeParametersUsages = ReifiedTypeParametersUsages() 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 { private val visitor = state.factory.newVisitor(irClass.descriptorOrigin, type, irClass.fileParent.loadSourceFilesInfo()).apply {
val signature = typeMapper.mapClassSignature(irClass, type, state.classBuilderMode.generateBodies) val signature = typeMapper.mapClassSignature(irClass, type, state.classBuilderMode.generateBodies)
@@ -217,7 +217,7 @@ class ClassCodegen private constructor(
generateInnerAndOuterClasses() generateInnerAndOuterClasses()
visitor.done(config.generateSmapCopyToAnnotation) visitor.done(config.generateSmapCopyToAnnotation)
jvmSignatureClashDetector.reportErrors() jvmMethodSignatureClashDetector.reportErrors()
} }
private fun shouldSkipCodeGenerationAccordingToGenerationFilter(): Boolean { private fun shouldSkipCodeGenerationAccordingToGenerationFilter(): Boolean {
@@ -354,7 +354,7 @@ class ClassCodegen private constructor(
fieldSignature, (field.initializer?.expression as? IrConst<*>)?.value 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) { if (field.origin != JvmLoweredDeclarationOrigin.CONTINUATION_CLASS_RESULT_FIELD) {
val skipNullabilityAnnotations = val skipNullabilityAnnotations =
@@ -403,7 +403,7 @@ class ClassCodegen private constructor(
private fun generateMethod(method: IrFunction, classSMAP: SourceMapper) { private fun generateMethod(method: IrFunction, classSMAP: SourceMapper) {
if (method.isFakeOverride) { if (method.isFakeOverride) {
jvmSignatureClashDetector.trackFakeOverrideMethod(method) jvmMethodSignatureClashDetector.trackFakeOverrideMethod(method)
return return
} }
@@ -442,7 +442,7 @@ class ClassCodegen private constructor(
} else { } else {
node.accept(smapCopyingVisitor) 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) { when (val metadata = method.metadata) {
is MetadataSource.Property -> metadataSerializer.bindPropertyMetadata(metadata, Method(node.name, node.desc), method.origin) is MetadataSource.Property -> metadataSerializer.bindPropertyMetadata(metadata, Method(node.name, node.desc), method.origin)
compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt → compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmMethodSignatureClashDetector.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.MemberKind
import org.jetbrains.kotlin.resolve.jvm.diagnostics.RawSignature import org.jetbrains.kotlin.resolve.jvm.diagnostics.RawSignature
import org.jetbrains.kotlin.utils.SmartSet import org.jetbrains.kotlin.utils.SmartSet
class JvmSignatureClashDetector( class JvmMethodSignatureClashDetector(
private val classCodegen: ClassCodegen private val classCodegen: ClassCodegen
) { ) {
private val methodsBySignature = LinkedHashMap<RawSignature, MutableSet<IrFunction>>() private val methodsBySignature = LinkedHashMap<RawSignature, MutableSet<IrFunction>>()