From bf1c0260f1e54a8088c895e20c2463a636583fde Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 9 Sep 2015 18:09:38 +0300 Subject: [PATCH] Multifile class part names are "1${PartName}". Multifile class parts are final. --- .../org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt | 2 +- .../src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt index 0e5d9db4bfb..b1a8bb92145 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt @@ -47,7 +47,7 @@ public class MultifileClassPartCodegen( ) : MemberCodegen(state, null, partContext, file, v){ override fun generateDeclaration() { v.defineClass(element, Opcodes.V1_6, - Opcodes.ACC_SYNTHETIC, + Opcodes.ACC_FINAL, filePartType.internalName, null, "java/lang/Object", diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt index 4a64ad7afb4..741b289970b 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt @@ -56,7 +56,7 @@ public object JvmFileClassUtil { file.packageFqName.child(Name.identifier(manglePartName(jvmFileClassAnnotations.name, file.name))) public @JvmStatic fun manglePartName(facadeName: String, fileName: String): String = - "${facadeName}__${PackagePartClassUtils.getFilePartShortName(fileName)}" + "1${PackagePartClassUtils.getFilePartShortName(fileName)}" public @JvmStatic fun parseJvmFileClass(annotations: Annotations): ParsedJmvFileClassAnnotations? { val jvmName = annotations.findAnnotation(JVM_NAME) ?: return null