WIP
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt
index eac3961..f9fe063 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt
@@ -175,8 +175,6 @@
accessor.mangleFunction(false, property)
}
- protected open fun visitModuleDeclaration(descriptor: ModuleDescriptor) = reportUnexpectedDescriptor(descriptor)
-
private inner class Visitor : DeclarationDescriptorVisitor<Unit, Nothing?> {
override fun visitPackageFragmentDescriptor(descriptor: PackageFragmentDescriptor, data: Nothing?) {
@@ -209,7 +207,9 @@
}
override fun visitModuleDeclaration(descriptor: ModuleDescriptor, data: Nothing?) {
- visitModuleDeclaration(descriptor)
+ // In general, having module descriptor as `containingDeclaration` for regular declaration is considered an error (in JS/Native)
+ // because there should be `PackageFragmentDescriptor` in between
+ // but on JVM there is `SyntheticJavaPropertyDescriptor` whose parent is a module. So let just skip it.
}
override fun visitConstructorDescriptor(constructorDescriptor: ConstructorDescriptor, data: Nothing?) {
diff --git a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmMangler.kt b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmMangler.kt
index 1de522e..a3c64e3 100644
--- a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmMangler.kt
+++ b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmMangler.kt
@@ -79,12 +79,6 @@
return if (isJavaField) MangleConstant.JAVA_FIELD_SUFFIX else null
}
- override fun visitModuleDeclaration(descriptor: ModuleDescriptor) {
- // In general, having module descriptor as `containingDeclaration` for regular declaration is considered an error (in JS/Native)
- // because there should be `PackageFragmentDescriptor` in between
- // but on JVM there is `SyntheticJavaPropertyDescriptor` whose parent is a module. So let just skip it.
- }
-
override fun mangleTypePlatformSpecific(type: KotlinType, tBuilder: StringBuilder) {
// Disambiguate between 'double' and '@NotNull java.lang.Double' types in mixed Java/Kotlin class hierarchies
if (SimpleClassicTypeSystemContext.hasEnhancedNullability(type)) {
